summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2011-09-24 09:27:33 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2011-09-24 09:28:45 +0100
commit6bbb88af096e054877409a54d0e0a4ccf5ee317e (patch)
treef92b0808d4caa07f8b2576d2720dc403049527bd
parent7f7f95abbf57e6e71f6a30d917f97c2f2bd6cea9 (diff)
Fix incorrect maximum PS thread count on IvyBridge
I mistakenly set GEN7_PS_MAX_THREAD_SHIFT to 23; it's actually 24 on Ivybridge. Not only did this halve our thread count, it caused us to write 1 into a bit 23, which is marked as MBZ (must be zero). Furthermore, it made us write an even number into this field, which is apparently not allowed. Apparently we were just lucky it worked. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/i965_reg.h2
-rw-r--r--src/sna/gen7_render.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/i965_reg.h b/src/i965_reg.h
index ab6c0205..904e506f 100644
--- a/src/i965_reg.h
+++ b/src/i965_reg.h
@@ -219,7 +219,7 @@
# define GEN7_PS_FLOATING_POINT_MODE_ALT (1 << 16)
/* DW3: scratch space */
/* DW4 */
-# define GEN7_PS_MAX_THREADS_SHIFT 23
+# define GEN7_PS_MAX_THREADS_SHIFT 24
# define GEN7_PS_PUSH_CONSTANT_ENABLE (1 << 11)
# define GEN7_PS_ATTRIBUTE_ENABLE (1 << 10)
# define GEN7_PS_OMASK_TO_RENDER_TARGET (1 << 9)
diff --git a/src/sna/gen7_render.h b/src/sna/gen7_render.h
index 83d55ad1..684c20a7 100644
--- a/src/sna/gen7_render.h
+++ b/src/sna/gen7_render.h
@@ -1646,7 +1646,7 @@ struct gen7_sampler_state {
# define GEN7_PS_FLOATING_POINT_MODE_ALT (1 << 16)
/* DW3: scratch space */
/* DW4 */
-# define GEN7_PS_MAX_THREADS_SHIFT 23
+# define GEN7_PS_MAX_THREADS_SHIFT 24
# define GEN7_PS_PUSH_CONSTANT_ENABLE (1 << 11)
# define GEN7_PS_ATTRIBUTE_ENABLE (1 << 10)
# define GEN7_PS_OMASK_TO_RENDER_TARGET (1 << 9)