gregkh at linuxfoundation.org
2021-Jul-15 12:40 UTC
[Nouveau] Patch "drm/nouveau: Don't set allow_fb_modifiers explicitly" has been added to the 5.13-stable tree
This is a note to let you know that I've just added the patch titled drm/nouveau: Don't set allow_fb_modifiers explicitly to the 5.13-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-nouveau-don-t-set-allow_fb_modifiers-explicitly.patch and it can be found in the queue-5.13 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable at vger.kernel.org> know about it.>From cee93c028288b9af02919f3bd8593ba61d1e610d Mon Sep 17 00:00:00 2001From: Daniel Vetter <daniel.vetter at ffwll.ch> Date: Tue, 27 Apr 2021 11:20:16 +0200 Subject: drm/nouveau: Don't set allow_fb_modifiers explicitly From: Daniel Vetter <daniel.vetter at ffwll.ch> commit cee93c028288b9af02919f3bd8593ba61d1e610d upstream. Since commit 890880ddfdbe256083170866e49c87618b706ac7 Author: Paul Kocialkowski <paul.kocialkowski at bootlin.com> Date: Fri Jan 4 09:56:10 2019 +0100 drm: Auto-set allow_fb_modifiers when given modifiers at plane init this is done automatically as part of plane init, if drivers set the modifier list correctly. Which is the case here. Note that this fixes an inconsistency: We've set the cap everywhere, but only nv50+ supports modifiers. Hence cc stable, but not further back then the patch from Paul. Reviewed-by: Lyude Paul <lyude at redhat.com> Cc: stable at vger.kernel.org # v5.1 + Cc: Pekka Paalanen <pekka.paalanen at collabora.com> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com> Cc: Ben Skeggs <bskeggs at redhat.com> Cc: nouveau at lists.freedesktop.org Link: https://patchwork.freedesktop.org/patch/msgid/20210427092018.832258-6-daniel.vetter at ffwll.ch Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org> --- drivers/gpu/drm/nouveau/nouveau_display.c | 1 - 1 file changed, 1 deletion(-) --- a/drivers/gpu/drm/nouveau/nouveau_display.c +++ b/drivers/gpu/drm/nouveau/nouveau_display.c @@ -697,7 +697,6 @@ nouveau_display_create(struct drm_device dev->mode_config.preferred_depth = 24; dev->mode_config.prefer_shadow = 1; - dev->mode_config.allow_fb_modifiers = true; if (drm->client.device.info.chipset < 0x11) dev->mode_config.async_page_flip = false; Patches currently in stable-queue which might be from daniel.vetter at ffwll.ch are queue-5.13/drm-tegra-don-t-set-allow_fb_modifiers-explicitly.patch queue-5.13/drm-msm-mdp4-fix-modifier-support-enabling.patch queue-5.13/drm-mxsfb-don-t-select-drm_kms_fb_helper.patch queue-5.13/drm-arm-malidp-always-list-modifiers.patch queue-5.13/drm-amdgpu-change-the-default-timeout-for-kernel-com.patch queue-5.13/drm-zte-don-t-select-drm_kms_fb_helper.patch queue-5.13/drm-nouveau-don-t-set-allow_fb_modifiers-explicitly.patch