Skip to content

Commit 9d6366e

Browse files
arndbdanvet
authored andcommitted
drm: fb_helper: improve CONFIG_FB dependency
My previous patch correctly addressed the possible link failure, but as Jani points out, the dependency is now stricter than it needs to be. Change it again, to allow DRM_FBDEV_EMULATION to be used when DRM_KMS_HELPER and FB are both loadable modules and DRM is linked into the kernel. As a side-effect, the option is now only visible when at least one DRM driver makes use of DRM_KMS_HELPER. This is better, because the option has no effect otherwise. Fixes: 606b102 ("drm: fb_helper: fix CONFIG_FB dependency") Suggested-by: Acked-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: https://patchwork.freedesktop.org/patch/msgid/20211029120307.1407047-1-arnd@kernel.org
1 parent e0e6d1e commit 9d6366e

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

drivers/gpu/drm/Kconfig

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,8 @@ config DRM_DEBUG_MODESET_LOCK
117117

118118
config DRM_FBDEV_EMULATION
119119
bool "Enable legacy fbdev support for your modesetting driver"
120-
depends on DRM
121-
depends on FB=y || FB=DRM
122-
select DRM_KMS_HELPER
120+
depends on DRM_KMS_HELPER
121+
depends on FB=y || FB=DRM_KMS_HELPER
123122
select FB_CFB_FILLRECT
124123
select FB_CFB_COPYAREA
125124
select FB_CFB_IMAGEBLIT

0 commit comments

Comments
 (0)