xf86-video-intel: src/sna/sna_blt.c

Chris Wilson ickle at kemper.freedesktop.org
Sun Sep 23 12:36:23 PDT 2012


 src/sna/sna_blt.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5ed840881c26e90eb8e00521b6d77b0ea514de5e
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Sep 23 20:29:21 2012 +0100

    sna: Check that the CPU bo exists before declaring it is busy along upload
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=55251
    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 6685549..b5d7ea7 100644
--- a/src/sna/sna_blt.c
+++ b/src/sna/sna_blt.c
@@ -1875,7 +1875,7 @@ clear:
 
 put:
 		priv = sna_pixmap(tmp->dst.pixmap);
-		if (tmp->dst.bo == priv->cpu_bo) {
+		if (priv->cpu_bo && tmp->dst.bo == priv->cpu_bo) {
 			assert(kgem_bo_is_busy(tmp->dst.bo));
 			tmp->dst.bo = sna_drawable_use_bo(dst->pDrawable,
 							  FORCE_GPU | PREFER_GPU,


More information about the xorg-commit mailing list