ac/gpu_info: remove bogus assertion about number of COMPUTE/SDMA queues
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>
Wed, 25 Oct 2023 08:22:46 +0000 (10:22 +0200)
committerEric Engestrom <eric@engestrom.ch>
Mon, 30 Oct 2023 15:47:09 +0000 (15:47 +0000)
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)

.pick_status.json
src/amd/common/ac_gpu_info.c

index 6b23863..89ac320 100644 (file)
         "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
index 418a198..1663476 100644 (file)
@@ -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) {