]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/nouveau: Don't set allow_fb_modifiers explicitly
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 27 Apr 2021 09:20:16 +0000 (11:20 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 19 Jul 2021 08:01:18 +0000 (10:01 +0200)
commit cee93c028288b9af02919f3bd8593ba61d1e610d upstream.

Since

commit 890880ddfdbe256083170866e49c87618b706ac7
Author: Paul Kocialkowski <paul.kocialkowski@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@redhat.com>
Cc: stable@vger.kernel.org # v5.1 +
Cc: Pekka Paalanen <pekka.paalanen@collabora.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: nouveau@lists.freedesktop.org
Link: https://patchwork.freedesktop.org/patch/msgid/20210427092018.832258-6-daniel.vetter@ffwll.ch
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/nouveau/nouveau_display.c

index 17831ee897ea46d1bc88234017fc89bd12ddf2b9..1376992482b55ae0b1b3c33d31b084965fd7867d 100644 (file)
@@ -700,7 +700,6 @@ nouveau_display_create(struct drm_device *dev)
 
        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;