RPI4: Improve DRM card check #1723

raysan5 · raysan5 · commit 03815ec4fe06 · 2021-04-22T21:01:48.000+02:00
diff --git a/src/core.c b/src/core.c
@@ -3810,7 +3810,7 @@ static bool InitGraphicsDevice(int width, int height)
 #else
     TRACELOG(LOG_INFO, "DISPLAY: No graphic card set, trying card1");
     CORE.Window.fd = open("/dev/dri/card1", O_RDWR); // VideoCore VI (Raspberry Pi 4)
-    if (-1 == CORE.Window.fd)
+    if ((-1 == CORE.Window.fd) || (drmModeGetResources(CORE.Window.fd) == NULL))
     {
         TRACELOG(LOG_INFO, "DISPLAY: Failed to open graphic card1, trying card0");
         CORE.Window.fd = open("/dev/dri/card0", O_RDWR); // VideoCore IV (Raspberry Pi 1-3)

Original file line number	Diff line number	Diff line change
`@@ -3810,7 +3810,7 @@ static bool InitGraphicsDevice(int width, int height)`
`3810`	`3810`	`#else`
`3811`	`3811`	`TRACELOG(LOG_INFO, "DISPLAY: No graphic card set, trying card1");`
`3812`	`3812`	`CORE.Window.fd = open("/dev/dri/card1", O_RDWR); // VideoCore VI (Raspberry Pi 4)`
`3813`		`- if (-1 == CORE.Window.fd)`
	`3813`	`+ if ((-1 == CORE.Window.fd) \|\| (drmModeGetResources(CORE.Window.fd) == NULL))`
`3814`	`3814`	`{`
`3815`	`3815`	`TRACELOG(LOG_INFO, "DISPLAY: Failed to open graphic card1, trying card0");`
`3816`	`3816`	`CORE.Window.fd = open("/dev/dri/card0", O_RDWR); // VideoCore IV (Raspberry Pi 1-3)`