From 25e1c3d5b3ab4e066dd36c0a964ce7d413dac02e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Krist=C3=B3f?= Date: Fri, 23 Sep 2022 14:03:10 +0200 Subject: [PATCH] radv: Use a fallback for marketing name when libdrm doesn't know it. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently for GPUs which don't have a marketing name in libdrm, RADV just prints "(null) (RADV ...)", which looks bad. This commit replaces the "(null)" with "AMD Unknown". Cc: mesa-stable Signed-off-by: Timur Kristóf Reviewed-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen Part-of: --- src/amd/vulkan/radv_device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index a06e72f474f..90ce2fe8922 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -815,7 +815,8 @@ radv_physical_device_try_create(struct radv_instance *instance, drmDevicePtr drm const char *marketing_name = device->ws->get_chip_name(device->ws); snprintf(device->marketing_name, sizeof(device->name), "%s (RADV %s%s)", - marketing_name, device->rad_info.name, radv_get_compiler_string(device)); + marketing_name ? marketing_name : "AMD Unknown", device->rad_info.name, + radv_get_compiler_string(device)); #ifdef ENABLE_SHADER_CACHE if (radv_device_get_cache_uuid(device, device->cache_uuid)) {