summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorn00b7 <n00b7@outlook.com>2020-07-03 10:46:51 +0200
committerMarge Bot <eric+marge@anholt.net>2020-10-13 21:21:31 +0000
commitaebfdfa04c0e6369fa66e59c8f9d3f6ce71b02ed (patch)
treebcf7feb419227b212de875f8ab36ded97c91c907
parent3bd02a729a63513cd8f44e766b47ef4ddbc08c20 (diff)
v3dv/device: handle primary nodes for newer kernels
For kernels rpi-5.X.y it changed from brcm,bcm2835-vc4 to brcm,bcm2711-vc5, so let's just check for both strings. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6766>
-rw-r--r--src/broadcom/vulkan/v3dv_device.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/broadcom/vulkan/v3dv_device.c b/src/broadcom/vulkan/v3dv_device.c
index 14a06479be7..617bf116ccb 100644
--- a/src/broadcom/vulkan/v3dv_device.c
+++ b/src/broadcom/vulkan/v3dv_device.c
@@ -503,7 +503,8 @@ enumerate_devices(struct v3dv_instance *instance)
} else if (devices[i]->available_nodes & 1 << DRM_NODE_PRIMARY) {
char **compat = devices[i]->deviceinfo.platform->compatible;
while (*compat) {
- if (strncmp(*compat, "brcm,bcm2835-vc4", 16) == 0) {
+ if (strncmp(*compat, "brcm,bcm2711-vc5", 16) == 0 ||
+ strncmp(*compat, "brcm,bcm2835-vc4", 16) == 0 ) {
vc4_idx = i;
break;
}