X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/blobdiff_plain/345c7cff9898c2f0bda1a01df26eb131a82f40be..d8c700bbb8b7bd992b9fe9b43de8a2f3d8e8587f:/tools/helpers/gpu.py?ds=sidebyside

diff --git a/tools/helpers/gpu.py b/tools/helpers/gpu.py
index 5db810f..0f621bb 100644
--- a/tools/helpers/gpu.py
+++ b/tools/helpers/gpu.py
@@ -12,12 +12,22 @@ def getKernelDriver(args, dev):
 
 def getCardFromRender(args, dev):
     try:
-        return "/dev/dri/" + os.path.basename(glob.glob("/sys/class/drm/{}/device/drm/card*".format(dev))[0])
+        return "/dev/dri/" + os.path.basename(sorted(glob.glob("/sys/class/drm/{}/device/drm/card*".format(dev)))[0])
     except IndexError:
         return ""
 
 def getDriNode(args):
-    for node in glob.glob("/dev/dri/renderD*"):
+    cfg = tools.config.load(args)
+    node = cfg["waydroid"].get("drm_device")
+    if node:
+        if not os.path.exists(node):
+            raise OSError("The specified drm_device {} does not exist".format(node))
+        renderDev = os.path.basename(node)
+        if getKernelDriver(args, renderDev) not in unsupported:
+            return node, getCardFromRender(args, renderDev)
+        return "", ""
+
+    for node in sorted(glob.glob("/dev/dri/renderD*")):
         renderDev = os.path.basename(node)
         if getKernelDriver(args, renderDev) not in unsupported:
             return node, getCardFromRender(args, renderDev)