Looks like this patch managed to make it in before 5.2 was finalized, so we
won't need a stable backport for this. Cheers
On Mon, 2019-07-29 at 18:07 +0200, gregkh@xxxxxxxxxxxxxxxxxxx wrote:
> The patch below does not apply to the 5.2-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@xxxxxxxxxxxxxxx>.
>
> thanks,
>
> greg k-h
>
> ------------------ original commit in Linus's tree ------------------
>
> From ee006eb00a00198d21dad60696318fd443a59f88 Mon Sep 17 00:00:00 2001
> From: Lyude Paul <lyude@xxxxxxxxxx>
> Date: Thu, 20 Jun 2019 19:21:26 -0400
> Subject: [PATCH] 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@xxxxxxx>
> Cc: Alex Deucher <alexander.deucher@xxxxxxx>
> Cc: Huang Rui <ray.huang@xxxxxxx>
> Cc: Rex Zhu <Rex.Zhu@xxxxxxx>
> Cc: Likun Gao <Likun.Gao@xxxxxxx>
> Cc: <stable@xxxxxxxxxxxxxxx> # v5.1+
> Signed-off-by: Lyude Paul <lyude@xxxxxxxxxx>
> Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
>
> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
> b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
> index 0b0d83c2a678..a24beaa4fb01 100644
> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
> @@ -327,7 +327,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;
> }
>
