xf86-video-intel: src/i965_reg.h src/sna/gen7_render.h

[Chris Wilson]

 src/i965_reg.h        |    2 +-
 src/sna/gen7_render.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6bbb88af096e054877409a54d0e0a4ccf5ee317e
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Sat Sep 24 09:27:33 2011 +0100

    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 at whitecape.org>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/i965_reg.h b/src/i965_reg.h
index ab6c020..904e506 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 83d55ad..684c20a 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)