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

[Chris Wilson]

 src/sna/kgem.c           |    3 ++-
 src/sna/sna_video_hwmc.c |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit f0b6ae2cfb811a8c234634c878800ca1fb95703f
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Apr 15 11:42:20 2013 +0100

    sna: Only release the scanout cache whilst DRM_MASTER
    
    If we try to release the framebuffers whilst not DRM_MASTER, the
    operation will fail and we will leak the buffers. So do not bother
    during the normal expiration to clean the scanout cache if vt switched
    away.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 1141c9c..615e36f 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -2846,7 +2846,8 @@ bool kgem_expire_cache(struct kgem *kgem)
 	}
 
 	kgem_clean_large_cache(kgem);
-	kgem_clean_scanout_cache(kgem);
+	if (container_of(kgem, struct sna, kgem)->scrn->vtSema)
+		kgem_clean_scanout_cache(kgem);
 
 	expire = 0;
 	list_for_each_entry(bo, &kgem->snoop, list) {
commit d68270ca84dc01a930c2ed0c05cecfac88c8cc4b
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Apr 12 14:48:04 2013 +0100

    sna/xvmc: silence a compiler warning
    
    sna_video_hwmc.c: In function 'create_context':
    sna_video_hwmc.c:95: warning: assignment from incompatible pointer type
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_video_hwmc.c b/src/sna/sna_video_hwmc.c
index 573fda5..55aa854 100644
--- a/src/sna/sna_video_hwmc.c
+++ b/src/sna/sna_video_hwmc.c
@@ -92,7 +92,7 @@ static int create_context(XvPortPtr port, XvMCContextPtr ctx,
 		priv->type = XVMC_I915_MPEG2_MC;
 
 	*size = sizeof(*priv) >> 2;
-	*out = priv;
+	*out = (CARD32 *)priv;
 	return Success;
 }