summaryrefslogtreecommitdiff
path: root/driver
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2011-09-13 19:31:43 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2011-09-13 19:31:43 +0000
commitb2838842ea7f3a7878b4f74e04249768b92a6324 (patch)
treeb0617bda715d97fa2f9fabdb46279556239e9ee8 /driver
parent544b87cdab072bcf9d4b122301a7c48cd28d4784 (diff)
Let the intel driver build with xserver >= 1.10.
Reminded by shadchin@ ok oga@
Diffstat (limited to 'driver')
-rw-r--r--driver/xf86-video-intel/src/i830_driver.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/driver/xf86-video-intel/src/i830_driver.c b/driver/xf86-video-intel/src/i830_driver.c
index af57830d0..05664533c 100644
--- a/driver/xf86-video-intel/src/i830_driver.c
+++ b/driver/xf86-video-intel/src/i830_driver.c
@@ -908,7 +908,9 @@ static Bool i830_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
/* ick. xf86EnableDisableFBAccess smashes the screen pixmap devPrivate,
* so update the value it uses
*/
+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,9,99,1,0)
scrn->pixmapPrivate.ptr = intel->FbBase + scrn->fbOffset;
+#endif
xf86DrvMsg(scrn->scrnIndex, X_INFO,
"New front buffer at 0x%lx\n",
intel->front_buffer->offset);