Skip to content

Commit ee006eb

Browse files
Lyudealexdeucher
authored andcommitted
drm/amdgpu: Don't skip display settings in hwmgr_resume()
I'm not entirely sure why this is, but for some reason: 921935d ("drm/amd/powerplay: enforce display related settings only on needed") Breaks runtime PM resume on the Radeon PRO WX 3100 (Lexa) in one the pre-production laptops I have. The issue manifests as the following messages in dmesg: [drm] UVD and UVD ENC initialized successfully. amdgpu 0000:3b:00.0: [drm:amdgpu_ring_test_helper [amdgpu]] *ERROR* ring vce1 test failed (-110) [drm:amdgpu_device_ip_resume_phase2 [amdgpu]] *ERROR* resume of IP block <vce_v3_0> failed -110 [drm:amdgpu_device_resume [amdgpu]] *ERROR* amdgpu_device_ip_resume failed (-110). And happens after about 6-10 runtime PM suspend/resume cycles (sometimes sooner, if you're lucky!). Unfortunately I can't seem to pin down precisely which part in psm_adjust_power_state_dynamic that is causing the issue, but not skipping the display setting setup seems to fix it. Hopefully if there is a better fix for this, this patch will spark discussion around it. Fixes: 921935d ("drm/amd/powerplay: enforce display related settings only on needed") Cc: Evan Quan <[email protected]> Cc: Alex Deucher <[email protected]> Cc: Huang Rui <[email protected]> Cc: Rex Zhu <[email protected]> Cc: Likun Gao <[email protected]> Cc: <[email protected]> # v5.1+ Signed-off-by: Lyude Paul <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 39b27ff commit ee006eb

File tree

1 file changed

+1
-1
lines changed
  • drivers/gpu/drm/amd/powerplay/hwmgr

1 file changed

+1
-1
lines changed

drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ int hwmgr_resume(struct pp_hwmgr *hwmgr)
327327
if (ret)
328328
return ret;
329329

330-
ret = psm_adjust_power_state_dynamic(hwmgr, true, NULL);
330+
ret = psm_adjust_power_state_dynamic(hwmgr, false, NULL);
331331

332332
return ret;
333333
}

0 commit comments

Comments
 (0)