target/linux/layerscape/patches-5.4/805-display-0051-LF-296-drm-mhdp-build-mhdp-sub-modules-into-one-driv.patch

   1 From 2b8caa86c969cb14e295e60ddc21995b47dc2efe Mon Sep 17 00:00:00 2001
   2 From: Sandor Yu <Sandor.yu@nxp.com>
   3 Date: Mon, 2 Dec 2019 16:14:09 +0800
   4 Subject: [PATCH] LF-296: drm: mhdp: build mhdp sub-modules into one driver
   5  module
   6
   7 mhdp kernel driver support build as module.
   8 All mhdp sub-modules are built into one driver module.
   9
  10 Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
  11 Reviewed-by: Robby Cai <robby.cai@nxp.com>
  12 (cherry picked from commit f516f7769a52fdda185920a89efa3de9a1ddb9e8)
  13 [rebase]
  14 Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  15 ---
  16  drivers/gpu/drm/bridge/cadence/Makefile | 14 +++++++++-----
  17  drivers/gpu/drm/imx/Makefile            |  4 +++-
  18  include/drm/bridge/cdns-mhdp-common.h   |  4 ----
  19  3 files changed, 12 insertions(+), 10 deletions(-)
  20
  21 --- a/drivers/gpu/drm/bridge/cadence/Makefile
  22 +++ b/drivers/gpu/drm/bridge/cadence/Makefile
  23 @@ -1,5 +1,9 @@
  24 -obj-$(CONFIG_DRM_CDNS_MHDP) += cdns-mhdp-common.o cdns-mhdp-hdmi.o
  25 -obj-$(CONFIG_DRM_CDNS_HDMI) += cdns-hdmi-core.o
  26 -obj-$(CONFIG_DRM_CDNS_DP) += cdns-dp-core.o
  27 -obj-$(CONFIG_DRM_CDNS_AUDIO) += cdns-mhdp-audio.o
  28 -obj-$(CONFIG_DRM_CDNS_HDMI_CEC) += cdns-mhdp-cec.o
  29 +
  30 +cdns_mhdp_drmcore-y := cdns-mhdp-common.o cdns-mhdp-hdmi.o
  31 +
  32 +cdns_mhdp_drmcore-$(CONFIG_DRM_CDNS_HDMI) += cdns-hdmi-core.o
  33 +cdns_mhdp_drmcore-$(CONFIG_DRM_CDNS_DP) += cdns-dp-core.o
  34 +cdns_mhdp_drmcore-$(CONFIG_DRM_CDNS_AUDIO) += cdns-mhdp-audio.o
  35 +cdns_mhdp_drmcore-$(CONFIG_DRM_CDNS_HDMI_CEC) += cdns-mhdp-cec.o
  36 +
  37 +obj-$(CONFIG_DRM_CDNS_MHDP)            += cdns_mhdp_drmcore.o
  38 --- a/drivers/gpu/drm/imx/Makefile
  39 +++ b/drivers/gpu/drm/imx/Makefile
  40 @@ -9,4 +9,6 @@ obj-$(CONFIG_DRM_IMX_TVE) += imx-tve.o
  41  obj-$(CONFIG_DRM_IMX_LDB) += imx-ldb.o
  42
  43  obj-$(CONFIG_DRM_IMX_HDMI) += dw_hdmi-imx.o
  44 -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
  45 +
  46 +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
  47 +obj-$(CONFIG_DRM_IMX_CDNS_MHDP) += cdns_mhdp_imx.o
  48 --- a/include/drm/bridge/cdns-mhdp-common.h
  49 +++ b/include/drm/bridge/cdns-mhdp-common.h
  50 @@ -621,7 +621,6 @@ struct cdns_mhdp_connector {
  51         struct cdns_mhdp_bridge *bridge;
  52  };
  53
  54 -#ifdef CONFIG_DRM_CDNS_HDMI_CEC
  55  struct cdns_mhdp_cec {
  56         struct cec_adapter *adap;
  57         struct device *dev;
  58 @@ -630,7 +629,6 @@ struct cdns_mhdp_cec {
  59         struct cec_msg msg;
  60         struct task_struct *cec_worker;
  61  };
  62 -#endif
  63
  64  struct cdns_plat_data {
  65         /* Vendor PHY support */
  66 @@ -704,9 +702,7 @@ struct cdns_mhdp_device {
  67                         bool can_mst;
  68                 } dp;
  69                 struct _hdmi_data {
  70 -#ifdef CONFIG_DRM_CDNS_HDMI_CEC
  71                         struct cdns_mhdp_cec cec;
  72 -#endif
  73                         u32 char_rate;
  74                         u32 hdmi_type;
  75                 } hdmi;