glamor add radeon to whitelist, logging

jsorg71 · Jul 18, 2024 · c3d5ba4 · c3d5ba4
1 parent 5204a86
commit c3d5ba4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/xrdpdev/xorg.conf b/xrdpdev/xorg.conf
@@ -53,7 +53,7 @@ Section "Device"
     Driver "xrdpdev"
     Option "DRMDevice" "/dev/dri/renderD128"
     Option "DRI3" "1"
-    Option "DRMWhiteList" "i915"
+    Option "DRMWhiteList" "i915 radeon"
 EndSection
 
 Section "Screen"

diff --git a/xrdpdev/xrdpdev.c b/xrdpdev/xrdpdev.c
@@ -161,6 +161,8 @@ rdpPreInit(ScrnInfoPtr pScrn, int flags)
     DisplayModePtr mode;
     rdpPtr dev;
     struct drm_version dver;
+    char delim[] = " ";
+    char *token;
 
     LLOGLN(0, ("rdpPreInit:"));
     if (flags & PROBE_DETECT)
@@ -200,19 +202,18 @@ rdpPreInit(ScrnInfoPtr pScrn, int flags)
         dver.desc = g_new0(char, dver.desc_len);
         if (ioctl(dev->fd, DRM_IOCTL_VERSION, &dver) != -1)
         {
-            char delim[] = " ";
-            char *token;
             LLOGLN(0, ("rdpPreInit: name [%s]", dver.name));
             LLOGLN(0, ("rdpPreInit: date [%s]", dver.date));
             LLOGLN(0, ("rdpPreInit: desc [%s]", dver.desc));
             token = strtok(g_drm_white_list, delim);
             while (token != NULL)
             {
-                LLOGLN(0, ("rdpPreInit: token [%s]", token));
+                LLOGLN(10, ("rdpPreInit: token [%s]", token));
                 if (strstr(dver.name, token) != NULL)
                 {
                     dev->glamor = TRUE;
-                    LLOGLN(0, ("rdpPreInit: drm device looks ok, use glamor set"));
+                    LLOGLN(0, ("rdpPreInit: drm device looks ok, "
+                           "use glamor set"));
                     break;
                 }
                 token = strtok(NULL, delim);