redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

LF-296: drm: mhdp: build mhdp sub-modules into one driver module 

mhdp kernel driver support build as module.
All mhdp sub-modules are built into one driver module.

Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
Reviewed-by: Robby Cai <robby.cai@nxp.com>
(cherry picked from commit f516f7769a52fdda185920a89efa3de9a1ddb9e8)
5.4-rM2-2.2.x-imx-squashed
Sandor Yu 2019-12-02 16:14:09 +08:00
parent ce03e58492
commit c3a152de1f
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/bridge/cadence/Makefile
View File

@ -1,5 +1,9 @@
obj-$(CONFIG_DRM_CDNS_MHDP) += cdns-mhdp-common.o cdns-mhdp-hdmi.o
obj-$(CONFIG_DRM_CDNS_HDMI) += cdns-hdmi-core.o
obj-$(CONFIG_DRM_CDNS_DP) += cdns-dp-core.o
obj-$(CONFIG_DRM_CDNS_AUDIO) += cdns-mhdp-audio.o
obj-$(CONFIG_DRM_CDNS_HDMI_CEC) += cdns-mhdp-cec.o
cdns_mhdp_drmcore-y := cdns-mhdp-common.o cdns-mhdp-hdmi.o
cdns_mhdp_drmcore-$(CONFIG_DRM_CDNS_HDMI) += cdns-hdmi-core.o
cdns_mhdp_drmcore-$(CONFIG_DRM_CDNS_DP) += cdns-dp-core.o
cdns_mhdp_drmcore-$(CONFIG_DRM_CDNS_AUDIO) += cdns-mhdp-audio.o
cdns_mhdp_drmcore-$(CONFIG_DRM_CDNS_HDMI_CEC) += cdns-mhdp-cec.o
obj-$(CONFIG_DRM_CDNS_MHDP) += cdns_mhdp_drmcore.o

4
drivers/gpu/drm/imx/Makefile
View File

@ -13,5 +13,7 @@ obj-$(CONFIG_DRM_IMX_IPUV3) += ipuv3/
obj-$(CONFIG_DRM_IMX_HDMI) += dw_hdmi-imx.o
obj-$(CONFIG_DRM_IMX_LCDIF) += lcdif/
obj-$(CONFIG_DRM_IMX_SEC_DSIM) += sec_mipi_dsim-imx.o
obj-$(CONFIG_DRM_IMX_CDNS_MHDP) += cdn-mhdp-imxdrv.o cdn-mhdp-dp-phy.o cdn-mhdp-hdmi-phy.o cdn-mhdp-imx8qm.o cdn-mhdp-ls1028a.o
obj-$(CONFIG_DRM_IMX_DCSS) += dcss/
cdns_mhdp_imx-objs := cdn-mhdp-imxdrv.o cdn-mhdp-dp-phy.o cdn-mhdp-hdmi-phy.o cdn-mhdp-imx8qm.o cdn-mhdp-ls1028a.o
obj-$(CONFIG_DRM_IMX_CDNS_MHDP) += cdns_mhdp_imx.o

4
include/drm/bridge/cdns-mhdp-common.h
View File

@ -621,7 +621,6 @@ struct cdns_mhdp_connector {
struct cdns_mhdp_bridge *bridge;
};
#ifdef CONFIG_DRM_CDNS_HDMI_CEC
struct cdns_mhdp_cec {
struct cec_adapter *adap;
struct device *dev;
@ -630,7 +629,6 @@ struct cdns_mhdp_cec {
struct cec_msg msg;
struct task_struct *cec_worker;
};
#endif
struct cdns_plat_data {
/* Vendor PHY support */
@ -704,9 +702,7 @@ struct cdns_mhdp_device {
bool can_mst;
} dp;
struct _hdmi_data {
#ifdef CONFIG_DRM_CDNS_HDMI_CEC
struct cdns_mhdp_cec cec;
#endif
u32 char_rate;
u32 hdmi_type;
} hdmi;