Module Name: xsrc
Committed By: jmcneill
Date: Sun Feb 3 17:11:49 UTC 2019
Modified Files:
xsrc/external/mit/xf86-video-wsfb/dist/src: wsfb_driver.c
Log Message:
The modesetting driver and wsfb access the same hardware but through
different interfaces (/dev/dri/card0 vs /dev/ttyE0). To prevent both
drivers from being active at once, skip wsfb probe if the modesetting
driver has claimed the fb slot.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 \
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.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-wsfb/dist/src/wsfb_driver.c
diff -u xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.32 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.33
--- xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.32 Mon Dec 31 13:02:41 2018
+++ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c Sun Feb 3 17:11:49 2019
@@ -368,6 +368,13 @@ WsfbProbe(DriverPtr drv, int flags)
&devSections)) <= 0)
return FALSE;
+ /* Do not attach if the modesetting driver is active */
+ if (fbSlotClaimed == TRUE) {
+ DriverPtr fbSlotDrv = xf86GetEntityInfo(0)->driver;
+ if (strcmp(fbSlotDrv->driverName, "modesetting") == 0)
+ return FALSE;
+ }
+
for (i = 0; i < numDevSections; i++) {
ScrnInfoPtr pScrn = NULL;
