]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
drm/amd/powerplay: drop jpeg instance1 dpm setup
authorLikun Gao <Likun.Gao@amd.com>
Tue, 21 Apr 2020 02:39:12 +0000 (10:39 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 1 Jul 2020 05:59:13 +0000 (01:59 -0400)
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>
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c

index 512fa07ab2b24c8139cdc05a671e3a6a13d4e724..667c912e47fdc9e28732e2ee733f3f51b7e32060 100644 (file)
@@ -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;
        }