This is a note to let you know that I've just added the patch titled drm/amdgpu: fix adev variable used in amdgpu_device_gpu_recover() to the 5.18-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: drm-amdgpu-fix-adev-variable-used-in-amdgpu_device_gpu_recover.patch and it can be found in the queue-5.18 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From bbba251577b27422ebe173e1bd006424d6a8cfb3 Mon Sep 17 00:00:00 2001 From: Alex Deucher <alexander.deucher@xxxxxxx> Date: Thu, 16 Jun 2022 16:52:01 -0400 Subject: drm/amdgpu: fix adev variable used in amdgpu_device_gpu_recover() From: Alex Deucher <alexander.deucher@xxxxxxx> commit bbba251577b27422ebe173e1bd006424d6a8cfb3 upstream. Use the correct adev variable for the drm_fb_helper in amdgpu_device_gpu_recover(). Noticed by inspection. Fixes: 087451f372bf ("drm/amdgpu: use generic fb helpers instead of setting up AMD own's.") Reviewed-by: Guchun Chen <guchun.chen@xxxxxxx> Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx> Cc: stable@xxxxxxxxxxxxxxx Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -5140,7 +5140,7 @@ int amdgpu_device_gpu_recover_imp(struct */ amdgpu_unregister_gpu_instance(tmp_adev); - drm_fb_helper_set_suspend_unlocked(adev_to_drm(adev)->fb_helper, true); + drm_fb_helper_set_suspend_unlocked(adev_to_drm(tmp_adev)->fb_helper, true); /* disable ras on ALL IPs */ if (!need_emergency_restart && Patches currently in stable-queue which might be from alexander.deucher@xxxxxxx are queue-5.18/revert-drm-amdgpu-display-set-vblank_disable_immediate-for-dc.patch queue-5.18/drm-amdgpu-to-flush-tlb-for-mmhub-of-raven-series.patch queue-5.18/drm-amdgpu-fix-adev-variable-used-in-amdgpu_device_gpu_recover.patch