From: <gregkh@linuxfoundation.org>
To: alexander.deucher@amd.com, amd-gfx@lists.freedesktop.org,
gregkh@linuxfoundation.org, hgoffin@amazon.com
Cc: stable-commits@vger.kernel.org
Subject: Patch "drm/amdgpu: fix check in fbdev init" has been added to the 5.15-stable tree
Date: Sat, 13 Aug 2022 14:57:13 +0200 [thread overview]
Message-ID: <166039543315196@kroah.com> (raw)
In-Reply-To: <20220719185659.2068735-1-alexander.deucher@amd.com>
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 <stable@vger.kernel.org> know about it.
From git@z Thu Jan 1 00:00:00 1970
From: Alex Deucher <alexander.deucher@amd.com>
Date: Tue, 19 Jul 2022 14:56:59 -0400
Subject: drm/amdgpu: fix check in fbdev init
To: <stable@vger.kernel.org>
Cc: <amd-gfx@lists.freedesktop.org>, Alex Deucher <alexander.deucher@amd.com>, <hgoffin@amazon.com>
Message-ID: <20220719185659.2068735-1-alexander.deucher@amd.com>
From: Alex Deucher <alexander.deucher@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: stable@vger.kernel.org # 5.15.x
Cc: hgoffin@amazon.com
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@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.deucher@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
prev parent reply other threads:[~2022-08-13 20:11 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-19 18:56 [PATCH] drm/amdgpu: fix check in fbdev init Alex Deucher
2022-07-19 18:56 ` Alex Deucher
2022-08-10 15:28 ` Alex Deucher
2022-08-10 15:28 ` Alex Deucher
2022-08-10 15:38 ` Greg KH
2022-08-10 15:38 ` Greg KH
2022-08-10 15:39 ` Alex Deucher
2022-08-10 15:39 ` Alex Deucher
2022-08-13 12:55 ` Greg KH
2022-08-13 12:55 ` Greg KH
2022-08-13 12:57 ` gregkh [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=166039543315196@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=hgoffin@amazon.com \
--cc=stable-commits@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.