xf86-video-intel: 2 commits - src/legacy/i810 src/sna/gen3_render.c src/sna/sna_dri.c src/sna/sna_render.h

[Chris Wilson]

 src/legacy/i810/i810_dri.c |   14 ++++++++++----
 src/sna/gen3_render.c      |    1 +
 src/sna/sna_dri.c          |    1 +
 src/sna/sna_render.h       |    1 +
 4 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 536033b4edb40db18210e5272eb8ce9703e5e364
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jun 6 16:02:47 2012 +0100

    legacy/i810/dri: Check for malloc failure for BusIdString
    
    Reported-by: Zdenek Kabelac <zkabelac at redhat.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/legacy/i810/i810_dri.c b/src/legacy/i810/i810_dri.c
index 24632d4..ba11245 100644
--- a/src/legacy/i810/i810_dri.c
+++ b/src/legacy/i810/i810_dri.c
@@ -240,10 +240,16 @@ I810DRIScreenInit(ScreenPtr pScreen)
       pDRIInfo->busIdString = DRICreatePCIBusID(pI810->PciInfo);
    } else {
       pDRIInfo->busIdString = malloc(64);
-      sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d",
-	      ((pI810->PciInfo->domain << 8) | pI810->PciInfo->bus),
-	      pI810->PciInfo->dev, pI810->PciInfo->func
-	      );
+      if (pDRIInfo->busIdString)
+	 sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d",
+		 ((pI810->PciInfo->domain << 8) | pI810->PciInfo->bus),
+		 pI810->PciInfo->dev, pI810->PciInfo->func
+		);
+   }
+   if (!pDRIInfo->busIdString) {
+      DRIDestroyInfoRec(pI810->pDRIInfo);
+      pI810->pDRIInfo = NULL;
+      return FALSE;
    }
    pDRIInfo->ddxDriverMajorVersion = I810_MAJOR_VERSION;
    pDRIInfo->ddxDriverMinorVersion = I810_MINOR_VERSION;
commit b2da80c1d1058dca5d3d85693918e53d9fa61dd3
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jun 6 15:59:54 2012 +0100

    sna: Add some missing 'fall through' comments
    
    Static analysers are dumb and presume readers are too.
    
    Reported-by: Zdenek Kabelac <zkabelac at redhat.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c
index 0037ba0..e58cdd6 100644
--- a/src/sna/gen3_render.c
+++ b/src/sna/gen3_render.c
@@ -1065,6 +1065,7 @@ gen3_composite_emit_shader(struct sna *sna,
 		case SHADER_LINEAR:
 		case SHADER_RADIAL:
 			gen3_fs_dcl(FS_S0 + t);
+			/* fall through */
 		case SHADER_OPACITY:
 			gen3_fs_dcl(FS_T0 + t);
 			break;
diff --git a/src/sna/sna_dri.c b/src/sna/sna_dri.c
index c26c128..000738b 100644
--- a/src/sna/sna_dri.c
+++ b/src/sna/sna_dri.c
@@ -1075,6 +1075,7 @@ static void sna_dri_vblank_handle(int fd,
 						 get_private(info->back)->bo,
 						 true);
 		info->type = DRI2_SWAP_THROTTLE;
+		/* fall through to SwapComplete */
 	case DRI2_SWAP_THROTTLE:
 		DBG(("%s: %d complete, frame=%d tv=%d.%06d\n",
 		     __FUNCTION__, info->type, frame, tv_sec, tv_usec));
diff --git a/src/sna/sna_render.h b/src/sna/sna_render.h
index 9db1891..4898223 100644
--- a/src/sna/sna_render.h
+++ b/src/sna/sna_render.h
@@ -589,6 +589,7 @@ sna_get_pixel_from_rgba(uint32_t * pixel,
 	switch (format) {
 	case PICT_x8r8g8b8:
 		alpha = 0xffff;
+		/* fall through to re-use a8r8g8b8 expansion */
 	case PICT_a8r8g8b8:
 		*pixel = ((alpha >> 8 << 24) |
 			  (red >> 8 << 16) |