From: Samuel Pitoiset Date: Wed, 25 Oct 2023 08:22:46 +0000 (+0200) Subject: ac/gpu_info: remove bogus assertion about number of COMPUTE/SDMA queues X-Git-Tag: upstream/23.3.3~334 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e3bef4dfa371dad053311687a13497df92451971;p=platform%2Fupstream%2Fmesa.git ac/gpu_info: remove bogus assertion about number of COMPUTE/SDMA queues For example, my polaris10 GPU now returns 3 compute queues. Cc: mesa-stable Signed-off-by: Samuel Pitoiset Part-of: (cherry picked from commit 4f8a2253875fdb677beb85c91ecb033cbf231fc7) --- diff --git a/.pick_status.json b/.pick_status.json index 6b23863..89ac320 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1394,7 +1394,7 @@ "description": "ac/gpu_info: remove bogus assertion about number of COMPUTE/SDMA queues", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c index 418a198..1663476 100644 --- a/src/amd/common/ac_gpu_info.c +++ b/src/amd/common/ac_gpu_info.c @@ -705,9 +705,6 @@ bool ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info, return false; } - assert(util_is_power_of_two_or_zero(info->ip[AMD_IP_COMPUTE].num_queues)); - assert(util_is_power_of_two_or_zero(info->ip[AMD_IP_SDMA].num_queues)); - r = amdgpu_query_firmware_version(dev, AMDGPU_INFO_FW_GFX_ME, 0, 0, &info->me_fw_version, &info->me_fw_feature); if (r) {