summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2009-11-26 13:10:45 +1000
committerBen Skeggs <bskeggs@redhat.com>2009-11-26 13:10:45 +1000
commit95fc663d5fb653fc0a50aa4d589bbf3b9c79e928 (patch)
tree44f6bc9ba26ec7c07aba586476cb0e0c608d87db
parent1cf0cfa926dd78698ff8b8c2d776bcdaa6a867bd (diff)
shadowfb: fix segv on fb resize
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--src/drmmode_display.c2
-rw-r--r--src/nv_driver.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index e8099b4..efc2826 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1120,7 +1120,7 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
screen->ModifyPixmapHeader(ppix, width, height, -1, -1, pitch,
(!pNv->NoAccel || pNv->ShadowPtr) ?
pNv->ShadowPtr : pNv->scanout->map);
-
+ scrn->pixmapPrivate.ptr = ppix->devPrivate.ptr;
nouveau_bo_unmap(pNv->scanout);
for (i = 0; i < xf86_config->num_crtc; i++) {
diff --git a/src/nv_driver.c b/src/nv_driver.c
index 4595940..a0656af 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -637,6 +637,7 @@ nouveau_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
screen->ModifyPixmapHeader(ppix, width, height, -1, -1, pitch,
(!pNv->NoAccel || pNv->ShadowFB) ?
pNv->ShadowPtr : pNv->scanout->map);
+ scrn->pixmapPrivate.ptr = ppix->devPrivate.ptr;
nouveau_bo_unmap(pNv->scanout);
for (i = 0; i < xf86_config->num_crtc; i++) {