From patchwork Wed Apr 19 16:59:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9688227 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 5865D60383 for ; Wed, 19 Apr 2017 17:00:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 491BA2842E for ; Wed, 19 Apr 2017 17:00:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3B75228433; Wed, 19 Apr 2017 17:00:49 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D319B28433 for ; Wed, 19 Apr 2017 17:00:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967488AbdDSRA3 (ORCPT ); Wed, 19 Apr 2017 13:00:29 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:64672 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966966AbdDSRAY (ORCPT ); Wed, 19 Apr 2017 13:00:24 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.145]) with ESMTPA (Nemesis) id 0M9Xn5-1csOco0fV9-00CyC6; Wed, 19 Apr 2017 18:59:37 +0200 From: Arnd Bergmann To: Mauro Carvalho Chehab Cc: Hans Verkuil , linux-media@vger.kernel.org, Arnd Bergmann , Benjamin Gaignard , Vincent Abriou , David Airlie , Arnaud Pouliquen , Peter Griffin , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] [media] sti: hdmi: improve MEDIA_CEC_NOTIFIER dependency Date: Wed, 19 Apr 2017 18:59:23 +0200 Message-Id: <20170419165936.2836426-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:ZI9RP2FYdyAkfW03TdC69lJjPOtM9u7ghzvcUPn/thz8z3XfvI5 YE3HZIJja3gQdZLDIevJcnv/Z+KpwdRtWgPZieVWrHLrd+xp/CK950nclTJ6+9ihOACwYqg lwAeVv4IJmfdq0ZoG5TOCibeqYp1AatEZOhAoxWYuXwuCJJA5Q1Hk3TVxuY6B4bSo5NsAoY 29CJ6DYdA+E0QiIT9XVGA== X-UI-Out-Filterresults: notjunk:1; V01:K0:rEI1TOuR5Xk=:S312nfeub5kLazwE5rnn+W prlGjYCd8sHhfBckbbzUvuzZaLYZNWlMpaXP/9fLwXb51LGHYMtRlYkYNXlmp9GcavVCT6G7O bubCfwmom52L8Rdol6ZLgCGNXJ1dm4PSMYP8BNltuSk/z+TeDJRBhSjLzwtRa8DeHtMu9yojA isgf52i4yUlF5NunroJLNdnFEChL+bf5mOiM5orvz8YnHxa1ylMGsDjBlc3UzmIKpjEKMMveT BYRqJHKAHjTlITv8o5KXFUHbV6dQCBtafMUItpr1dlyFoew1lfIrymw9quyhAZ5fiV4vdzy9c b2LXmRJhX7t90lgFZWI3T05dsLFYtpf0BXyak18HpwhsW5qO6O3uedQKmV01vTEidx/7jg9/l RdZ/hyVMxv7KhZAvpmTcpmh3azS7Z2F3rIDicO99OJCj1Wwqf4mQrbWam3bhFJWk8A/cZIE/Y OYwxbqQZs2MykT0Bg14LAAolTc0TbaqWEQUISqdRSy+vDOxxCdd/C/Ly/6ZlfsutFT/qXh5Pf CoIQ21VBVRZ2KW24beGQbB6IhWUFAkmO/UXvFQ55DLiN0qj2Za8tZqUX14cSFhehXTmpNxtt6 pCdx1FXJC22uvEtu1P78IZc1VU3/wNQDgppErBCVvAzAPIPX9uO3XfQnJnpxw3H4O9INJU6Zs cp+BIqe4AKf3fiJ+vGW4jw/FpjBeo0MfZ8S4nA6X1HmglMjC6l44n9Dp5NHBoalgxchM= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When the media subsystem is built as a loadable module, a built-in DRM driver cannot use the cec notifiers: drivers/gpu/drm/sti/sti_hdmi.o: In function `sti_hdmi_remove': sti_hdmi.c:(.text.sti_hdmi_remove+0x28): undefined reference to `cec_notifier_set_phys_addr' sti_hdmi.c:(.text.sti_hdmi_remove+0x50): undefined reference to `cec_notifier_put' drivers/gpu/drm/sti/sti_hdmi.o: In function `sti_hdmi_connector_get_modes': sti_hdmi.c:(.text.sti_hdmi_connector_get_modes+0x84): undefined reference to `cec_notifier_set_phys_addr_from_edid' drivers/gpu/drm/sti/sti_hdmi.o: In function `sti_hdmi_probe': sti_hdmi.c:(.text.sti_hdmi_probe+0x1a8): undefined reference to `cec_notifier_get' drivers/gpu/drm/sti/sti_hdmi.o: In function `sti_hdmi_connector_detect': sti_hdmi.c:(.text.sti_hdmi_connector_detect+0x68): undefined reference to `cec_notifier_set_phys_addr' drivers/gpu/drm/sti/sti_hdmi.o: In function `sti_hdmi_disable': sti_hdmi.c:(.text.sti_hdmi_disable+0xec): undefined reference to `cec_notifier_set_phys_addr' This adds a Kconfig dependency to enforce the HDMI driver to also be a loadable module in this case. Fixes: bca55958ea87 ("[media] sti: hdmi: add CEC notifier support") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/sti/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/sti/Kconfig b/drivers/gpu/drm/sti/Kconfig index acd72865feac..adac4c3e142e 100644 --- a/drivers/gpu/drm/sti/Kconfig +++ b/drivers/gpu/drm/sti/Kconfig @@ -1,6 +1,7 @@ config DRM_STI tristate "DRM Support for STMicroelectronics SoC stiH4xx Series" depends on DRM && (ARCH_STI || ARCH_MULTIPLATFORM) + depends on (MEDIA_SUPPORT && MEDIA_CEC_NOTIFIER) || !MEDIA_CEC_NOTIFIER select RESET_CONTROLLER select DRM_KMS_HELPER select DRM_GEM_CMA_HELPER