diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2023-10-25 10:22:46 +0200 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2023-10-30 15:47:09 +0000 |
| commit | e3bef4dfa371dad053311687a13497df92451971 (patch) | |
| tree | 65cdd8dac0e8347559acb3e6e836206879e9b107 | |
| parent | e0b436252f4b74117008e6f0b491c09559a5b116 (diff) | |
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 <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25876>
(cherry picked from commit 4f8a2253875fdb677beb85c91ecb033cbf231fc7)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/amd/common/ac_gpu_info.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/.pick_status.json b/.pick_status.json index 6b23863492e..89ac320bd81 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 418a1989344..16634762cbc 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) { |