gpu: Also mount card node

[waydroid.git] / tools / helpers / gpu.py

diff --git a/tools/helpers/gpu.py b/tools/helpers/gpu.py
index cf88540d11e53c133e66fd1b555aec6534daaf5f..eac31846a87e24471e4bc144a9e8fb6ba8532b34 100644 (file)
--- a/tools/helpers/gpu.py
+++ b/tools/helpers/gpu.py
@@ -7,12 +7,18 @@ unsupported = ["nvidia", "nouveau"]
 def getKernelDriver(args, dev):
     return tools.helpers.props.file_get(args, "/sys/class/drm/{}/device/uevent".format(dev), "DRIVER")
 
 def getKernelDriver(args, dev):
     return tools.helpers.props.file_get(args, "/sys/class/drm/{}/device/uevent".format(dev), "DRIVER")
 

+def getCardFromRender(args, dev):
+    try:
+        return "/dev/dri/" + os.path.basename(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*"):
 def getDriNode(args):
     for node in glob.glob("/dev/dri/renderD*"):

-        dev = os.path.basename(node)
-        if getKernelDriver(args, dev) not in unsupported:
-            return node
-    return ""
+        renderDev = os.path.basename(node)
+        if getKernelDriver(args, renderDev) not in unsupported:
+            return node, getCardFromRender(args, renderDev)
+    return "", ""

 
 def getVulkanDriver(args, dev):
     mapping = {
 
 def getVulkanDriver(args, dev):
     mapping = {