Skip to content

Commit c81f5ce

Browse files
committed
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 960e30a61e1a7ca5341a6cf9481e770e1cda24aa)
1 parent fdc93be commit c81f5ce

File tree

3 files changed

+0
-24
lines changed

3 files changed

+0
-24
lines changed

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5243,10 +5243,6 @@ int amdgpu_device_suspend(struct drm_device *dev, bool notify_clients)
52435243
if (amdgpu_sriov_vf(adev))
52445244
amdgpu_virt_release_full_gpu(adev, false);
52455245

5246-
r = amdgpu_dpm_notify_rlc_state(adev, false);
5247-
if (r)
5248-
return r;
5249-
52505246
return 0;
52515247
}
52525248

drivers/gpu/drm/amd/pm/amdgpu_dpm.c

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -195,24 +195,6 @@ int amdgpu_dpm_set_mp1_state(struct amdgpu_device *adev,
195195
return ret;
196196
}
197197

198-
int amdgpu_dpm_notify_rlc_state(struct amdgpu_device *adev, bool en)
199-
{
200-
int ret = 0;
201-
const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;
202-
203-
if (pp_funcs && pp_funcs->notify_rlc_state) {
204-
mutex_lock(&adev->pm.mutex);
205-
206-
ret = pp_funcs->notify_rlc_state(
207-
adev->powerplay.pp_handle,
208-
en);
209-
210-
mutex_unlock(&adev->pm.mutex);
211-
}
212-
213-
return ret;
214-
}
215-
216198
int amdgpu_dpm_is_baco_supported(struct amdgpu_device *adev)
217199
{
218200
const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;

drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,8 +424,6 @@ int amdgpu_dpm_mode1_reset(struct amdgpu_device *adev);
424424
int amdgpu_dpm_set_mp1_state(struct amdgpu_device *adev,
425425
enum pp_mp1_state mp1_state);
426426

427-
int amdgpu_dpm_notify_rlc_state(struct amdgpu_device *adev, bool en);
428-
429427
int amdgpu_dpm_set_gfx_power_up_by_imu(struct amdgpu_device *adev);
430428

431429
int amdgpu_dpm_baco_exit(struct amdgpu_device *adev);

0 commit comments

Comments
 (0)