summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2013-02-06 16:21:50 +1000
committerDave Airlie <airlied@redhat.com>2013-02-06 16:21:50 +1000
commite8f222fd10e21f39488d3d8c697e4948cd787cd0 (patch)
tree188a7c9daafc3bd0db1b682a98c363d5d2e37276
parentd762631c9306b6580b34db1e7eb57bbcac901390 (diff)
downloadxorg-driver-xf86-video-nouveau-e8f222fd10e21f39488d3d8c697e4948cd787cd0.tar.gz
nouveau: make prime regression fix more robust.
This makes this fix more robust and less crashy. Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--src/nouveau_dri2.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nouveau_dri2.c b/src/nouveau_dri2.c
index 888e0b3..e462a86 100644
--- a/src/nouveau_dri2.c
+++ b/src/nouveau_dri2.c
@@ -189,7 +189,8 @@ nouveau_dri2_copy_region2(ScreenPtr pScreen, DrawablePtr pDraw, RegionPtr pRegio
if (extents->x1 == 0 && extents->y1 == 0 &&
extents->x2 == pDraw->width &&
extents->y2 == pDraw->height) {
- struct nouveau_bo *bo = nouveau_pixmap_bo((PixmapPtr)dst_draw);
+ PixmapPtr fpix = get_drawable_pixmap(dst_draw);
+ struct nouveau_bo *bo = nouveau_pixmap_bo(fpix);
if (bo)
nouveau_bo_wait(bo, NOUVEAU_BO_RD, pNv->client);
}