Commit: ce682a73e2a248f1feae2d0aad8644afab4f0df6 - hardware-intel-intel-driver (git)

hardware/intel/intel-driver

Commit MetaInfo

• Revision: ce682a73e2a248f1feae2d0aad8644afab4f0df6 (tree)
• Time: 2015-01-14 12:03:37
• Author: Joe Konno <joe.konno@inte...>
• Commiter: Zhao, Yakui

Log Message

BDW+: disable SGVS

BDW introduces separate packets for controlling instancing and system
generated values (eg vertex id and instance id). We don't use
instancing, but still need to disable sgvs to avoid undefined behaviour
when some other driver (mesa) uses it.

Signed-off-by: Joe Konno <[e-mail]>
Signed-off-by: Kristian Høgsberg <[e-mail]>
Reviewed-by: Daniel Charles <[e-mail]>
(cherry picked from commit 4caa37b895d39af754e2b2307879752130731f56)

Change Summary

• modified: src/gen8_render.c
• modified: src/gen9_render.c
• modified: src/i965_defines.h

Incremental Difference

--- a/src/gen8_render.c
+++ b/src/gen8_render.c
@@ -1001,6 +1001,10 @@ gen8_emit_vertex_element_state(VADriverContextP ctx)
 	OUT_BATCH(batch, i);
 	OUT_BATCH(batch, 0);
     }
+
+    /* Disable system-generated values. */
+    OUT_BATCH(batch, GEN8_3DSTATE_VF_SGVS | (2 - 2));
+    OUT_BATCH(batch, 0);
 }
 
 static void

--- a/src/gen9_render.c
+++ b/src/gen9_render.c
@@ -936,6 +936,9 @@ gen9_emit_vertices(VADriverContextP ctx)
     OUT_BATCH(batch, 0);
     OUT_BATCH(batch, 0);
 
+    OUT_BATCH(batch, GEN8_3DSTATE_VF_SGVS | (2 - 2));
+    OUT_BATCH(batch, 0);
+
     BEGIN_BATCH(batch, 7);
     OUT_BATCH(batch, CMD_3DPRIMITIVE | (7 - 2));
     OUT_BATCH(batch,

--- a/src/i965_defines.h
+++ b/src/i965_defines.h
@@ -746,6 +746,8 @@
 #define _3DPRIM_LINESTRIP_CONT_BF 0x14
 #define _3DPRIM_TRIFAN_NOSTIPPLE  0x15
 
+#define GEN8_3DSTATE_VF_INSTANCING	CMD(3, 0, 0x49)
+#define GEN8_3DSTATE_VF_SGVS		CMD(3, 0, 0x4a)
 #define GEN8_3DSTATE_VF_TOPOLOGY	CMD(3, 0, 0x4b)
 
 #define I965_TILEWALK_XMAJOR                 0