Mesa (main): ac: Enable 32bit predication on gfx9 with fw feature version 52.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: d3f735a2497c16b57ce4645998c37a294faa9f08
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d3f735a2497c16b57ce4645998c37a294faa9f08

Author: Georg Lehmann <dadschoorse at gmail.com>
Date:   Thu Jun 10 12:47:51 2021 +0200

ac: Enable 32bit predication on gfx9 with fw feature version 52.

Amdvlk does this as well and it passes the vulkan CTS on renoir.

Signed-off-by: Georg Lehmann <dadschoorse at gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11297>

---

 src/amd/common/ac_gpu_info.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c
index bc7be71b23c..f7a9a5b5a47 100644
--- a/src/amd/common/ac_gpu_info.c
+++ b/src/amd/common/ac_gpu_info.c
@@ -909,8 +909,10 @@ bool ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info,
    /* Support for GFX10.3 was added with F32_ME_FEATURE_VERSION_31 but the
     * feature version wasn't bumped.
     */
-   info->has_32bit_predication = info->chip_class >= GFX10 &&
-                                 info->me_fw_feature >= 32;
+   info->has_32bit_predication = (info->chip_class >= GFX10 &&
+                                  info->me_fw_feature >= 32) ||
+                                 (info->chip_class == GFX9 &&
+                                  info->me_fw_feature >= 52);
 
    /* Get the number of good compute units. */
    info->num_good_compute_units = 0;