summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@gmail.com>2013-07-30 15:26:46 +1000
committerDave Airlie <airlied@gmail.com>2013-07-30 15:26:46 +1000
commitbe44e7804862b4c276ed4d4717b1212920f428e6 (patch)
tree450af9128007286eb762971b931c754314e66377
parent588252556d1c84bf6793bc22edd48e6650a0f1b9 (diff)
downloadxorg-driver-xf86-video-nouveau-be44e7804862b4c276ed4d4717b1212920f428e6.tar.gz
nouveau: fix crash when xinerama is enabled.
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--src/drmmode_display.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index ed9e186..570a9e4 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -348,7 +348,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
fb_id = drmmode->fb_id;
#ifdef NOUVEAU_PIXMAP_SHARING
- if (crtc->randr_crtc->scanout_pixmap) {
+ if (crtc->randr_crtc && crtc->randr_crtc->scanout_pixmap) {
x = drmmode_crtc->scanout_pixmap_x;
y = 0;
} else