Remove unused python imports

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

diff --git a/tools/helpers/gpu.py b/tools/helpers/gpu.py
index 2a38cfe82dc7b5f7ae5056f803997f6df6087ac5..0f621bb16a62f4939a81d0ecc6b1d2227bc2c04f 100644 (file)
--- a/tools/helpers/gpu.py
+++ b/tools/helpers/gpu.py
@@ -12,12 +12,22 @@ def getKernelDriver(args, dev):
 
 def getCardFromRender(args, dev):
     try:
 
 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):
     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)
         renderDev = os.path.basename(node)
         if getKernelDriver(args, renderDev) not in unsupported:
             return node, getCardFromRender(args, renderDev)


@@ -38,8 +48,9 @@ def getVulkanDriver(args, dev):
 
     if kernel_driver == "i915":
         try:
 
     if kernel_driver == "i915":
         try:

+            dev = os.path.basename(getCardFromRender(args, dev))

             gen = tools.helpers.run.user(args,["awk", "/^graphics version:|^gen:/ {print $NF}",
             gen = tools.helpers.run.user(args,["awk", "/^graphics version:|^gen:/ {print $NF}",

-                "/sys/kernel/debug/dri/{}/i915_capabilities".format(getMinor(args, dev))], output_return=True)
+                "/sys/kernel/debug/dri/{}/i915_capabilities".format(getMinor(args, dev))], output_return=True, check=False)

             if int(gen) < 9:
                 return "intel_hasvk"
         except:
             if int(gen) < 9:
                 return "intel_hasvk"
         except: