From patchwork Thu Jan 4 10:31:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10144409 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 9DDA460594 for ; Thu, 4 Jan 2018 10:33:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A33320243 for ; Thu, 4 Jan 2018 10:33:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7F00E2823E; Thu, 4 Jan 2018 10:33:09 +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 3F6CA20243 for ; Thu, 4 Jan 2018 10:33:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752724AbeADKcm (ORCPT ); Thu, 4 Jan 2018 05:32:42 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:54444 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752159AbeADKcj (ORCPT ); Thu, 4 Jan 2018 05:32:39 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0M3rTW-1eoIUW3lju-00rU10; Thu, 04 Jan 2018 11:32:31 +0100 From: Arnd Bergmann To: Mauro Carvalho Chehab Cc: Arnd Bergmann , Hans Verkuil , Benjamin Gaignard , Daniel Vetter , Sean Young , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] media: dvb: fix DVB_MMAP dependency Date: Thu, 4 Jan 2018 11:31:31 +0100 Message-Id: <20180104103215.15591-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180104103215.15591-1-arnd@arndb.de> References: <20180104103215.15591-1-arnd@arndb.de> X-Provags-ID: V03:K0:nbzwiISP5L7FepUGudL54UeZ4ueFtNMmK+SB7fOoAyPLf2ywfZw o+2W7htMphYxbMGwftfB21uopzDU6f8hRFE1lY0sjM6vIu2Vp03z/p8vWphTPsBOp6+ftkL HuvBZNpxvgZ3/01PCPIDHabl1KqPtYUmBgIzEUxOGRfkCUzr+7/xw8i48/D9ET+gmjFLAU1 aNyhtRD6tIsPKqVieNWBw== X-UI-Out-Filterresults: notjunk:1; V01:K0:NNx27h++xjo=:jctQtVzM/7mcsELD7kYEv0 fwtsZQhafrdPo+g2fEJ3+P+G5EywMjbuAVCHWkhu3UeIUGXq6ooakfu0QMqVFJjmH1IUUR9or MjKspjSPElcKnCBgnRZJnkQuSKFVldWAJdKA0QbTplFDtyCDICusLwN2OOhNvF7lZcJCR7J9L +eFO0S2cGR18FxncPT/l+PIdfvzA+SlJyz8b0CiHr8Ama4kBtV9U7HQuph86UECSyqnioJC9c jR6jiBdPCNYI4OCZHo6norzuplKNg570gKe2Lo+sfzq0QOGHgyymMWVvA0QnrukUyd3uy1DjH Hu7NUzTPwonYc6eX8RhHBSfN7OsAeNsaBwIPJ5hmVuPseaokB32XVoNgFLFJuYqwJQRhqJs5Y mKFUIMlQV7hR6TXFaARp6y1b231nblwYb+SUy13ZPPtITouHz5wR8uHDcuEZGBmkeFkw4sq4Q Y1hIjzVws3joOgZC66ql6NjuKcPWIcMjbWSSNr+RDPPXDRnzDmqraTXSxXj3RnGeHfhKECCdW fNtUbD8XM9HhUnRDTJ4X1RDN87ShH09nV6cBpqAtMQmUPxw+r03dCF1kcFJ9Lu/pdoMaCmNFO Pdz5DHXIjyqnG94LAf2oyvWFOpKRo6PDoXlhzaryU0C/XsBUn9rV+N11x9/1RAq7cmdLweYHC q3yO8LZpPXjCGs9H/11WMF4wpOvie1yxaTAJhkQrpgpqXyZG+uVXLa6KmZFQFVlgBpUJ0nu8H N8FY7F2h1Tn/MHMUwjLZHeU6LqpqKCTqtCgy0g== 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 Enabling CONFIG_DVB_MMAP without CONFIG_VIDEOBUF2_VMALLOC results in a link error: drivers/media/dvb-core/dvb_vb2.o: In function `_stop_streaming': dvb_vb2.c:(.text+0x894): undefined reference to `vb2_buffer_done' drivers/media/dvb-core/dvb_vb2.o: In function `dvb_vb2_init': dvb_vb2.c:(.text+0xbec): undefined reference to `vb2_vmalloc_memops' dvb_vb2.c:(.text+0xc4c): undefined reference to `vb2_core_queue_init' drivers/media/dvb-core/dvb_vb2.o: In function `dvb_vb2_release': dvb_vb2.c:(.text+0xe14): undefined reference to `vb2_core_queue_release' drivers/media/dvb-core/dvb_vb2.o: In function `dvb_vb2_stream_on': dvb_vb2.c:(.text+0xeb8): undefined reference to `vb2_core_streamon' drivers/media/dvb-core/dvb_vb2.o: In function `dvb_vb2_stream_off': dvb_vb2.c:(.text+0xfe8): undefined reference to `vb2_core_streamoff' drivers/media/dvb-core/dvb_vb2.o: In function `dvb_vb2_fill_buffer': dvb_vb2.c:(.text+0x13ec): undefined reference to `vb2_plane_vaddr' dvb_vb2.c:(.text+0x149c): undefined reference to `vb2_buffer_done' This adds a 'select' statement for it, plus a dependency that ensures that videobuf2 in turn works, as it in turn depends on VIDEO_V4L2 to link, and that must not be a module if videobuf2 is built-in. Signed-off-by: Arnd Bergmann --- drivers/media/Kconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index 3f69b948d102..d1be86ebfd9a 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig @@ -147,6 +147,8 @@ config DVB_CORE config DVB_MMAP bool "Enable DVB memory-mapped API (EXPERIMENTAL)" depends on DVB_CORE + depends on VIDEO_V4L2=y || VIDEO_V4L2=DVB_CORE + select VIDEOBUF2_VMALLOC default n help This option enables DVB experimental memory-mapped API, with