Add mainline vulkan support

Attempts to set the correct ro.hardware.vulkan value based on the
loaded drm driver name

diff --git a/tools/helpers/gpu.py b/tools/helpers/gpu.py
index 5f346566546fc28ad901ecdfe9ad4060a609a5b3..88135d98f01398ae5f4d18fb2b441770f71aff76 100644 (file)
--- a/tools/helpers/gpu.py
+++ b/tools/helpers/gpu.py
@@ -4,10 +4,26 @@ import tools.helpers.props
 
 unsupported = ["nvidia"]
 
 
 unsupported = ["nvidia"]
 

+def getKernelDriver(args, dev):
+    return tools.helpers.props.file_get(args, "/sys/class/drm/{}/device/uevent".format(dev), "DRIVER")
+

 def getDriNode(args):
     for node in glob.glob("/dev/dri/renderD*"):
         dev = os.path.basename(node)
 def getDriNode(args):
     for node in glob.glob("/dev/dri/renderD*"):
         dev = os.path.basename(node)

-        driver = tools.helpers.props.file_get(args, "/sys/class/drm/{}/device/uevent".format(dev), "DRIVER")
-        if driver not in unsupported:
+        if getKernelDriver(args, dev) not in unsupported:

             return node
     return ""
             return node
     return ""

+
+def getVulkanDriver(args, dev):
+    mapping = {
+        "i915": "intel",
+        "amdgpu": "radeon",
+        "radeon": "radeon",
+        "panfrost": "panfrost",
+        "msm": "freedreno",
+        "vc4": "broadcom",
+    }
+    kernel_driver = getKernelDriver(args, dev)
+    if kernel_driver in mapping:
+        return mapping[kernel_driver]
+    return ""

diff --git a/tools/helpers/lxc.py b/tools/helpers/lxc.py
index 9a3a77a968eefecea04c0e52c9bd73cf15ac9d8f..8cacfe25ccee0b9497814c9d8b790516a7e6ab70 100644 (file)
--- a/tools/helpers/lxc.py
+++ b/tools/helpers/lxc.py
@@ -177,10 +177,11 @@ def make_base_props(args):
         props.append("sys.use_memfd=true")
 
     egl = tools.helpers.props.host_get(args, "ro.hardware.egl")
         props.append("sys.use_memfd=true")
 
     egl = tools.helpers.props.host_get(args, "ro.hardware.egl")

+    dri = tools.helpers.gpu.getDriNode(args)

 
     gralloc = find_hal("gralloc")
     if gralloc == "":
 
     gralloc = find_hal("gralloc")
     if gralloc == "":

-        if tools.helpers.gpu.getDriNode(args):
+        if dri:

             gralloc = "gbm"
             egl = "mesa"
         else:
             gralloc = "gbm"
             egl = "mesa"
         else:


@@ -209,7 +210,9 @@ def make_base_props(args):
         props.append("ro.vendor.extension_library=" + ext_library)
 
     vulkan = find_hal("vulkan")
         props.append("ro.vendor.extension_library=" + ext_library)
 
     vulkan = find_hal("vulkan")

-    if vulkan != "":
+    if not vulkan and dri:
+        vulkan = tools.helpers.gpu.getVulkanDriver(args, os.path.basename(dri))
+    if vulkan:

         props.append("ro.hardware.vulkan=" + vulkan)
 
     treble = tools.helpers.props.host_get(args, "ro.treble.enabled")
         props.append("ro.hardware.vulkan=" + vulkan)
 
     treble = tools.helpers.props.host_get(args, "ro.treble.enabled")