From 00c5b9691211f24c073c20bd8e954cbefc385716 Mon Sep 17 00:00:00 2001 From: Evan Quan Date: Mon, 17 Jun 2019 17:27:49 +0800 Subject: [PATCH 2595/2940] drm/amd/powerplay: check prerequisite for VCN power gating VCN DPM is a necessary prerequisite for VCN power gating. Change-Id: Ibfefc7c5031f1faf4ab2f2498b79fe2f7c7aebc6 Signed-off-by: Evan Quan Reviewed-by: Kevin Wang --- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c index 1c59a0f243ab..e2925e317201 100644 --- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c +++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c @@ -574,15 +574,19 @@ static int navi10_dpm_set_uvd_enable(struct smu_context *smu, bool enable) struct smu_power_gate *power_gate = &smu_power->power_gate; if (enable && power_gate->uvd_gated) { - ret = smu_send_smc_msg_with_param(smu, SMU_MSG_PowerUpVcn, 1); - if (ret) - return ret; + if (smu_feature_is_enabled(smu, SMU_FEATURE_DPM_UVD_BIT)) { + ret = smu_send_smc_msg_with_param(smu, SMU_MSG_PowerUpVcn, 1); + if (ret) + return ret; + } power_gate->uvd_gated = false; } else { if (!enable && !power_gate->uvd_gated) { - ret = smu_send_smc_msg(smu, SMU_MSG_PowerDownVcn); - if (ret) - return ret; + if (smu_feature_is_enabled(smu, SMU_FEATURE_DPM_UVD_BIT)) { + ret = smu_send_smc_msg(smu, SMU_MSG_PowerDownVcn); + if (ret) + return ret; + } power_gate->uvd_gated = true; } } -- 2.17.1