| From 84705e42a0d08434045955845e0c53ee0acbd7b5 Mon Sep 17 00:00:00 2001 |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Date: Fri, 19 Nov 2021 12:30:10 +0100 |
| Subject: Revert "drm: fb_helper: improve CONFIG_FB dependency" |
| |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| 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> |
| --- |
| drivers/gpu/drm/Kconfig | 5 +++-- |
| 1 file changed, 3 insertions(+), 2 deletions(-) |
| |
| --- 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 |
