drm/amdgpu: Update supported modes for GC v9.5.0

commit 389d79a195a9f71a103b39097ee8341a7ca60927 upstream.

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

Signed-off-by: Lijo Lazar <lijo.lazar@amd.com>
Acked-by: Mangesh Gadre <Mangesh.Gadre@amd.com>
Reviewed-by: Asad Kamal <asad.kamal@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 9d1ac25c7f830e0132aa816393b1e9f140e71148)
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c b/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c
index 1c083304ae77676aaa825609317bb66cca7de7fb..c67c4705d662e6678104eca41f6eb75dd787f097 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c
+++ b/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c
@@ -453,6 +453,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;
@@ -476,12 +477,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: