Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92b6f89f authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: Add separate Kconfig option for fbdev helpers 



For drivers which might want to disable fbdev legacy support.

Select the new option in all drivers for now, so this shouldn't result
in any change. Drivers need some work anyway to make fbdev support
optional (if they have it implemented, that is), so the recommended
way to expose this is by adding per-driver options. At least as long
as most drivers don't support disabling the fbdev support.

v2: Update for new drm drivers msm and rcar-du. Note that Rob's msm
driver can already take advantage of this, which allows us to build
msm without any fbdev depencies in the kernel!

v3: Move the MODULE_* stuff from the fbdev helper file to
drm_crtc_helper.c.

Cc: David Herrmann <dh.herrmann@gmail.com>
Cc: Rob Clark <robdclark@gmail.com>
Reviewed-by: default avatarRob Clark <robdclark@gmail.com>
Acked-by: default avatarDave Airlie <airlied@linux.ie>
Reviewed-by: default avatarChon Ming Lee <chon.ming.lee@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 25a2e2d0

drivers/gpu/drm/Kconfig

+10 −1
Original line number Diff line number Diff line
@@ -29,11 +29,17 @@ config DRM_USB 
config DRM_KMS_HELPER

	tristate

	depends on DRM

	help

	  CRTC helpers for KMS drivers.



config DRM_KMS_FB_HELPER

	bool

	depends on DRM_KMS_HELPER

	select FB

	select FRAMEBUFFER_CONSOLE if !EXPERT

	select FRAMEBUFFER_CONSOLE_DETECT_PRIMARY if FRAMEBUFFER_CONSOLE

	help

	  FB and CRTC helpers for KMS drivers.

	  FBDEV helpers for KMS drivers.



config DRM_LOAD_EDID_FIRMWARE

	bool "Allow to specify an EDID data set instead of probing for it"
@@ -64,6 +70,7 @@ config DRM_GEM_CMA_HELPER 
config DRM_KMS_CMA_HELPER

	bool

	select DRM_GEM_CMA_HELPER

	select DRM_KMS_FB_HELPER

	select FB_SYS_FILLRECT

	select FB_SYS_COPYAREA

	select FB_SYS_IMAGEBLIT
@@ -96,6 +103,7 @@ config DRM_RADEON 
	select FB_CFB_IMAGEBLIT

	select FW_LOADER

        select DRM_KMS_HELPER

	select DRM_KMS_FB_HELPER

        select DRM_TTM

	select POWER_SUPPLY

	select HWMON
@@ -130,6 +138,7 @@ config DRM_I915 
	select SHMEM

	select TMPFS

	select DRM_KMS_HELPER

	select DRM_KMS_FB_HELPER

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT

drivers/gpu/drm/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -21,8 +21,9 @@ drm-$(CONFIG_PCI) += ati_pcigart.o 


drm-usb-y   := drm_usb.o



drm_kms_helper-y := drm_fb_helper.o drm_crtc_helper.o drm_dp_helper.o

drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o

drm_kms_helper-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o

drm_kms_helper-$(CONFIG_DRM_KMS_FB_HELPER) += drm_fb_helper.o

drm_kms_helper-$(CONFIG_DRM_KMS_CMA_HELPER) += drm_fb_cma_helper.o



obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o

drivers/gpu/drm/ast/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ config DRM_AST 
	select FB_SYS_FILLRECT

	select FB_SYS_IMAGEBLIT

	select DRM_KMS_HELPER

	select DRM_KMS_FB_HELPER

	select DRM_TTM

	help

	 Say yes for experimental AST GPU driver. Do not enable

drivers/gpu/drm/cirrus/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ config DRM_CIRRUS_QEMU 
	select FB_SYS_COPYAREA

	select FB_SYS_IMAGEBLIT

	select DRM_KMS_HELPER

	select DRM_KMS_FB_HELPER

	select DRM_TTM

	help

	 This is a KMS driver for emulated cirrus device in qemu.

drivers/gpu/drm/drm_crtc_helper.c

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ 
#include <drm/drm_fb_helper.h>

#include <drm/drm_edid.h>



MODULE_AUTHOR("David Airlie, Jesse Barnes");

MODULE_DESCRIPTION("DRM KMS helper");

MODULE_LICENSE("GPL and additional rights");



/**

 * drm_helper_move_panel_connectors_to_head() - move panels to the front in the

 * 						connector list