RE: [PATCH] drm/amdgpu: Update supported modes for GC v9.5.0

[Kamal, Asad]

[AMD Official Use Only - AMD Internal Distribution Only]

Reviewed-by: Asad Kamal <asad.ka...@amd.com>

Thanks & Regards
Asad

-----Original Message-----
From: amd-gfx <amd-gfx-boun...@lists.freedesktop.org> On Behalf Of Lijo Lazar
Sent: Tuesday, July 22, 2025 9:16 AM
To: amd-gfx@lists.freedesktop.org
Cc: Zhang, Hawking <hawking.zh...@amd.com>; Deucher, Alexander 
<alexander.deuc...@amd.com>; Gadre, Mangesh <mangesh.ga...@amd.com>; Lin, Amber 
<amber....@amd.com>
Subject: [PATCH] drm/amdgpu: Update supported modes for GC v9.5.0

For GC v9.5.0 SOCs, both CPX and QPX compute modes are also supported in
NPS2 mode.

Signed-off-by: Lijo Lazar <lijo.la...@amd.com>
Acked-by: Mangesh Gadre <mangesh.ga...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c 
b/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c
index 914cf4bfb033..811124ff88a8 100644
--- a/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c
+++ b/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c
@@ -227,6 +227,7 @@ static int __aqua_vanjaram_get_px_mode_info(struct 
amdgpu_xcp_mgr *xcp_mgr,
                                            uint16_t *nps_modes)
 {
        struct amdgpu_device *adev = xcp_mgr->adev;
+       uint32_t gc_ver = amdgpu_ip_version(adev, GC_HWIP, 0);

        if (!num_xcp || !nps_modes || !(xcp_mgr->supp_xcp_modes & BIT(px_mode)))
                return -EINVAL;
@@ -250,12 +251,14 @@ static int __aqua_vanjaram_get_px_mode_info(struct 
amdgpu_xcp_mgr *xcp_mgr,
                *num_xcp = 4;
                *nps_modes = BIT(AMDGPU_NPS1_PARTITION_MODE) |
                             BIT(AMDGPU_NPS4_PARTITION_MODE);
+               if (gc_ver == IP_VERSION(9, 5, 0))
+                       *nps_modes |= BIT(AMDGPU_NPS2_PARTITION_MODE);
                break;
        case AMDGPU_CPX_PARTITION_MODE:
                *num_xcp = NUM_XCC(adev->gfx.xcc_mask);
                *nps_modes = BIT(AMDGPU_NPS1_PARTITION_MODE) |
                             BIT(AMDGPU_NPS4_PARTITION_MODE);
-               if (amdgpu_sriov_vf(adev))
+               if (gc_ver == IP_VERSION(9, 5, 0))
                        *nps_modes |= BIT(AMDGPU_NPS2_PARTITION_MODE);
                break;
        default:
--
2.49.0