From patchwork Mon Feb 22 21:08:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 8383691 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 A8370C0553 for ; Mon, 22 Feb 2016 21:19:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BEC24205D4 for ; Mon, 22 Feb 2016 21:19:55 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 9FC48205D1 for ; Mon, 22 Feb 2016 21:19:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 904646E2D9; Mon, 22 Feb 2016 21:19:52 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 40BF76E2D8 for ; Mon, 22 Feb 2016 21:19:50 +0000 (UTC) Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0MMWL8-1aagp92Nmo-008GLy; Mon, 22 Feb 2016 22:13:57 +0100 From: Arnd Bergmann To: Rob Clark Subject: [PATCH 7/8] drm: msm: move HDMI into separate module Date: Mon, 22 Feb 2016 22:08:41 +0100 Message-Id: <1456175331-714117-8-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1456175331-714117-1-git-send-email-arnd@arndb.de> References: <1456175331-714117-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:XNpIiJG3erIP+P/CsRr5/2O0HTUzP/pUK8lurR8qJxAdrXWQ0XN +n4SOjFq8hXBlHvFMc2VvxtolT0kWQQxcrLrbmuw5LjnXF65tKTEmAdHwxiDU9Csnhb015y aLnNjW3ZClX/sKc4l8FgtBy0pcT3z/2lD0/vpVd7sP051exlLcVlC7bmIvPsPEp6ZnPadqX +9uFME4ktl+1zyyP30bFw== X-UI-Out-Filterresults: notjunk:1; V01:K0:twKIx/7Dd6E=:TveIJ8DetYtTscToWe/EAh I0sMsx7mya2U65D+kQxCRykD+IpM4g7HbaNC8s/95zRkzuE2iOapABtiDmIviXE6vX6mDH+61 LQK+1vNSChOiwMPAxQM4Z7qkM3hMG6ebBDhtG3xroykidJn+Wm4LAtH2Ro4qg1htsGiXSKjxl h2oyqIZG/honNRzqsHOvfXODJH8OmpOfaPItI67SYMiV9rpQTRmtp/O1dhWmad2j/aDEbxBDt 5HXNVPpUhIt8Nxbs69Iez3hYsnjz1Ln3lXw3ZryPcU8wckLvaxJPND1iKN6+bMgS6LEmueTsi kV7Ou+BTBIHnxsUPss2F87PluvPLCrKmaHOB77+hK9FOt5z79G+Heui/7BcJ5FtB4s4WjAQxn 9eqGfi4tJyc/0FuDOlB0Nun5vzPsjYIEFnjUYyJGhth8r8cQRklSNmzVoSMOLtlSeUuvFvacM S6X4YKeo4Kd0oMBIeb4XfkKmwswdN5K4GIrHvvsF4MLP3sWhzIPcIksVx8XLRPRj/i92fqZJ1 X4wPO4P1c84EE0eB+jfVCbEayUiZVx+khsugUNHaS6UVmOmnIQfpWH3M9JT64l4HGwr4XXoVD 5zE8Ysmm/Zl7zxJWr7WeGWbvsImaQa9olqGsampRlGC7QGvK4Z1UTNbr853Ej7vzFba5eEqlH b4iKlqPtA/3Qbt01JhvRZb7Ud+IBMAVuXc1AokPpLENMw1xXlBFQ7cAKqbuj54cXu+S4= Cc: dri-devel@lists.freedesktop.org, Arnd Bergmann , linux-arm-kernel@lists.infradead.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-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 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Moving around the Makefile for HDMI caused a link error with the main driver referring to a builtin module that has no exported symbols: drivers/gpu/built-in.o: In function `msm_drm_register': :(.init.text+0x654): undefined reference to `msm_hdmi_register' This changes the EDP symbol to a 'tristate' so we can build it as a module, and exports the symbols as necessary. Signed-off-by: Arnd Bergmann Fixes: 883656affe4d ("drm/msm/hdmi: Create separate Makefile/Kconfig") --- drivers/gpu/drm/msm/Makefile | 2 +- drivers/gpu/drm/msm/hdmi/Kconfig | 7 ++++++- drivers/gpu/drm/msm/hdmi/Makefile | 6 ++++-- drivers/gpu/drm/msm/hdmi/hdmi.c | 3 +++ drivers/gpu/drm/msm/msm_drv.h | 2 +- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile index e67bdaa14635..06fd13989476 100644 --- a/drivers/gpu/drm/msm/Makefile +++ b/drivers/gpu/drm/msm/Makefile @@ -40,7 +40,7 @@ drm-msm-$(CONFIG_DRM_FBDEV_EMULATION) += msm_fbdev.o drm-msm-$(CONFIG_COMMON_CLK) += mdp/mdp4/mdp4_lvds_pll.o obj-$(CONFIG_DRM_MSM_DSI_MODULE) += dsi/ -obj-$(CONFIG_DRM_MSM_HDMI) += hdmi/ +obj-$(CONFIG_DRM_MSM_HDMI_MODULE) += hdmi/ obj-$(CONFIG_DRM_MSM_EDP_MODULE) += edp/ obj-$(CONFIG_DRM_MSM) += drm-msm.o drm_msm_helper.o diff --git a/drivers/gpu/drm/msm/hdmi/Kconfig b/drivers/gpu/drm/msm/hdmi/Kconfig index 4b24e1e4bac4..8e9abaeae758 100644 --- a/drivers/gpu/drm/msm/hdmi/Kconfig +++ b/drivers/gpu/drm/msm/hdmi/Kconfig @@ -1,7 +1,12 @@ config DRM_MSM_HDMI - bool "Enable HDMI support in MSM DRM driver" + tristate "Enable HDMI support in MSM DRM driver" depends on DRM_MSM default y help Choose this option if you have a need for HDMI connector support. + +config DRM_MSM_HDMI_MODULE + tristate + default y if DRM_MSM=y && DRM_MSM_HDMI=m + default DRM_MSM_HDMI diff --git a/drivers/gpu/drm/msm/hdmi/Makefile b/drivers/gpu/drm/msm/hdmi/Makefile index 799dbca89bd4..6cb4598f48d7 100644 --- a/drivers/gpu/drm/msm/hdmi/Makefile +++ b/drivers/gpu/drm/msm/hdmi/Makefile @@ -1,6 +1,8 @@ ccflags-y := -Iinclude/drm -Idrivers/gpu/drm/msm -obj-y := hdmi.o hdmi_phy.o hdmi_audio.o hdmi_bridge.o hdmi_connector.o \ +obj-$(CONFIG_DRM_MSM_HDMI_MODULE) += drm-msm-hdmi.o + +drm-msm-hdmi-y := hdmi.o hdmi_phy.o hdmi_audio.o hdmi_bridge.o hdmi_connector.o \ hdmi_hdcp.o hdmi_i2c.o hdmi_phy_8960.o hdmi_phy_8x60.o hdmi_phy_8x74.o -obj-$(CONFIG_COMMON_CLK) += hdmi_pll_8960.o hdmi_phy_8996.o +drm-msm-hdmi-$(CONFIG_COMMON_CLK) += hdmi_pll_8960.o hdmi_phy_8996.o diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c index 3bcfb1ded8b3..8e01d942d1c9 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c @@ -343,6 +343,7 @@ fail: return ret; } +EXPORT_SYMBOL_GPL(msm_hdmi_modeset_init); /* * The hdmi device: @@ -522,9 +523,11 @@ void __init msm_hdmi_register(void) msm_hdmi_phy_driver_register(); platform_driver_register(&msm_hdmi_driver); } +EXPORT_SYMBOL_GPL(msm_hdmi_register); void __exit msm_hdmi_unregister(void) { platform_driver_unregister(&msm_hdmi_driver); msm_hdmi_phy_driver_unregister(); } +EXPORT_SYMBOL_GPL(msm_hdmi_unregister); diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index 8786738a6832..905c17e373e7 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -244,7 +244,7 @@ struct drm_fb_helper *msm_fbdev_init(struct drm_device *dev); void msm_fbdev_free(struct drm_device *dev); struct hdmi; -#ifdef CONFIG_DRM_MSM_HDMI +#if IS_ENABLED(CONFIG_DRM_MSM_HDMI) int msm_hdmi_modeset_init(struct hdmi *hdmi, struct drm_device *dev, struct drm_encoder *encoder); void __init msm_hdmi_register(void);