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: 123403 Delivered-To: patch@linaro.org Received: by 10.80.135.92 with SMTP id 28csp6546638edv; Thu, 4 Jan 2018 02:32:48 -0800 (PST) X-Google-Smtp-Source: ACJfBosOkKKjjCOa+fR6XgbSgZ+95KRZkoitgWJx2nKes7Xh5yWX8iqkfQSuEyYs3BWtyE9R7vsZ X-Received: by 10.99.60.28 with SMTP id j28mr3641113pga.358.1515061968254; Thu, 04 Jan 2018 02:32:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515061968; cv=none; d=google.com; s=arc-20160816; b=cO/5C7OYWQPXeSoEGuiR4eXQx9QTD/9F9HSNqjOf1vCW2W/1TazjwJr9SZcEg2VnW6 tc8uQu8rMVA9E4Oxmy95LvKxo4qi663O22gwNRcStkLT+9WxcEcXiSM+chrkj5QFEoDv lqPw87Mx27/1MnNZaj3zFTFHmQ3LyGDVof3rqMK226+6Keu971Z4UutE7Ly/1iHvNjFm Kf4I0IJXloZAQfSfPDusoUtlget6CwBWXkhGUTGtUBHXd2Luc9mnMpT4M8luFpHs7dXv O/BntN59ZJ/Q0NKZs9xV1unC79UzeZxzCki5inUcbqtolyObidXFLQ2ajA3/CCmZIcFt eNTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=8yuLoDs99tZlWi6te544l4IBTngNXj5RcZXUR216DXI=; b=uIE1mFVI0gZ0pJePN4Et/tuRD3ELl9QlSzWMWwboEqCYXtKAqFH844HnvGHgYoGIZi teXyxk6nvo8UCNVMC7CvjavgIcTC2z9nNOvFASW3M1U2b1gKDQVDX8NXaqFaC+RViooQ E/7deoiYDaH951UsdNPaWfLKNEJepxFqg4wJcEH0M6/NC0IRDnhP5zD2VF67WEpbv99+ RTTZhm1x2wg1LluS8wGAkLgMtZWU91Rk9kNnoyVtcsXagaHqu6ATxCIT7jYp6nEQuuVe EChPke7JUqmL5ijCxT1fz5/xTD2qL1GnJRVPw3ED+mT84sTVievNxBATOFeXzDkRFQCV rP3w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k8si1878498pgo.401.2018.01.04.02.32.47; Thu, 04 Jan 2018 02:32:48 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752749AbeADKcm (ORCPT + 28 others); 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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(+) -- 2.9.0 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