diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2611-drm-amdgpu-Don-t-skip-display-settings-in-hwmgr_resu.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2611-drm-amdgpu-Don-t-skip-display-settings-in-hwmgr_resu.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2611-drm-amdgpu-Don-t-skip-display-settings-in-hwmgr_resu.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2611-drm-amdgpu-Don-t-skip-display-settings-in-hwmgr_resu.patch new file mode 100644 index 00000000..7acdc5c1 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2611-drm-amdgpu-Don-t-skip-display-settings-in-hwmgr_resu.patch @@ -0,0 +1,55 @@ +From 614f422e2f5b5c51749e523223bc6a1991b7221b Mon Sep 17 00:00:00 2001 +From: Lyude Paul <lyude@redhat.com> +Date: Thu, 20 Jun 2019 19:21:26 -0400 +Subject: [PATCH 2611/2940] 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 <evan.quan@amd.com> +Cc: Alex Deucher <alexander.deucher@amd.com> +Cc: Huang Rui <ray.huang@amd.com> +Cc: Rex Zhu <Rex.Zhu@amd.com> +Cc: Likun Gao <Likun.Gao@amd.com> +Cc: <stable@vger.kernel.org> # v5.1+ +Signed-off-by: Lyude Paul <lyude@redhat.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +index b103415f5e58..873bf65e34d4 100644 +--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c ++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +@@ -328,7 +328,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.17.1 + |