From: Archit Taneja <architt@codeaurora.org>
To: robdclark@gmail.com
Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org,
Archit Taneja <architt@codeaurora.org>
Subject: [PATCH v2 03/13] drm/msm/edp: Create separate Makefile/Kconfig
Date: Mon, 15 Feb 2016 12:23:16 +0530 [thread overview]
Message-ID: <1455519206-12939-4-git-send-email-architt@codeaurora.org> (raw)
In-Reply-To: <1455519206-12939-1-git-send-email-architt@codeaurora.org>
The msm Makefile and Kconfig are getting conjusted. Move EDP related
stuff into separate Kconfig and Makefile.
Signed-off-by: Archit Taneja <architt@codeaurora.org>
---
drivers/gpu/drm/msm/Kconfig | 1 +
drivers/gpu/drm/msm/Makefile | 7 +------
drivers/gpu/drm/msm/edp/Kconfig | 7 +++++++
drivers/gpu/drm/msm/edp/Makefile | 3 +++
drivers/gpu/drm/msm/msm_drv.h | 17 +++++++++++++++++
5 files changed, 29 insertions(+), 6 deletions(-)
create mode 100644 drivers/gpu/drm/msm/edp/Kconfig
create mode 100644 drivers/gpu/drm/msm/edp/Makefile
diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig
index 1c702f7..051145f 100644
--- a/drivers/gpu/drm/msm/Kconfig
+++ b/drivers/gpu/drm/msm/Kconfig
@@ -26,3 +26,4 @@ config DRM_MSM_REGISTER_LOGGING
source "drivers/gpu/drm/msm/dsi/Kconfig"
source "drivers/gpu/drm/msm/hdmi/Kconfig"
+source "drivers/gpu/drm/msm/edp/Kconfig"
diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile
index 66b7ec4..9386cfe 100644
--- a/drivers/gpu/drm/msm/Makefile
+++ b/drivers/gpu/drm/msm/Makefile
@@ -5,12 +5,6 @@ msm-y := \
adreno/adreno_gpu.o \
adreno/a3xx_gpu.o \
adreno/a4xx_gpu.o \
- edp/edp.o \
- edp/edp_aux.o \
- edp/edp_bridge.o \
- edp/edp_connector.o \
- edp/edp_ctrl.o \
- edp/edp_phy.o \
mdp/mdp_format.o \
mdp/mdp_kms.o \
mdp/mdp4/mdp4_crtc.o \
@@ -48,5 +42,6 @@ msm-$(CONFIG_COMMON_CLK) += mdp/mdp4/mdp4_lvds_pll.o
obj-$(CONFIG_DRM_MSM_DSI) += dsi/
obj-$(CONFIG_DRM_MSM_HDMI) += hdmi/
+obj-$(CONFIG_DRM_MSM_EDP) += edp/
obj-$(CONFIG_DRM_MSM) += msm.o
diff --git a/drivers/gpu/drm/msm/edp/Kconfig b/drivers/gpu/drm/msm/edp/Kconfig
new file mode 100644
index 0000000..576d8c2f
--- /dev/null
+++ b/drivers/gpu/drm/msm/edp/Kconfig
@@ -0,0 +1,7 @@
+config DRM_MSM_EDP
+ bool "Enable EDP support in MSM DRM driver"
+ depends on DRM_MSM
+ default y
+ help
+ Choose this option if you have a need for Embedded Display
+ Port encoder support.
diff --git a/drivers/gpu/drm/msm/edp/Makefile b/drivers/gpu/drm/msm/edp/Makefile
new file mode 100644
index 0000000..e623d59
--- /dev/null
+++ b/drivers/gpu/drm/msm/edp/Makefile
@@ -0,0 +1,3 @@
+ccflags-y := -Iinclude/drm -Idrivers/gpu/drm/msm
+
+obj-y := edp.o edp_aux.o edp_bridge.o edp_connector.o edp_ctrl.o edp_phy.o
diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
index ba13ab6..67b5b1b 100644
--- a/drivers/gpu/drm/msm/msm_drv.h
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@ -264,10 +264,27 @@ static inline void __exit hdmi_unregister(void)
#endif
struct msm_edp;
+#ifdef CONFIG_DRM_MSM_EDP
void __init msm_edp_register(void);
void __exit msm_edp_unregister(void);
int msm_edp_modeset_init(struct msm_edp *edp, struct drm_device *dev,
struct drm_encoder *encoder);
+#else
+static inline void __init msm_edp_register(void)
+{
+}
+
+static inline void __exit msm_edp_unregister(void)
+{
+}
+
+static inline int msm_edp_modeset_init(struct msm_edp *edp,
+ struct drm_device *dev,
+ struct drm_encoder *encoder)
+{
+ return -EINVAL;
+}
+#endif
struct msm_dsi;
enum msm_dsi_encoder_id {
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
next prev parent reply other threads:[~2016-02-15 6:53 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-15 6:53 [PATCH v2 00/13] drm/msm/hdmi: HDMI support on MSM8996 Archit Taneja
2016-02-15 6:53 ` [PATCH v2 01/13] drm/msm/dsi: Create separate Makefile/Kconfig Archit Taneja
2016-02-15 6:53 ` [PATCH v2 02/13] drm/msm/hdmi: " Archit Taneja
2016-02-15 6:53 ` Archit Taneja [this message]
2016-02-15 6:53 ` [PATCH v2 04/13] drm/msm/hdmi: Clean up connector gpio usage Archit Taneja
2016-02-15 6:53 ` [PATCH v2 05/13] drm/msm/hdmi: Fix connector detect when there is no HPD gpio Archit Taneja
2016-02-15 6:53 ` [PATCH v2 06/13] drm/msm/hdmi: Create a separate HDMI PHY driver Archit Taneja
2016-02-15 6:53 ` [PATCH v2 07/13] drm/msm/hdmi: Manage HDMI PLL through " Archit Taneja
2016-02-15 6:53 ` [PATCH v2 08/13] drm/msm/hdmi: Make HDMI core get its PHY Archit Taneja
2016-02-15 6:53 ` [PATCH v2 09/13] drm/msm/hdmi: Convert PHY files according to new design Archit Taneja
2016-02-15 6:53 ` [PATCH v2 10/13] drm/msm/hdmi: Update generated headers to split PHY/PLL offsets Archit Taneja
2016-02-15 6:53 ` [PATCH v2 11/13] drm/msm/hdmi: Update generated headers for HDMI 8996 PHY Archit Taneja
2016-02-15 6:53 ` [PATCH v2 12/13] drm/msm/hdmi: HDMI 8996 PHY/PLL support Archit Taneja
2016-02-15 6:53 ` [PATCH v2 13/13] dt-bindings: msm/hdmi: Add HDMI PHY bindings Archit Taneja
2016-02-22 2:54 ` Rob Herring
2016-02-22 11:07 ` Archit Taneja
2016-02-22 19:27 ` Rob Herring
2016-02-23 9:36 ` Archit Taneja
2016-02-24 12:00 ` Kishon Vijay Abraham I
2016-02-25 5:40 ` Archit Taneja
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1455519206-12939-4-git-send-email-architt@codeaurora.org \
--to=architt@codeaurora.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=robdclark@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).