diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-01-31 07:47:29 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-01-31 07:47:29 +0000 |
| commit | 973e4e72b90a98f23aa855f0c68b8ce8686cfb03 (patch) | |
| tree | 35c53a26cfe3400ceac37753e3c2647dcf9625c4 /driver | |
| parent | 8a75d2fb4e0c5e3f7ac82507ba9851fb736bb67c (diff) | |
Explicitely disable DRI on SandyBridge and above chipsets. It doesn't
work anyways, so prevent X from crashing. ok oga@
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/xf86-video-intel/src/intel_dri.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/driver/xf86-video-intel/src/intel_dri.c b/driver/xf86-video-intel/src/intel_dri.c index a19148714..e230925c0 100644 --- a/driver/xf86-video-intel/src/intel_dri.c +++ b/driver/xf86-video-intel/src/intel_dri.c @@ -1174,6 +1174,12 @@ Bool I830DRI2ScreenInit(ScreenPtr screen) intel->deviceName = drmGetDeviceNameFromFd(intel->drmSubFD); memset(&info, '\0', sizeof(info)); + if (INTEL_INFO(intel)->gen >= 60) { + xf86DrvMsg(scrn->scrnIndex, X_WARNING, + "DRI disabled on Sandy Bridge chipsets\n"); + return FALSE; + } + info.fd = intel->drmSubFD; info.driverName = INTEL_INFO(intel)->gen < 40 ? "i915" : "i965"; info.deviceName = intel->deviceName; |