From 46c290d94b4f429368401727bbe983bdf6435ada Mon Sep 17 00:00:00 2001 From: Danylo Piliaiev Date: Thu, 8 Feb 2024 17:57:17 +0100 Subject: [PATCH] tu: Do not print anything on systems without Adreno GPU Output debug info only when explicitly requested with TU_DEBUG=startup otherwise we should be silent. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10213 Fixes: a669147689a3253f4fe8dd80288d34124cbb2d02 ("tu: Always print startup failure messages") Signed-off-by: Danylo Piliaiev Part-of: (cherry picked from commit c8cc7c5c1863aa9098baaea3546dcbbbeb17f495) --- .pick_status.json | 2 +- src/freedreno/vulkan/tu_knl.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 9997ebc8b56..c455b65a132 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2514,7 +2514,7 @@ "description": "tu: Do not print anything on systems without Adreno GPU", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "a669147689a3253f4fe8dd80288d34124cbb2d02", "notes": null diff --git a/src/freedreno/vulkan/tu_knl.cc b/src/freedreno/vulkan/tu_knl.cc index 422a65b4600..2e206e23f72 100644 --- a/src/freedreno/vulkan/tu_knl.cc +++ b/src/freedreno/vulkan/tu_knl.cc @@ -228,7 +228,7 @@ tu_physical_device_try_create(struct vk_instance *vk_instance, #ifdef TU_HAS_VIRTIO result = tu_knl_drm_virtio_load(instance, fd, version, &device); #endif - } else { + } else if (TU_DEBUG(STARTUP)) { result = vk_startup_errorf(instance, VK_ERROR_INCOMPATIBLE_DRIVER, "device %s (%s) is not compatible with turnip", path, version->name);