From patchwork Thu Jan 21 07:09:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Archit Taneja X-Patchwork-Id: 8078681 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 379E1BEEED for ; Thu, 21 Jan 2016 07:10:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 574A620461 for ; Thu, 21 Jan 2016 07:10:12 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 38A89204A9 for ; Thu, 21 Jan 2016 07:10:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EAC156E410; Wed, 20 Jan 2016 23:10:09 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from smtp.codeaurora.org (smtp.codeaurora.org [198.145.29.96]) by gabe.freedesktop.org (Postfix) with ESMTPS id 937496E410 for ; Wed, 20 Jan 2016 23:10:04 -0800 (PST) Received: from smtp.codeaurora.org (localhost [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id 8A9F16037C; Thu, 21 Jan 2016 07:10:04 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 7DBE860376; Thu, 21 Jan 2016 07:10:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from localhost (unknown [202.46.23.61]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: architt@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 6262860222; Thu, 21 Jan 2016 07:10:03 +0000 (UTC) From: Archit Taneja To: robdclark@gmail.com Subject: [PATCH 03/13] drm/msm/edp: Create separate Makefile/Kconfig Date: Thu, 21 Jan 2016 12:39:31 +0530 Message-Id: <1453360181-31738-4-git-send-email-architt@codeaurora.org> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1453360181-31738-1-git-send-email-architt@codeaurora.org> References: <1453360181-31738-1-git-send-email-architt@codeaurora.org> X-Virus-Scanned: ClamAV using ClamSMTP Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP The msm Makefile and Kconfig are getting conjusted. Move edp related stuff into separate Kconfig and Makefile. Signed-off-by: Archit Taneja --- 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 | 15 +++++++++++++++ 5 files changed, 27 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 d432380..b8beb9b 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig @@ -25,3 +25,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..f44a091 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -264,10 +264,25 @@ 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 {