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

Chris Wilson ickle at kemper.freedesktop.org
Sat Jun 13 10:46:29 PDT 2015


 src/sna/sna_dri2.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 670d05f438520bcef8e86a0e32016ae542c61cee
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Jun 13 18:43:13 2015 +0100

    sna/dri2: Destroy the right bo
    
    Fixes copy'n'paste error in
    
    commit d46c793663d2b1b5ffb923500111b7affa8402b6
    Author: Chris Wilson <chris at chris-wilson.co.uk>
    Date:   Fri Jun 12 13:50:35 2015 +0100
    
        sna/dri2: Remove the active_scanout flag when deleting the event
    
    Reported-by: Andreas Reis <andreas.reis at gmail.com>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90968#c8
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c
index 1041c52..6a0c80c 100644
--- a/src/sna/sna_dri2.c
+++ b/src/sna/sna_dri2.c
@@ -2525,8 +2525,7 @@ sna_dri2_immediate_blit(struct sna *sna,
 	assert(get_private(info->back)->bo->active_scanout == 0);
 	if (get_private(info->back)->copy) {
 		get_private(info->back)->copy->active_scanout--;
-		kgem_bo_destroy(&chain->sna->kgem,
-				get_private(chain->back)->copy);
+		kgem_bo_destroy(&sna->kgem, get_private(info->back)->copy);
 	}
 	get_private(info->back)->copy = ref(get_private(info->back)->bo);
 	get_private(info->back)->bo->active_scanout++;


More information about the xorg-commit mailing list