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

[Chris Wilson]

 src/sna/sna_render.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 258f8983daa3a8fe315c440f5e298ae1b02fd678
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jun 25 17:20:52 2014 +0100

    sna: Fix uninitialisable variable
    
    sna_render.c: In function 'sna_render_picture_downsample':
    sna_render.c:822: warning: 'priv' may be used uninitialized in this function
    
    introduced in
    
    commit ded05e8abb248664124d2b86f77c27497a252c4e
    Author: Chris Wilson <chris at chris-wilson.co.uk>
    Date:   Mon Jun 23 22:15:56 2014 +0100
    
        sna: Allow scratch pixmap to allocate linear GPU bo
    
    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 a2835c6..3eb4355 100644
--- a/src/sna/sna_render.c
+++ b/src/sna/sna_render.c
@@ -771,7 +771,8 @@ static int sna_render_picture_downsample(struct sna *sna,
 	if (tmp == NULL)
 		goto fixup;
 
-	assert(__sna_pixmap_get_bo(tmp));
+	priv = sna_pixmap(tmp);
+	assert(priv && priv->gpu_bo);
 
 	if (!sna_pixmap_move_to_gpu(pixmap, MOVE_SOURCE_HINT | MOVE_READ)) {
 fixup: