xf86-video-intel: 4 commits - src/sna/sna_accel.c src/sna/sna_render.c src/sna/sna_video_textured.c

[Chris Wilson]

 src/sna/sna_accel.c          |    2 +-
 src/sna/sna_render.c         |    4 ++++
 src/sna/sna_video_textured.c |    3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 25581f63cf879fbe4d6908fcbe23796b6d07dfb6
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jan 6 13:36:13 2015 +0000

    sna: Allow scanouts to force late attachment
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index baf5f60..ab56ebd 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -3215,7 +3215,7 @@ __sna_pixmap_for_gpu(struct sna *sna, PixmapPtr pixmap, unsigned flags)
 	priv = sna_pixmap(pixmap);
 	if (priv == NULL) {
 		DBG(("%s: not attached\n", __FUNCTION__));
-		if ((flags & __MOVE_DRI) == 0)
+		if ((flags & (__MOVE_DRI | __MOVE_SCANOUT)) == 0)
 			return NULL;
 
 		if (pixmap->usage_hint == -1) {
commit 61ab528b16fc9dc497e7fdcc009dab7a7ed7a27c
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jan 6 13:34:22 2015 +0000

    sna: Disable GPU preferences when marking it as wedged
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c
index 92c5afc..8a9c7f4 100644
--- a/src/sna/sna_render.c
+++ b/src/sna/sna_render.c
@@ -2383,4 +2383,5 @@ void
 sna_render_mark_wedged(struct sna *sna)
 {
 	sna->render.copy_boxes = memcpy_copy_boxes;
+	sna->render.prefer_gpu = 0;
 }
commit cc9d7f6777703037d0d7eff346dd350f4d8b3f31
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jan 6 13:29:49 2015 +0000

    sna: Reject CPU blits that require format conversions
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c
index 3fbb9ec..92c5afc 100644
--- a/src/sna/sna_render.c
+++ b/src/sna/sna_render.c
@@ -2336,6 +2336,9 @@ memcpy_copy_boxes(struct sna *sna, uint8_t op,
 	if (op != GXcopy)
 		return false;
 
+	if (src_draw->depth != dst_draw->depth)
+		return false;
+
 	clipped = (n > 1 ||
 		   box->x1 + dx > 0 ||
 		   box->y1 + dy > 0 ||
commit e44e57d4cdc1fe2de410afcaa458a7081f909b3f
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jan 6 12:58:18 2015 +0000

    sna/video: Do an early check for a wedged GPU before texturing
    
    If we don't have a GPU available, we can not do the colour space
    conversion and compositing with the GPU, so bail early.
    
    Reported-by: Zdenek Kabelac <zkabelac at redhat.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_video_textured.c b/src/sna/sna_video_textured.c
index 9501193..ea423b5 100644
--- a/src/sna/sna_video_textured.c
+++ b/src/sna/sna_video_textured.c
@@ -152,6 +152,9 @@ sna_video_textured_put_image(ddPutImage_ARGS)
 	bool flush = false;
 	bool ret;
 
+	if (wedged(sna))
+		return BadAlloc;
+
 	clip.extents.x1 = draw->x + drw_x;
 	clip.extents.y1 = draw->y + drw_y;
 	clip.extents.x2 = clip.extents.x1 + drw_w;