Module Name: xsrc
Committed By: riastradh
Date: Tue Jul 1 15:16:07 UTC 2014
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src/sna: sna_dri.c
Log Message:
Disable DRI for Ivy Bridge (and later) until we update Mesa.
This is a stop-gap for PR 48916.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_dri.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_dri.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_dri.c:1.1.1.1 xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_dri.c:1.2
--- xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_dri.c:1.1.1.1 Fri Mar 21 22:42:41 2014
+++ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_dri.c Tue Jul 1 15:16:07 2014
@@ -2287,8 +2287,11 @@ static const char *dri_driver_name(struc
return has_i830_dri() ? "i830" : "i915";
else if (sna->kgem.gen < 040)
return "i915";
- else
+ /* XXX No Ivy Bridge yet in our version of Mesa. */
+ else if (sna->kgem.gen < 070)
return "i965";
+ else
+ return NULL;
}
return s;
@@ -2321,6 +2324,11 @@ bool sna_dri_open(struct sna *sna, Scree
memset(&info, '\0', sizeof(info));
info.fd = sna->kgem.fd;
info.driverName = dri_driver_name(sna);
+ if (info.driverName == NULL) {
+ xf86DrvMsg(sna->scrn->scrnIndex, X_WARNING,
+ "no DRI2 on NetBSD for this device yet");
+ return false;
+ }
info.deviceName = intel_get_device_name(sna->scrn);
DBG(("%s: loading dri driver '%s' [gen=%d] for device '%s'\n",
