Module: Mesa Branch: staging/22.2 Commit: 20886cf57254622583ec8659bf1426a20784f9ee URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=20886cf57254622583ec8659bf1426a20784f9ee
Author: James Zhu <[email protected]> Date: Mon Aug 29 15:46:20 2022 -0400 amd/common: some ASICs with gfx9 use compute rings for render Some ASICs with gfx9 use compute rings for render. Fixes: 983223de5dc01f50 - ac/gpu_info: use the kernel-reported GFX IP version to set gfx_level -v2: update merge requests num Signed-off-by: James Zhu <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18553> (cherry picked from commit fe8e18c7824b35ac83a6c0da50d4b01728675bb0) --- .pick_status.json | 2 +- src/amd/common/ac_gpu_info.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index ec0d51b8214..961dbd494b4 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1867,7 +1867,7 @@ "description": "amd/common: some ASICs with gfx9 use compute rings for render", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "983223de5dc01f50227b1b1fe20149ae56f611f6" }, diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c index c99dbc8d4cd..e26b4e879c1 100644 --- a/src/amd/common/ac_gpu_info.c +++ b/src/amd/common/ac_gpu_info.c @@ -852,7 +852,7 @@ bool ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info) info->gfx_level = GFX10_3; else if (info->ip[AMD_IP_GFX].ver_major == 10 && info->ip[AMD_IP_GFX].ver_minor == 1) info->gfx_level = GFX10; - else if (info->ip[AMD_IP_GFX].ver_major == 9) + else if (info->ip[AMD_IP_GFX].ver_major == 9 || info->ip[AMD_IP_COMPUTE].ver_major == 9) info->gfx_level = GFX9; else if (info->ip[AMD_IP_GFX].ver_major == 8) info->gfx_level = GFX8;
