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: 9688289 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 54B2F602DC for ; Wed, 19 Apr 2017 17:05:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 41718200E7 for ; Wed, 19 Apr 2017 17:05:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3637C2842E; Wed, 19 Apr 2017 17:05:58 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED 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 AEA53200E7 for ; Wed, 19 Apr 2017 17:05:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 593DE6E095; Wed, 19 Apr 2017 17:05:54 +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.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id 33A106E095 for ; Wed, 19 Apr 2017 17:05:53 +0000 (UTC) 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 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:L/tC9XX5RQs=:nmCkI+mulEAuxzZMrvO4KO 3/0eHQlJa9mfTPVA5n2PeZLIddrQJzcb7i+RlnAyUO1GXSMbAtRZ6yYPAqjohJ0rf9Hi8Hg4K 1Q5voS6iuflYOz73+UFR719uUSr6JJEDN9+SP5rhjkq9aQ79bKzPWZvwqHGMYQD6s8T04s3KY EnEj84Yx54l9g1JZ8EX+x2OyUReJPvqDtPCKyst6O8a333d+nA5vxEMULKMyci/0T989roRxb GGX+CZi1vckg+Cios9PooRRJ+59cr6y9U4hZHq77tJ7WAbi30RYvnJz/IsM0IEZTYNF2sT5/Y 3Gu/LAidHCE9wy4xdDkdMl1c57N9xjoxXSoUTHvehKK12ZYGtXDrAyu8onEGgmxAojR80U1ko 5xE511jvJ9KVezICXRw8vgA6rJPd8zlkysf72IZkR8zv6a70IxI8khbEEPndrSzVrVxrf7Uxc AWGqoBkNCRtEykGDHRzevG6MOC4PKaayG2/9hAz8OUbwycPkzaFg/Yi3HIbx+bhoz4qdArr5l UxbvV8xHpgaOnzuNY/PCSNKxMmKj3VOM8qb2lFLStm4g4qah1AbuUfVJ8jE+MS9JZeM33wVTT Hw4/WE9Rq4Iwp30fMr9Fr4MsckCLBh11mhCpmQsJNTCvG4qqud1wM25dUIG54wbk7luEga3s9 /WUnEi5smZeW6jq9wEogwref/8SlMeJMgRxBcoA1fbHvKbmRJOUsYncVaYHCnqsiCoz4= Cc: Arnd Bergmann , Arnaud Pouliquen , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Peter Griffin , Hans Verkuil , Vincent Abriou , linux-media@vger.kernel.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 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