xf86-video-intel: 2 commits - src/uxa/intel_display.c src/uxa/intel_dri.c src/uxa/intel_driver.c src/uxa/intel.h

[Chris Wilson]

 src/uxa/intel.h         |    1 -
 src/uxa/intel_display.c |    5 -----
 src/uxa/intel_dri.c     |    4 ++--
 src/uxa/intel_driver.c  |    5 -----
 4 files changed, 2 insertions(+), 13 deletions(-)

New commits:
commit 04a09d353fc5ad8a55eb2457dc8bb43638ba879e
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Dec 9 20:43:52 2014 +0000

    uxa/dri: Remove defunct intel->back_pixmap
    
    This was only required for glamor support.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/uxa/intel.h b/src/uxa/intel.h
index a398229..1b7e533 100644
--- a/src/uxa/intel.h
+++ b/src/uxa/intel.h
@@ -121,7 +121,6 @@ typedef struct intel_screen_private {
 
 	void *modes;
 	drm_intel_bo *front_buffer, *back_buffer;
-	PixmapPtr back_pixmap;
 	unsigned int back_name;
 	long front_pitch, front_tiling;
 
diff --git a/src/uxa/intel_display.c b/src/uxa/intel_display.c
index 395774a..7b4d4e0 100644
--- a/src/uxa/intel_display.c
+++ b/src/uxa/intel_display.c
@@ -1581,11 +1581,6 @@ intel_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
 	old_fb_id = mode->fb_id;
 	old_front = intel->front_buffer;
 
-	if (intel->back_pixmap) {
-		scrn->pScreen->DestroyPixmap(intel->back_pixmap);
-		intel->back_pixmap = NULL;
-	}
-
 	if (intel->back_buffer) {
 		drm_intel_bo_unreference(intel->back_buffer);
 		intel->back_buffer = NULL;
diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c
index ca8c613..2793da5 100644
--- a/src/uxa/intel_driver.c
+++ b/src/uxa/intel_driver.c
@@ -1125,11 +1125,6 @@ static Bool I830CloseScreen(CLOSE_SCREEN_ARGS_DECL)
 		intel->uxa_driver = NULL;
 	}
 
-	if (intel->back_pixmap) {
-		screen->DestroyPixmap(intel->back_pixmap);
-		intel->back_pixmap = NULL;
-	}
-
 	if (intel->back_buffer) {
 		drm_intel_bo_unreference(intel->back_buffer);
 		intel->back_buffer = NULL;
commit 08ee9a75df16ee276835df5fc613648db2566154
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Dec 9 20:40:20 2014 +0000

    uxa/dri: Fix triple buffer swapping
    
    Fixes regression from
    
    commit 0aa2edbd29c8dd26a5f3748e3875c445ea358a6d
    Author: Chris Wilson <chris at chris-wilson.co.uk>
    Date:   Wed Nov 5 11:56:20 2014 +0000
    
        Remove defunct glamor support
    
    where the wrong branch of pixmap exchange upon SwapBuffers was kept when
    removing the glamor paths.
    
    Reported-by: Rui Matos
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/uxa/intel_dri.c b/src/uxa/intel_dri.c
index 5b5e3fc..f61c621 100644
--- a/src/uxa/intel_dri.c
+++ b/src/uxa/intel_dri.c
@@ -821,8 +821,8 @@ I830DRI2ScheduleFlip(struct intel_screen_private *intel,
 
 	intel->back_buffer = intel->front_buffer;
 	drm_intel_bo_reference(intel->back_buffer);
-	intel_exchange_pixmap_buffers(intel, priv->pixmap,
-				      intel->back_pixmap);
+	intel_set_pixmap_bo(priv->pixmap, new_back);
+	drm_intel_bo_unreference(new_back);
 
 	tmp_name = info->front->name;
 	info->front->name = intel->back_name;