Skip to contentSkip to conversation

drm/amdgpu: Don't skip display settings in hwmgr_resume()

PATCH In review Lyude Paul 2 participants 3 messages Jun 20, 2019 – Jun 28, 2019

Subsystems (3)
lore
Share & tools
lore

Lyude Paul

author
#0 lore raw

PATCH 1/1 drm/amdgpu: Don't skip display settings in hwmgr_resume()

I'm not entirely sure why this is, but for some reason:

921935dc6404 ("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 921935dc6404 ("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+
---
 drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +1 -1
index 6cd6497c6fc2..0e1b2d930816 100644
@@ -325,7 +325,7 @@ int hwmgr_resume(struct pp_hwmgr *hwmgr)
 	if (ret)
 		return ret;
 
-	ret = psm_adjust_power_state_dynamic(hwmgr, true, NULL);
+	ret = psm_adjust_power_state_dynamic(hwmgr, false, NULL);
 
 	return ret;
 }
Signature · 1 line
2.21.0
#1 lore raw
Quoted 14 lines · Lyude Paul

I'm not entirely sure why this is, but for some reason:

921935dc6404 ("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).

Quoted 7 lines

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.

Evan, any ideas on this? Otherwise, let's just apply it.

Alex

Quoted 32 lines
Fixes 921935dc6404 ("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+
---
 drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +1 -2
index 6cd6497c6fc2..0e1b2d930816 100644
@@ -325,7 +325,7 @@ int hwmgr_resume(struct pp_hwmgr *hwmgr)
        if (ret)
                return ret;
 
-       ret = psm_adjust_power_state_dynamic(hwmgr, true, NULL);
+       ret = psm_adjust_power_state_dynamic(hwmgr, false, NULL);
 
        return ret;
 }
--

2.21.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#2 lore raw
In reply to Lyude Paul
Quoted 21 lines · Lyude Paul

I'm not entirely sure why this is, but for some reason:

921935dc6404 ("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.

Quoted 8 lines
Fixes 921935dc6404 ("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+

I've gone ahead and applied this.

Thanks,

Alex

Quoted 24 lines
---
 drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +1 -2
index 6cd6497c6fc2..0e1b2d930816 100644
@@ -325,7 +325,7 @@ int hwmgr_resume(struct pp_hwmgr *hwmgr)
        if (ret)
                return ret;
 
-       ret = psm_adjust_power_state_dynamic(hwmgr, true, NULL);
+       ret = psm_adjust_power_state_dynamic(hwmgr, false, NULL);
 
        return ret;
 }
--

2.21.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx