From 4c25e80e6cb3a1abf90edd7d555fc191cfc2ce3a Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 22 Jan 2024 11:49:34 +1000 Subject: [PATCH] radv: init decoder ip block earlier. This makes the queue decisions later correct. Cc: mesa-stable Reviewed-by: Samuel Pitoiset Part-of: (cherry picked from commit bba36df84d44a1c2eb8f482ce06642f1ca1c0c19) --- .pick_status.json | 2 +- src/amd/vulkan/radv_physical_device.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index e344f44a9db..b9904bb9d35 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -764,7 +764,7 @@ "description": "radv: init decoder ip block earlier.", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/amd/vulkan/radv_physical_device.c b/src/amd/vulkan/radv_physical_device.c index 867a0956e46..c9e276efa71 100644 --- a/src/amd/vulkan/radv_physical_device.c +++ b/src/amd/vulkan/radv_physical_device.c @@ -2022,13 +2022,13 @@ radv_physical_device_try_create(struct radv_instance *instance, drmDevicePtr drm if ((device->instance->debug_flags & RADV_DEBUG_INFO)) ac_print_gpu_info(&device->rad_info, stdout); + radv_init_physical_device_decoder(device); + radv_physical_device_init_queue_table(device); /* We don't check the error code, but later check if it is initialized. */ ac_init_perfcounters(&device->rad_info, false, false, &device->ac_perfcounters); - radv_init_physical_device_decoder(device); - /* The WSI is structured as a layer on top of the driver, so this has * to be the last part of initialization (at least until we get other * semi-layers).