1 files changed, 2 insertions, 9 deletions
diff --git a/xorg-server/exa/exa.c b/xorg-server/exa/exa.c
index 16f39f6f0..023288c12 100644
--- a/xorg-server/exa/exa.c
+++ b/xorg-server/exa/exa.c
@@ -323,17 +323,10 @@ ExaDoPrepareAccess(PixmapPtr pPixmap, int index)
 
     has_gpu_copy = exaPixmapHasGpuCopy(pPixmap);
 
-    if (has_gpu_copy) {
-	/* This can be NULL, but the driver prepareAccess call should
-	 * take care of that. */
+    if (has_gpu_copy && pExaPixmap->fb_ptr)
 	pPixmap->devPrivate.ptr = pExaPixmap->fb_ptr;
-	pPixmap->devKind = pExaPixmap->fb_pitch;
-    } else {
-	/* For mixed pixmaps this can be NULL, but that will be fixed
-	 * later in exaPrepareAccessReg_mixed(). */
+    else
 	pPixmap->devPrivate.ptr = pExaPixmap->sys_ptr;
-	pPixmap->devKind = pExaPixmap->sys_pitch;
-    }
 
     /* Store so we can handle repeated / nested calls. */
     pExaScr->access[index].pixmap = pPixmap;