From patchwork Tue Mar 28 10:16:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9648777 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D97E5601E9 for ; Tue, 28 Mar 2017 10:24:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BFC4126E39 for ; Tue, 28 Mar 2017 10:24:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B43E328338; Tue, 28 Mar 2017 10:24:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.7 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5253A26E39 for ; Tue, 28 Mar 2017 10:24:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 62B676E53E; Tue, 28 Mar 2017 10:24:37 +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.126.134]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2A7FD6E53E for ; Tue, 28 Mar 2017 10:24:36 +0000 (UTC) Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MPMdk-1coOKc2qUC-004TFa; Tue, 28 Mar 2017 12:17:02 +0200 From: Arnd Bergmann To: Mark Yao , David Airlie , Heiko Stuebner Subject: [PATCH] drm/rockchip: fix Kconfig dependencies Date: Tue, 28 Mar 2017 12:16:40 +0200 Message-Id: <20170328101654.73624-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:4dgjW2uvBg6jLU5dtXWs92QZGwHxYMYIe3FwZgjILDZqc8bdjg+ R2qGiVi8fjQpLYJNmMBfKAlTZTonDEDRvMHvPp9ikFPgIhc2dKuxtwMRLDGRqagmYk/JqXG OEF04+YWBj52w9yl6J1QcQt9PfSm9xC/YgSH4BsrG/fn4gdU5mm7a+JMaj0IP3eH6PU0yRg 8H12N+MK76H2jYnF2elBQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:FRrb6uVr+rY=:4bIKimD7hVoEV/6JUlku5f HHFDeS4MvFWlDa+lYkFLxqPiufEHlyzmO/8bhL3yLKoqfK29XK0QBKVHBN6MIYP+16i6e8+Na +uZGqlOWVJPnEN5UIPSA1WGEpdLcl4Y4Fdwm0fdu93xd3ahLtfnO1wi8eoLAtpk+TFWEum3MV +C7i1Yq+UB23UQlTAvOPaxL3giP+EqAzDg+8iP9Sy2KheaMbZvykGwCwRb7G10m89Hh0ilbmZ TZiAMq42HMYiXtZRwnJhWM0sFffXpaARDqPl01WbQHAkyA6HudHs7NmT1JDpdFTBhPPzs1k+i aA+SFZ1GilTHW3naWdzoYpYGwbS3H4sZnlkXAg2jotghs+TDyUYFKU2K29lDfoBMQIC2s7Khs NjfPZqi6S+jAbIPQXzNXNFiowXe8zEYGWrUhvndBzbfP6oU9kJP39SF7114D3XRtHb7vFxyVs 76VoHNWUq5jtdj+Nk2EnF+FVZFniYIaA67jLo1j9pnoFz+Wu5SoinYMm0EJG+6EO+A8cqc6BU Y1zFeClUA64OQKX4f9998czf0KLX3vYF3uKHhjBCoDpSsIEN3AWbZz7AmSv0iJg12AxrvWrhA 9+6ys9L8K4mzWdeRzCpu7jAH/lYvSJ+0EeKwKz6CBAjKwbo6HOaTY8Rp+8+bp2Cl+cSvkP5Hc NtYA/pFMJbm+upapWEPzQzg82sfDZWuSP9p6oXmgW61LAQMLwh2D8XfkLUW2yEF5JDi8= Cc: Stephen Boyd , Arnd Bergmann , Tobias Jakobi , Daniel Vetter , Jeffy Chen , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Chris Zhong , Yakir Yang , Guenter Roeck , linux-rockchip@lists.infradead.org, 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-Virus-Scanned: ClamAV using ClamSMTP A bug that I had fixed earlier just came back, with CONFIG_EXTCON=m, the rockchip drm driver will fail to link: drivers/gpu/drm/rockchip/cdn-dp-core.o: In function `cdn_dp_get_port_lanes': cdn-dp-core.c:(.text.cdn_dp_get_port_lanes+0x30): undefined reference to `extcon_get_state' cdn-dp-core.c:(.text.cdn_dp_get_port_lanes+0x6c): undefined reference to `extcon_get_property' drivers/gpu/drm/rockchip/cdn-dp-core.o: In function `cdn_dp_check_sink_connection': cdn-dp-core.c:(.text.cdn_dp_check_sink_connection+0x80): undefined reference to `extcon_get_state' drivers/gpu/drm/rockchip/cdn-dp-core.o: In function `cdn_dp_enable': cdn-dp-core.c:(.text.cdn_dp_enable+0x748): undefined reference to `extcon_get_property' The problem is that that the sub-drivers are now all linked into the main rockchip drm module, which breaks all the Kconfig dependencies that are specified in the options for those sub-drivers. This clarifies the dependency to ensure that we can only turn on the DP driver when EXTCON is reachable. As the 'select' statements can now cause additional options to become built-in when they should be loadable modules, I'm moving those into the main driver config option. The dependency on DRM_ROCKCHIP can be reduced into a single 'if' statement here for brevity, but this has no functional effect. Fixes: b6705157b2db ("drm/rockchip: add extcon dependency for DP") Fixes: 8820b68bd378 ("drm/rockchip: Refactor the component match logic.") Signed-off-by: Arnd Bergmann Acked-by: Guenter Roeck Tested-by: Jeffy Chen --- drivers/gpu/drm/rockchip/Kconfig | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig index 50c41c0a50ef..dcc539ba85d6 100644 --- a/drivers/gpu/drm/rockchip/Kconfig +++ b/drivers/gpu/drm/rockchip/Kconfig @@ -5,6 +5,10 @@ config DRM_ROCKCHIP select DRM_KMS_HELPER select DRM_PANEL select VIDEOMODE_HELPERS + select DRM_ANALOGIX_DP if ROCKCHIP_ANALOGIX_DP + select DRM_DW_HDMI if ROCKCHIP_DW_HDMI + select DRM_MIPI_DSI if ROCKCHIP_DW_MIPI_DSI + select SND_SOC_HDMI_CODEC if ROCKCHIP_CDN_DP && SND_SOC help Choose this option if you have a Rockchip soc chipset. This driver provides kernel mode setting and buffer @@ -12,10 +16,10 @@ config DRM_ROCKCHIP 2D or 3D acceleration; acceleration is performed by other IP found on the SoC. +if DRM_ROCKCHIP + config ROCKCHIP_ANALOGIX_DP bool "Rockchip specific extensions for Analogix DP driver" - depends on DRM_ROCKCHIP - select DRM_ANALOGIX_DP help This selects support for Rockchip SoC specific extensions for the Analogix Core DP driver. If you want to enable DP @@ -23,9 +27,7 @@ config ROCKCHIP_ANALOGIX_DP config ROCKCHIP_CDN_DP bool "Rockchip cdn DP" - depends on DRM_ROCKCHIP - depends on EXTCON - select SND_SOC_HDMI_CODEC if SND_SOC + depends on EXTCON=y || (EXTCON=m && DRM_ROCKCHIP=m) help This selects support for Rockchip SoC specific extensions for the cdn DP driver. If you want to enable Dp on @@ -34,8 +36,6 @@ config ROCKCHIP_CDN_DP config ROCKCHIP_DW_HDMI bool "Rockchip specific extensions for Synopsys DW HDMI" - depends on DRM_ROCKCHIP - select DRM_DW_HDMI help This selects support for Rockchip SoC specific extensions for the Synopsys DesignWare HDMI driver. If you want to @@ -44,8 +44,6 @@ config ROCKCHIP_DW_HDMI config ROCKCHIP_DW_MIPI_DSI bool "Rockchip specific extensions for Synopsys DW MIPI DSI" - depends on DRM_ROCKCHIP - select DRM_MIPI_DSI help This selects support for Rockchip SoC specific extensions for the Synopsys DesignWare HDMI driver. If you want to @@ -54,8 +52,9 @@ config ROCKCHIP_DW_MIPI_DSI config ROCKCHIP_INNO_HDMI bool "Rockchip specific extensions for Innosilicon HDMI" - depends on DRM_ROCKCHIP help This selects support for Rockchip SoC specific extensions for the Innosilicon HDMI driver. If you want to enable HDMI on RK3036 based SoC, you should select this option. + +endif