xf86-video-intel: 3 commits - src/sna/gen7_render.c

[Chris Wilson]

 src/sna/gen7_render.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 04b28021409bc179f6705802f3ccacb1e3c48cc5
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Mar 26 21:53:04 2013 +0000

    sna/gen7: Restore render acceleration for VLV power-on board
    
    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 45b2aec..9e40860 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -3706,6 +3706,8 @@ static bool gen7_render_setup(struct sna *sna)
 			if (is_gt2(sna))
 				state->info = &ivb_gt2_info; /* XXX requires GT_MODE WiZ disabled */
 		}
+	} else if (sna->kgem.gen == 071) {
+		state->info = &ivb_gt_info;
 	} else if (sna->kgem.gen == 075) {
 		state->info = &hsw_gt_info;
 		if (DEVICE_ID(sna->PciInfo) & 0xf) {
commit 2054f43e4332e9d0ed61a0d643a1390dffff8d96
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Mar 26 20:38:52 2013 +0000

    sna/gen7: Prefer spans for GT2 desktop variants
    
    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 b95399d..45b2aec 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -3794,7 +3794,7 @@ bool gen7_render_init(struct sna *sna)
 #if !NO_COMPOSITE_SPANS
 	sna->render.check_composite_spans = gen7_check_composite_spans;
 	sna->render.composite_spans = gen7_render_composite_spans;
-	if (is_mobile(sna))
+	if (is_mobile(sna) || is_gt2(sna))
 		sna->render.prefer_gpu |= PREFER_GPU_SPANS;
 #endif
 	sna->render.video = gen7_render_video;
commit 235a3981ea9759317b392302a2b2b8f4fafab410
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Mar 26 20:37:14 2013 +0000

    sna/gen7: Use GT2 values for GT2 variants
    
    The check was only testing for GT2+ and excluding the normal GT2
    devices. See also
    
    commit ce9f0448367ea6a90490a28150bfdc0a76500129
    Author: Chris Wilson <chris at chris-wilson.co.uk>
    Date:   Fri Feb 8 16:01:54 2013 +0000
    
        sna/gen6: Use GT2 settings for both GT2 and GT2+
    
    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 80fa872..b95399d 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -3684,7 +3684,7 @@ static void gen7_render_fini(struct sna *sna)
 
 static bool is_gt2(struct sna *sna)
 {
-	return DEVICE_ID(sna->PciInfo) & 0x20;
+	return DEVICE_ID(sna->PciInfo) & 0x30;
 }
 
 static bool is_mobile(struct sna *sna)