Skip to content

Commit 2317086

Browse files
committed
drm/amdgpu/smu13: drop compute workload workaround
This was fixed in PMFW before launch and is no longer required. Reviewed-by: Yang Wang <[email protected]> Signed-off-by: Alex Deucher <[email protected]> Cc: [email protected] # 6.1.x
1 parent 3938eb9 commit 2317086

File tree

1 file changed

+2
-30
lines changed

1 file changed

+2
-30
lines changed

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2530,38 +2530,10 @@ static int smu_v13_0_0_set_power_profile_mode(struct smu_context *smu,
25302530
}
25312531
}
25322532

2533-
if (smu->power_profile_mode == PP_SMC_POWER_PROFILE_COMPUTE &&
2534-
(((smu->adev->pdev->device == 0x744C) && (smu->adev->pdev->revision == 0xC8)) ||
2535-
((smu->adev->pdev->device == 0x744C) && (smu->adev->pdev->revision == 0xCC)))) {
2536-
ret = smu_cmn_update_table(smu,
2537-
SMU_TABLE_ACTIVITY_MONITOR_COEFF,
2538-
WORKLOAD_PPLIB_COMPUTE_BIT,
2539-
(void *)(&activity_monitor_external),
2540-
false);
2541-
if (ret) {
2542-
dev_err(smu->adev->dev, "[%s] Failed to get activity monitor!", __func__);
2543-
return ret;
2544-
}
2545-
2546-
ret = smu_cmn_update_table(smu,
2547-
SMU_TABLE_ACTIVITY_MONITOR_COEFF,
2548-
WORKLOAD_PPLIB_CUSTOM_BIT,
2549-
(void *)(&activity_monitor_external),
2550-
true);
2551-
if (ret) {
2552-
dev_err(smu->adev->dev, "[%s] Failed to set activity monitor!", __func__);
2553-
return ret;
2554-
}
2555-
2556-
workload_type = smu_cmn_to_asic_specific_index(smu,
2557-
CMN2ASIC_MAPPING_WORKLOAD,
2558-
PP_SMC_POWER_PROFILE_CUSTOM);
2559-
} else {
2560-
/* conv PP_SMC_POWER_PROFILE* to WORKLOAD_PPLIB_*_BIT */
2561-
workload_type = smu_cmn_to_asic_specific_index(smu,
2533+
/* conv PP_SMC_POWER_PROFILE* to WORKLOAD_PPLIB_*_BIT */
2534+
workload_type = smu_cmn_to_asic_specific_index(smu,
25622535
CMN2ASIC_MAPPING_WORKLOAD,
25632536
smu->power_profile_mode);
2564-
}
25652537

25662538
if (workload_type < 0)
25672539
return -EINVAL;

0 commit comments

Comments
 (0)