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

Commit 25becb44 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ext_display: move ext_display out of FB driver"

parents d27e76f5 87edc283

drivers/gpu/drm/msm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ config DRM_MSM 
	select TMPFS

	select QCOM_SCM

	select BACKLIGHT_CLASS_DEVICE

	select MSM_EXT_DISPLAY

	default y

	help

	  DRM/KMS driver for MSM/snapdragon.

drivers/platform/msm/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -217,4 +217,11 @@ config USB_BAM 
	  Enabling this option adds USB BAM Driver.

	  USB BAM driver was added to supports SPS Peripheral-to-Peripheral

	  transfers between the USB and other peripheral.



config MSM_EXT_DISPLAY

	bool "MSM External Display Driver"

	help

	  Enabling this option adds MSM External Display Driver.

	  External Display driver was added to support the communication

	  between external display driver and its couterparts.

endmenu

drivers/platform/msm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -16,3 +16,4 @@ obj-$(CONFIG_SEEMP_CORE) += seemp_core/ 
obj-$(CONFIG_SSM) += ssm.o

obj-$(CONFIG_USB_BAM) += usb_bam.o

obj-$(CONFIG_MSM_MHI_DEV) += mhi_dev/

obj-$(CONFIG_MSM_EXT_DISPLAY) += msm_ext_display.o

drivers/video/fbdev/msm/msm_ext_display.c→drivers/platform/msm/msm_ext_display.c

+1 −1
Original line number Diff line number Diff line
@@ -875,7 +875,7 @@ static void __exit msm_ext_disp_exit(void) 
	platform_driver_unregister(&this_driver);

}



module_init(msm_ext_disp_init);

subsys_initcall(msm_ext_disp_init);

module_exit(msm_ext_disp_exit);



MODULE_LICENSE("GPL v2");

drivers/video/fbdev/msm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ config FB_MSM_MDSS_WRITEBACK 


config FB_MSM_MDSS_HDMI_PANEL

	depends on FB_MSM_MDSS

	select MSM_EXT_DISPLAY

	bool "MDSS HDMI Tx Panel"

	default n

	---help---
@@ -98,6 +99,7 @@ config FB_MSM_MDSS_DSI_CTRL_STATUS 


config FB_MSM_MDSS_DP_PANEL

	depends on FB_MSM_MDSS

	select MSM_EXT_DISPLAY

	bool "MDSS DP Panel"

	---help---

	The MDSS DP Panel provides support for DP host controller driver