xf86-video-intel: 2 commits - src/sna/gen6_render.c src/sna/gen7_render.c src/sna/sna_render.h

[Chris Wilson]

 src/sna/gen6_render.c |    2 +-
 src/sna/gen7_render.c |    2 +-
 src/sna/sna_render.h  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 543816011d05f0cf40b05ec58f87a5954397a224
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Jul 1 18:36:55 2012 +0100

    sna/gen7: Correct two minor misues of equivalent GEN6 constants
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index 6cf75eb..d303286 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -3523,7 +3523,7 @@ fallback_blt:
 	tmp.has_component_alpha = 0;
 	tmp.need_magic_ca_pass = 0;
 
-	tmp.u.gen7.wm_kernel = GEN6_WM_KERNEL_NOMASK;
+	tmp.u.gen7.wm_kernel = GEN7_WM_KERNEL_NOMASK;
 	tmp.u.gen7.nr_surfaces = 2;
 	tmp.u.gen7.nr_inputs = 1;
 	tmp.u.gen7.ve_id = 1;
diff --git a/src/sna/sna_render.h b/src/sna/sna_render.h
index 65ca359..1cc3af1 100644
--- a/src/sna/sna_render.h
+++ b/src/sna/sna_render.h
@@ -441,7 +441,7 @@ struct gen7_render_state {
 	uint32_t sf_state;
 	uint32_t sf_mask_state;
 	uint32_t wm_state;
-	uint32_t wm_kernel[GEN6_KERNEL_COUNT];
+	uint32_t wm_kernel[GEN7_KERNEL_COUNT];
 
 	uint32_t cc_vp;
 	uint32_t cc_blend;
commit 839fea7f779ca63c32817ee4ba695dfce3344980
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Jul 1 18:23:38 2012 +0100

    sna/gen6: Boost VS entries to maximum
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index ecc8dfb..81fad35 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -416,7 +416,7 @@ gen6_emit_urb(struct sna *sna)
 {
 	OUT_BATCH(GEN6_3DSTATE_URB | (3 - 2));
 	OUT_BATCH(((1 - 1) << GEN6_3DSTATE_URB_VS_SIZE_SHIFT) |
-		  (24 << GEN6_3DSTATE_URB_VS_ENTRIES_SHIFT)); /* at least 24 on GEN6 */
+		  (256 << GEN6_3DSTATE_URB_VS_ENTRIES_SHIFT)); /* at least 24 on GEN6 */
 	OUT_BATCH((0 << GEN6_3DSTATE_URB_GS_SIZE_SHIFT) |
 		  (0 << GEN6_3DSTATE_URB_GS_ENTRIES_SHIFT)); /* no GS thread */
 }