xf86-video-intel: 2 commits - src/sna/sna_display.c src/sna/sna_render_inline.h

[Chris Wilson]

 src/sna/sna_display.c       |    2 +-
 src/sna/sna_render_inline.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit db7979981032d5647069f213a063dcbf78e57890
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jun 27 09:36:58 2012 +0100

    sna: s/width/height/ cut'n'paste typo
    
    Reported-by: Zdenek Kabelac <zdenek.kabelac at gmail.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 4a63cff..9e47017 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -978,7 +978,7 @@ sna_crtc_damage(xf86CrtcPtr crtc)
 		region.extents.y1 = 0;
 	if (region.extents.x2 > screen->width)
 		region.extents.x2 = screen->width;
-	if (region.extents.y2 > screen->width)
+	if (region.extents.y2 > screen->height)
 		region.extents.y2 = screen->height;
 
 	DBG(("%s: marking crtc %d as completely damaged (%d, %d), (%d, %d)\n",
commit fcbbe1664ae62ae275068cc040f385d2320d5213
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jun 27 09:30:44 2012 +0100

    sna: Remove a trailing ';'
    
    The unwanted ';' caused is_cpu() to always return false if a GPU bo was
    attached. Not necessary a bad thing, just misses the potential
    optimisation where having chosen to prefer to use the CPU path we then
    have to migrate to the GPU even though the bo is undamaged or idle.
    
    Spotted-by: Zdenek Kabelac <zkabelac at redhat.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_render_inline.h b/src/sna/sna_render_inline.h
index 8a5a405..2210127 100644
--- a/src/sna/sna_render_inline.h
+++ b/src/sna/sna_render_inline.h
@@ -89,7 +89,7 @@ is_cpu(DrawablePtr drawable)
 		return true;
 
 	assert(!priv->gpu_bo->proxy); /* should be marked as cpu damaged */
-	if (priv->gpu_damage && kgem_bo_is_busy(priv->gpu_bo));
+	if (priv->gpu_damage && kgem_bo_is_busy(priv->gpu_bo))
 		return false;
 
 	if (priv->cpu_bo && kgem_bo_is_busy(priv->cpu_bo))