summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/Kconfig
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2021-11-11 08:14:02 +1000
committerDave Airlie <airlied@redhat.com>2021-11-11 08:14:19 +1000
commitf8ca7b74192b2e64bdfb89fb63c1d33b92bc899d (patch)
tree1fcf742adb2cefef5b018d5a4753c1e6f6d611da /drivers/gpu/drm/Kconfig
parent917a6f0bdbc55c2e9770ab523768578db8e8ddb3 (diff)
parentbcae3af286f49bf4f6cda03f165fbe530f4a6bed (diff)
downloadlwn-f8ca7b74192b2e64bdfb89fb63c1d33b92bc899d.tar.gz
lwn-f8ca7b74192b2e64bdfb89fb63c1d33b92bc899d.zip
Merge tag 'drm-misc-next-fixes-2021-11-10' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
Removed the TTM Huge Page functionnality to address a crash, a timeout fix for udl, CONFIG_FB dependency improvements, a fix for a circular locking depency in imx, a NULL pointer dereference fix for virtio, and a naming collision fix for drm/locking. Signed-off-by: Dave Airlie <airlied@redhat.com> From: Maxime Ripard <maxime@cerno.tech> Link: https://patchwork.freedesktop.org/patch/msgid/20211110082114.vfpkpnecwdfg27lk@gilmour
Diffstat (limited to 'drivers/gpu/drm/Kconfig')
-rw-r--r--drivers/gpu/drm/Kconfig5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index a4c020a9a0eb..0039df26854b 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -117,9 +117,8 @@ config DRM_DEBUG_MODESET_LOCK
config DRM_FBDEV_EMULATION
bool "Enable legacy fbdev support for your modesetting driver"
- depends on DRM
- depends on FB=y || FB=DRM
- select DRM_KMS_HELPER
+ depends on DRM_KMS_HELPER
+ depends on FB=y || FB=DRM_KMS_HELPER
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT