xf86-video-intel: 2 commits - src/sna/kgem.c src/sna/sna_display.c

[Chris Wilson]

 src/sna/kgem.c        |    4 ----
 src/sna/sna_display.c |    2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 884dd896e4e959e5a284a6f70da9e5cde1bbb7e9
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Jul 15 10:59:39 2013 +0100

    sna: Change message context to PROBED for initial configuration
    
    Since we are retreiving the hw values rather than choosing a default for
    ourselves, it is more consistent to use PROBED rather than INFO for our
    message.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 1427cd6..67b7182 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -3058,7 +3058,7 @@ static bool sna_probe_initial_configuration(struct sna *sna)
 				if (crtc->desiredMode.status == MODE_OK) {
 					DisplayModePtr M;
 
-					xf86DrvMsg(scrn->scrnIndex, X_INFO,
+					xf86DrvMsg(scrn->scrnIndex, X_PROBED,
 						   "Output %s using initial mode %s on pipe %d\n",
 						   output->name,
 						   crtc->desiredMode.name,
commit f8677a971bdbeb8e472b74385780c41c7a51c522
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Jul 15 10:24:53 2013 +0100

    sna/gen4: Allow rendering to Y-tiled surfaces
    
    We no longer seem to be hitting the same random hangs, so presumably
    another w/a is taking effect.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 13b509b..237ecf2 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -3569,10 +3569,6 @@ int kgem_choose_tiling(struct kgem *kgem, int tiling, int width, int height, int
 			goto done;
 		}
 	} else {
-		/* XXX rendering to I915_TILING_Y seems broken? */
-		if (kgem->gen < 050 && tiling == I915_TILING_Y)
-			tiling = I915_TILING_X;
-
 		if (width*bpp > (MAXSHORT-512) * 8) {
 			if (tiling > 0)
 				tiling = -tiling;