[xsrc/trunk]: xsrc/external/mit/xf86-video-wsfb/dist/src The modesetting driv...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/f386df4301c9
branches:  trunk
changeset: 10106:f386df4301c9
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Feb 03 17:11:49 2019 +0000

description:
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.

diffstat:

 external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c |  7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diffs (17 lines):

diff -r bcd1549e1002 -r f386df4301c9 external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
--- a/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c       Thu Jan 31 20:46:43 2019 +0000
+++ b/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c       Sun Feb 03 17:11:49 2019 +0000
@@ -368,6 +368,13 @@
                                              &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;