Skip to content

Commit 389d79a

Browse files
Lijo Lazaralexdeucher
authored andcommitted
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.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 9d1ac25) Cc: stable@vger.kernel.org
1 parent 6531a2c commit 389d79a

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ static int __aqua_vanjaram_get_px_mode_info(struct amdgpu_xcp_mgr *xcp_mgr,
227227
uint16_t *nps_modes)
228228
{
229229
struct amdgpu_device *adev = xcp_mgr->adev;
230+
uint32_t gc_ver = amdgpu_ip_version(adev, GC_HWIP, 0);
230231

231232
if (!num_xcp || !nps_modes || !(xcp_mgr->supp_xcp_modes & BIT(px_mode)))
232233
return -EINVAL;
@@ -250,12 +251,14 @@ static int __aqua_vanjaram_get_px_mode_info(struct amdgpu_xcp_mgr *xcp_mgr,
250251
*num_xcp = 4;
251252
*nps_modes = BIT(AMDGPU_NPS1_PARTITION_MODE) |
252253
BIT(AMDGPU_NPS4_PARTITION_MODE);
254+
if (gc_ver == IP_VERSION(9, 5, 0))
255+
*nps_modes |= BIT(AMDGPU_NPS2_PARTITION_MODE);
253256
break;
254257
case AMDGPU_CPX_PARTITION_MODE:
255258
*num_xcp = NUM_XCC(adev->gfx.xcc_mask);
256259
*nps_modes = BIT(AMDGPU_NPS1_PARTITION_MODE) |
257260
BIT(AMDGPU_NPS4_PARTITION_MODE);
258-
if (amdgpu_sriov_vf(adev))
261+
if (gc_ver == IP_VERSION(9, 5, 0))
259262
*nps_modes |= BIT(AMDGPU_NPS2_PARTITION_MODE);
260263
break;
261264
default:

0 commit comments

Comments
 (0)