xf86-video-intel: 2 commits - man/intel.man src/intel_driver.c src/intel_memory.c

[Chris Wilson]

 man/intel.man      |    2 +-
 src/intel_driver.c |    3 ++-
 src/intel_memory.c |    4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 1fedac6f0d023e09f3d51b61a3e80ba7db157a20
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Sep 5 17:26:41 2010 +0100

    depth=30

diff --git a/man/intel.man b/man/intel.man
index 31860f2..e33608f 100644
--- a/man/intel.man
+++ b/man/intel.man
@@ -14,7 +14,7 @@ intel \- Intel integrated graphics chipsets
 .SH DESCRIPTION
 .B intel
 is an __xservername__ driver for Intel integrated graphics chipsets.
-The driver supports depths 8, 15, 16 and 24.  All visual types are
+The driver supports depths 8, 15, 16, 24 and 30.  All visual types are
 supported in depth 8.  For the i810/i815 other depths support the
 TrueColor and DirectColor visuals.  For the i830M and later, only the
 TrueColor visual is supported for depths greater than 8.  The driver
diff --git a/src/intel_driver.c b/src/intel_driver.c
index d086d94..272328e 100644
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -566,10 +566,11 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags)
 	case 15:
 	case 16:
 	case 24:
+	case 30:
 		break;
 	default:
 		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
-			   "Given depth (%d) is not supported by I830 driver\n",
+			   "Given depth (%d) is not supported by intel driver\n",
 			   scrn->depth);
 		return FALSE;
 	}
commit c782155375c2cf8c8b82c05f2d1fa7c7aa7859f0
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Sep 26 23:09:04 2010 +0100

    Retry framebuffer allocation is first attempt fails.
    
    If we are tiled, we may fail the allocation due to an EIO and so not
    being able to set tiling. Try again with an untiled request in this
    case.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_memory.c b/src/intel_memory.c
index 4f1b009..3a25ba6 100644
--- a/src/intel_memory.c
+++ b/src/intel_memory.c
@@ -209,6 +209,10 @@ retry:
 						width, height, intel->cpp,
 						&tiling_mode, &pitch, 0);
 	if (front_buffer == NULL) {
+		if (tiling_mode != I915_TILING_NONE) {
+			tiling_mode = I915_TILING_NONE;
+			goto retry;
+		}
 		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 			   "Failed to allocate framebuffer.\n");
 		return NULL;