This is a note to let you know that I've just added the patch titled
drm/amdgpu: fix check in fbdev init
to the 5.15-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-check-in-fbdev-init.patch
and it can be found in the queue-5.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <sta...@vger.kernel.org> know about it.
>From git@z Thu Jan 1 00:00:00 1970
From: Alex Deucher <alexander.deuc...@amd.com>
Date: Tue, 19 Jul 2022 14:56:59 -0400
Subject: drm/amdgpu: fix check in fbdev init
To: <sta...@vger.kernel.org>
Cc: <amd-gfx@lists.freedesktop.org>, Alex Deucher <alexander.deuc...@amd.com>,
<hgof...@amazon.com>
Message-ID: <20220719185659.2068735-1-alexander.deuc...@amd.com>
From: Alex Deucher <alexander.deuc...@amd.com>
The new vkms virtual display code is atomic so there is
no need to call drm_helper_disable_unused_functions()
when it is enabled. Doing so can result in a segfault.
When the driver switched from the old virtual display code
to the new atomic virtual display code, it was missed that
we enable virtual display unconditionally under SR-IOV
so the checks here missed that case. Add the missing
check for SR-IOV.
There is no equivalent of this patch for Linus' tree
because the relevant code no longer exists. This patch
is only relevant to kernels 5.15 and 5.16.
Fixes: 84ec374bd580 ("drm/amdgpu: create amdgpu_vkms (v4)")
Cc: sta...@vger.kernel.org # 5.15.x
Cc: hgof...@amazon.com
Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
@@ -341,7 +341,8 @@ int amdgpu_fbdev_init(struct amdgpu_devi
}
/* disable all the possible outputs/crtcs before entering KMS mode */
- if (!amdgpu_device_has_dc_support(adev) && !amdgpu_virtual_display)
+ if (!amdgpu_device_has_dc_support(adev) && !amdgpu_virtual_display &&
+ !amdgpu_sriov_vf(adev))
drm_helper_disable_unused_functions(adev_to_drm(adev));
drm_fb_helper_initial_config(&rfbdev->helper, bpp_sel);
Patches currently in stable-queue which might be from alexander.deuc...@amd.com
are
queue-5.15/drm-amdgpu-fix-check-in-fbdev-init.patch
queue-5.15/drm-amdgpu-check-bo-s-requested-pinning-domains-against-its-preferred_domains.patch
