Revert "drm/amd/pm: workaround to pass jpeg unit test"

This reverts commit 6b18376ef37c3dd2bbf34ed4b42fefaa1f348a3d.
Revert this due to a final solution:
commit ed3165d660d8 ("drm/amdgpu/jpeg5: reprogram doorbell setting after power up for each playback")

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

diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index 8e694b576d1ccd2d5478a4a76dc5c1e57bcb864e..00384b381289b5f16806c8af490845efe1551db6 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -237,7 +237,6 @@ static int smu_dpm_set_vcn_enable(struct smu_context *smu,
 {
        struct smu_power_context *smu_power = &smu->smu_power;
        struct smu_power_gate *power_gate = &smu_power->power_gate;
-       struct amdgpu_device *adev = smu->adev;
        int ret = 0;
 
        /*
@@ -253,7 +252,7 @@ static int smu_dpm_set_vcn_enable(struct smu_context *smu,
                return 0;
 
        ret = smu->ppt_funcs->dpm_set_vcn_enable(smu, enable);
-       if (!ret && !adev->enable_jpeg_test)
+       if (!ret)
                atomic_set(&power_gate->vcn_gated, !enable);
 
        return ret;

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
index 7179cdacf1561eda77960ca92eb3ef5a7c5a31b1..98ea58d792ca18c0efdbb4bad33367edc2454202 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
@@ -1869,34 +1869,6 @@ static ssize_t smu_v14_0_2_get_ecc_info(struct smu_context *smu,
        return ret;
 }
 
-static int smu_v14_0_2_set_vcn_enable(struct smu_context *smu,
-                            bool enable)
-{
-       struct amdgpu_device *adev = smu->adev;
-       struct smu_power_gate *power_gate = &smu->smu_power.power_gate;
-       int i, ret = 0;
-
-       if (!adev->enable_jpeg_test)
-               return smu_v14_0_set_vcn_enable(smu, enable);
-
-       if (!atomic_read(&power_gate->vcn_gated) || !enable)
-               return 0;
-
-       for (i = 0; i < adev->vcn.num_vcn_inst; i++) {
-               if (adev->vcn.harvest_config & (1 << i))
-                       continue;
-
-               ret = smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_PowerUpVcn,
-                                                     i << 16U, NULL);
-               if (ret)
-                       return ret;
-       }
-
-       atomic_set(&power_gate->vcn_gated, 0);
-
-       return ret;
-}
-
 static const struct pptable_funcs smu_v14_0_2_ppt_funcs = {
        .get_allowed_feature_mask = smu_v14_0_2_get_allowed_feature_mask,
        .set_default_dpm_table = smu_v14_0_2_set_default_dpm_table,
@@ -1919,7 +1891,7 @@ static const struct pptable_funcs smu_v14_0_2_ppt_funcs = {
        .system_features_control = smu_v14_0_system_features_control,
        .set_allowed_mask = smu_v14_0_set_allowed_mask,
        .get_enabled_mask = smu_cmn_get_enabled_mask,
-       .dpm_set_vcn_enable = smu_v14_0_2_set_vcn_enable,
+       .dpm_set_vcn_enable = smu_v14_0_set_vcn_enable,
        .dpm_set_jpeg_enable = smu_v14_0_set_jpeg_enable,
        .get_dpm_ultimate_freq = smu_v14_0_2_get_dpm_ultimate_freq,
        .get_vbios_bootup_values = smu_v14_0_get_vbios_bootup_values,