From: Likun Gao <Likun.Gao@amd.com>
Date: Tue, 21 Apr 2020 02:39:12 +0000 (+0800)
Subject: drm/amd/powerplay: drop jpeg instance1 dpm setup
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=338d90b613ea3546faeb55a94850d997c9a61689;p=linux.git

drm/amd/powerplay: drop jpeg instance1 dpm setup

VCN removed JPEG for instance 1, so drop jpeg instance1 dpm setup.

Signed-off-by: Likun Gao <Likun.Gao@amd.com>
Reviewed-by: Kenneth Feng <kenneth.feng@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c b/drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c
index 512fa07ab2b24..667c912e47fdc 100644
--- a/drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c
+++ b/drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c
@@ -645,9 +645,6 @@ static int sienna_cichlid_dpm_set_jpeg_enable(struct smu_context *smu, bool enab
 			ret = smu_send_smc_msg_with_param(smu, SMU_MSG_PowerUpJpeg, 0, NULL);
 			if (ret)
 				return ret;
-			ret = smu_send_smc_msg_with_param(smu, SMU_MSG_PowerUpJpeg, 0x10000, NULL);
-			if (ret)
-				return ret;
 		}
 		power_gate->jpeg_gated = false;
 	} else {
@@ -655,9 +652,6 @@ static int sienna_cichlid_dpm_set_jpeg_enable(struct smu_context *smu, bool enab
 			ret = smu_send_smc_msg_with_param(smu, SMU_MSG_PowerDownJpeg, 0, NULL);
 			if (ret)
 				return ret;
-			ret = smu_send_smc_msg_with_param(smu, SMU_MSG_PowerDownJpeg, 0x10000, NULL);
-			if (ret)
-				return ret;
 		}
 		power_gate->jpeg_gated = true;
 	}