xf86-video-intel: 3 commits - src/i965_video.c src/sna/kgem.h src/sna/sna_blt.c

[Chris Wilson]

 src/i965_video.c  |    2 ++
 src/sna/kgem.h    |    4 ++--
 src/sna/sna_blt.c |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 81f09347f2ab59cf0a3eaca7be83ded555655e93
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Jun 4 16:45:05 2012 +0100

    uxa/i965: Silence static analyser by asserting the bo exists for the video
    
    This is already checked at the beginning of PutImageTextured, so this
    check upon the return value of intel_get_pixmap_bo() should only be
    required to keep static analysers happy.
    
    Reported-by: Zdenek Kabelac <zdenek.kabelac at gmail.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/i965_video.c b/src/i965_video.c
index c94f530..d9350ce 100644
--- a/src/i965_video.c
+++ b/src/i965_video.c
@@ -388,6 +388,7 @@ static void i965_create_dst_surface_state(ScrnInfoPtr scrn,
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	struct brw_surface_state dest_surf_state;
 	drm_intel_bo *pixmap_bo = intel_get_pixmap_bo(pixmap);
+	assert(pixmap_bo != NULL);
 
 	memset(&dest_surf_state, 0, sizeof(dest_surf_state));
 
@@ -484,6 +485,7 @@ static void gen7_create_dst_surface_state(ScrnInfoPtr scrn,
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	struct gen7_surface_state dest_surf_state;
 	drm_intel_bo *pixmap_bo = intel_get_pixmap_bo(pixmap);
+	assert(pixmap_bo != NULL);
 
 	memset(&dest_surf_state, 0, sizeof(dest_surf_state));
 
commit 1f43de322b400dcd64eb4545a978ad9b1c7de185
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Jun 4 15:39:39 2012 +0100

    sna: Exclude consideration of tiling flags from overwriting BLT commands
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_blt.c b/src/sna/sna_blt.c
index 82c61df..e84c87f 100644
--- a/src/sna/sna_blt.c
+++ b/src/sna/sna_blt.c
@@ -431,7 +431,7 @@ static void sna_blt_copy_one(struct sna *sna,
 	/* Compare against a previous fill */
 	if (kgem->nbatch >= 6 &&
 	    blt->overwrites &&
-	    kgem->batch[kgem->nbatch-6] == ((blt->cmd & ~XY_SRC_COPY_BLT_CMD) | XY_COLOR_BLT) &&
+	    kgem->batch[kgem->nbatch-6] == (XY_COLOR_BLT | (blt->cmd & BLT_WRITE_ALPHA | BLT_WRITE_RGB)) &&
 	    kgem->batch[kgem->nbatch-4] == ((uint32_t)dst_y << 16 | (uint16_t)dst_x) &&
 	    kgem->batch[kgem->nbatch-3] == ((uint32_t)(dst_y+height) << 16 | (uint16_t)(dst_x+width)) &&
 	    kgem->reloc[kgem->nreloc-1].target_handle == blt->bo[1]->handle) {
commit ebb1c9d5f82e8822f7400ff11a887ab047a0d78e
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Jun 4 15:28:31 2012 +0100

    sna: Make the bo-is-busy DBG more useful by saying which bo it is
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.h b/src/sna/kgem.h
index deff5df..e4a5b4c 100644
--- a/src/sna/kgem.h
+++ b/src/sna/kgem.h
@@ -474,8 +474,8 @@ static inline bool kgem_bo_can_map(struct kgem *kgem, struct kgem_bo *bo)
 
 static inline bool kgem_bo_is_busy(struct kgem_bo *bo)
 {
-	DBG_HDR(("%s: domain: %d exec? %d, rq? %d\n",
-		 __FUNCTION__, bo->domain, bo->exec != NULL, bo->rq != NULL));
+	DBG_HDR(("%s: handle=%d, domain: %d exec? %d, rq? %d\n", __FUNCTION__,
+		 bo->handle, bo->domain, bo->exec != NULL, bo->rq != NULL));
 	return bo->rq;
 }