Mesa (staging/20.3): ac: fix detection of Pro graphics

[GitLab Mirror]

Module: Mesa
Branch: staging/20.3
Commit: 32b5779ade5718543093439ba8bd2883ea1b7a02
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=32b5779ade5718543093439ba8bd2883ea1b7a02

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Tue Nov 10 18:43:12 2020 -0500

ac: fix detection of Pro graphics

Fixes: bfb928759 "ac: add radeon_info::is_pro_graphics"

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7542>
(cherry picked from commit b635dff25620b948080d31211ca487a71203af4d)

---

 .pick_status.json            | 2 +-
 src/amd/common/ac_gpu_info.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 57121eab2dd..dc30435d1af 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -625,7 +625,7 @@
         "description": "ac: fix detection of Pro graphics",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "bfb92875992599d9c5ca5ecf39fce36a1719272d"
     },
diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c
index c5812452320..577ddd297e0 100644
--- a/src/amd/common/ac_gpu_info.c
+++ b/src/amd/common/ac_gpu_info.c
@@ -468,9 +468,9 @@ bool ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info,
    info->family_id = amdinfo->family_id;
    info->chip_external_rev = amdinfo->chip_external_rev;
    info->marketing_name = amdgpu_get_marketing_name(dev);
-   info->is_pro_graphics = info->marketing_name && (!strcmp(info->marketing_name, "Pro") ||
-                                                    !strcmp(info->marketing_name, "PRO") ||
-                                                    !strcmp(info->marketing_name, "Frontier"));
+   info->is_pro_graphics = info->marketing_name && (!strstr(info->marketing_name, "Pro") ||
+                                                    !strstr(info->marketing_name, "PRO") ||
+                                                    !strstr(info->marketing_name, "Frontier"));
 
    /* Set which chips have dedicated VRAM. */
    info->has_dedicated_vram = !(amdinfo->ids_flags & AMDGPU_IDS_FLAGS_FUSION);