Skip to content

Commit 156c0ab

Browse files
Lijo Lazaralexdeucher
authored andcommitted
drm/amd/pm: Remove unused logic in SMUv14.0.2
Remove commented and redundant logic in get_allowed_feature_mask implementation. Signed-off-by: Lijo Lazar <lijo.lazar@amd.com> Reviewed-by: Asad Kamal <asad.kamal@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent c99d381 commit 156c0ab

1 file changed

Lines changed: 0 additions & 39 deletions

File tree

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -268,50 +268,11 @@ static int
268268
smu_v14_0_2_get_allowed_feature_mask(struct smu_context *smu,
269269
uint32_t *feature_mask, uint32_t num)
270270
{
271-
struct amdgpu_device *adev = smu->adev;
272-
/*u32 smu_version;*/
273-
274271
if (num > 2)
275272
return -EINVAL;
276273

277274
memset(feature_mask, 0xff, sizeof(uint32_t) * num);
278275

279-
if (adev->pm.pp_feature & PP_SCLK_DPM_MASK) {
280-
*(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_DPM_GFXCLK_BIT);
281-
*(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_GFX_IMU_BIT);
282-
}
283-
#if 0
284-
if (!(adev->pg_flags & AMD_PG_SUPPORT_ATHUB) ||
285-
!(adev->pg_flags & AMD_PG_SUPPORT_MMHUB))
286-
*(uint64_t *)feature_mask &= ~FEATURE_MASK(FEATURE_ATHUB_MMHUB_PG_BIT);
287-
288-
if (!(adev->pm.pp_feature & PP_SOCCLK_DPM_MASK))
289-
*(uint64_t *)feature_mask &= ~FEATURE_MASK(FEATURE_DPM_SOCCLK_BIT);
290-
291-
/* PMFW 78.58 contains a critical fix for gfxoff feature */
292-
smu_cmn_get_smc_version(smu, NULL, &smu_version);
293-
if ((smu_version < 0x004e3a00) ||
294-
!(adev->pm.pp_feature & PP_GFXOFF_MASK))
295-
*(uint64_t *)feature_mask &= ~FEATURE_MASK(FEATURE_GFXOFF_BIT);
296-
297-
if (!(adev->pm.pp_feature & PP_MCLK_DPM_MASK)) {
298-
*(uint64_t *)feature_mask &= ~FEATURE_MASK(FEATURE_DPM_UCLK_BIT);
299-
*(uint64_t *)feature_mask &= ~FEATURE_MASK(FEATURE_VMEMP_SCALING_BIT);
300-
*(uint64_t *)feature_mask &= ~FEATURE_MASK(FEATURE_VDDIO_MEM_SCALING_BIT);
301-
}
302-
303-
if (!(adev->pm.pp_feature & PP_SCLK_DEEP_SLEEP_MASK))
304-
*(uint64_t *)feature_mask &= ~FEATURE_MASK(FEATURE_DS_GFXCLK_BIT);
305-
306-
if (!(adev->pm.pp_feature & PP_PCIE_DPM_MASK)) {
307-
*(uint64_t *)feature_mask &= ~FEATURE_MASK(FEATURE_DPM_LINK_BIT);
308-
*(uint64_t *)feature_mask &= ~FEATURE_MASK(FEATURE_DS_LCLK_BIT);
309-
}
310-
311-
if (!(adev->pm.pp_feature & PP_ULV_MASK))
312-
*(uint64_t *)feature_mask &= ~FEATURE_MASK(FEATURE_GFX_ULV_BIT);
313-
#endif
314-
315276
return 0;
316277
}
317278

0 commit comments

Comments
 (0)