From 3f80abc103b6e17da79b4efbb30ceb546d4cf489 Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Mon, 28 Nov 2022 22:42:39 +0100 Subject: [PATCH] AOSP: Add intel_hasvk vulkan library suffix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Required to correctly install vulkan.intel_hasvk.so module after commit 50013ca9 ("intel: add a hasvk vulkan driver") In order to set property ro.hardware.vulkan as 'intel_hasvk' for the correct iGPU parts at init stage, i915 'graphics version' can only be detected by means of /sys/kernel/debug/dri/0/i915_capabilities and debugfs needs to be mounted at early-init stage https://review.lineageos.org/c/LineageOS/android_device_lge_g3-common/+/19875 Cc: "22.3" mesa-stable Acked-by: Lionel Landwerlin Acked-by: Tapani Pälli Tested-by: Mauro Rossi Part-of: (cherry picked from commit ea10b0fc7add2ad9dd486e69b5b5e7aca3c422f7) --- .pick_status.json | 2 +- android/Android.mk | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 75a48498e16..d1d5580fb2d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -481,7 +481,7 @@ "description": "AOSP: Add intel_hasvk vulkan library suffix", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/android/Android.mk b/android/Android.mk index 49fdd56443c..7f1f679391c 100644 --- a/android/Android.mk +++ b/android/Android.mk @@ -30,6 +30,7 @@ LIBDRM_VERSION = $(shell cat external/libdrm/meson.build | grep -o "\\ MESA_VK_LIB_SUFFIX_amd := radeon MESA_VK_LIB_SUFFIX_intel := intel +MESA_VK_LIB_SUFFIX_intel_hasvk := intel_hasvk MESA_VK_LIB_SUFFIX_freedreno := freedreno MESA_VK_LIB_SUFFIX_broadcom := broadcom MESA_VK_LIB_SUFFIX_panfrost := panfrost