summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-11-19 12:30:10 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-11-21 13:49:08 +0100
commitbd462930f7e534222e3226260d7f9492f3e3cb02 (patch)
treeb68620ceeb78844a1dde719d887872facfb33bb5
parentff7124b91f52412696e66683b37a5724c303cc11 (diff)
downloadlinux-stable-bd462930f7e534222e3226260d7f9492f3e3cb02.tar.gz
linux-stable-bd462930f7e534222e3226260d7f9492f3e3cb02.tar.bz2
linux-stable-bd462930f7e534222e3226260d7f9492f3e3cb02.zip
Revert "drm: fb_helper: improve CONFIG_FB dependency"
This reverts commit 94e18f5a5dd1b5e3b89c665fc5ff780858b1c9f6 which is commit 9d6366e743f37d36ef69347924ead7bcc596076e upstream. It causes some build problems as reported by Jiri. Link: https://lore.kernel.org/r/9fdb2bf1-de52-1b9d-4783-c61ce39e8f51@kernel.org Reported-by: Jiri Slaby <jirislaby@kernel.org> Cc: Jani Nikula <jani.nikula@intel.com> Cc: Javier Martinez Canillas <javierm@redhat.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Kees Cook <keescook@chromium.org> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpu/drm/Kconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 0bba672176b1..061f4382c796 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -97,8 +97,9 @@ config DRM_DEBUG_DP_MST_TOPOLOGY_REFS
config DRM_FBDEV_EMULATION
bool "Enable legacy fbdev support for your modesetting driver"
- depends on DRM_KMS_HELPER
- depends on FB=y || FB=DRM_KMS_HELPER
+ depends on DRM
+ depends on FB=y || FB=DRM
+ select DRM_KMS_HELPER
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT