mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
drm/amdgpu: Drop PMFW RLC notifier from amdgpu_device_suspend()
For S3 on vangogh, PMFW needs to be notified before the
driver powers down RLC. This already happens in smu_disable_dpms()
so drop the superfluous call in amdgpu_device_suspend().
Co-developed-by: Mario Limonciello (AMD) <superm1@kernel.org>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 960e30a61e)
This commit is contained in:
@@ -5243,10 +5243,6 @@ int amdgpu_device_suspend(struct drm_device *dev, bool notify_clients)
|
|||||||
if (amdgpu_sriov_vf(adev))
|
if (amdgpu_sriov_vf(adev))
|
||||||
amdgpu_virt_release_full_gpu(adev, false);
|
amdgpu_virt_release_full_gpu(adev, false);
|
||||||
|
|
||||||
r = amdgpu_dpm_notify_rlc_state(adev, false);
|
|
||||||
if (r)
|
|
||||||
return r;
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -195,24 +195,6 @@ int amdgpu_dpm_set_mp1_state(struct amdgpu_device *adev,
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
int amdgpu_dpm_notify_rlc_state(struct amdgpu_device *adev, bool en)
|
|
||||||
{
|
|
||||||
int ret = 0;
|
|
||||||
const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;
|
|
||||||
|
|
||||||
if (pp_funcs && pp_funcs->notify_rlc_state) {
|
|
||||||
mutex_lock(&adev->pm.mutex);
|
|
||||||
|
|
||||||
ret = pp_funcs->notify_rlc_state(
|
|
||||||
adev->powerplay.pp_handle,
|
|
||||||
en);
|
|
||||||
|
|
||||||
mutex_unlock(&adev->pm.mutex);
|
|
||||||
}
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
int amdgpu_dpm_is_baco_supported(struct amdgpu_device *adev)
|
int amdgpu_dpm_is_baco_supported(struct amdgpu_device *adev)
|
||||||
{
|
{
|
||||||
const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;
|
const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;
|
||||||
|
|||||||
@@ -424,8 +424,6 @@ int amdgpu_dpm_mode1_reset(struct amdgpu_device *adev);
|
|||||||
int amdgpu_dpm_set_mp1_state(struct amdgpu_device *adev,
|
int amdgpu_dpm_set_mp1_state(struct amdgpu_device *adev,
|
||||||
enum pp_mp1_state mp1_state);
|
enum pp_mp1_state mp1_state);
|
||||||
|
|
||||||
int amdgpu_dpm_notify_rlc_state(struct amdgpu_device *adev, bool en);
|
|
||||||
|
|
||||||
int amdgpu_dpm_set_gfx_power_up_by_imu(struct amdgpu_device *adev);
|
int amdgpu_dpm_set_gfx_power_up_by_imu(struct amdgpu_device *adev);
|
||||||
|
|
||||||
int amdgpu_dpm_baco_exit(struct amdgpu_device *adev);
|
int amdgpu_dpm_baco_exit(struct amdgpu_device *adev);
|
||||||
|
|||||||
Reference in New Issue
Block a user