From patchwork Thu Jan 4 10:31:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 123402 Delivered-To: patch@linaro.org Received: by 10.80.135.92 with SMTP id 28csp6546283edv; Thu, 4 Jan 2018 02:32:26 -0800 (PST) X-Google-Smtp-Source: ACJfBot7AULdkXyuoDqAUBgYGTikGU4KnDliyZZRvU/C8tw27TXKIaXSMB6+fzb9A5PUD1GxKJJF X-Received: by 10.84.252.150 with SMTP id y22mr4224076pll.332.1515061946713; Thu, 04 Jan 2018 02:32:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515061946; cv=none; d=google.com; s=arc-20160816; b=Je7jMfnmQaBAABaRzgEt3m6fOWD+9sssmqfZlwT8/lgPhAvG4KSIVgm+o/3MIrWrh2 dWmEYFGUodwFgRNC92CyDbKTEFuTfiEYogoUsMGhjqn6UrqKGIy5zMnlTTwtIUSnzLa1 p7M0yhjOy/IyvSszMntndV8d3Vc4pTyNTdb4xs1kG1q4eTYmm/TH3oDbyRrmXYMOVsdC HZcNKaPbRLVPxBjUCBV4PUxoFpBdzvrNPvY2Bq+PkrPfXBh6XD3SRvZCcgvDd1D4C/Cj Dr8hIi7aA8IYZbQPOyGpI+PXbUoxax9ofVrARKxbLtKOGWn9qXFzmL/eyn0DyyDnTHMt JiRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=mlEdnFRdALTc2zs+MaTfZVo7a3+gkLxzvn9PpYIYSbI=; b=ejAlvGSnZa9gJVdgWsLckjcT/I4Glir1y/Q8RWFGz2DrWQHWA0Ox6mqET3EwltjJ2n MYLnC19L7veMBy7J2daf9ZT0RXgqVaeX6XNARlj/pfB3n4c3DnPt6cDXQTe7JEUh/OOb Lc2O+0bzNrjlZ0as1sQ0Aps3Gvul1TppUgLnj2jTrtzvIhzOz/PIDY17HHFRcVHUQ+XR 6taCegtpXoUyoUGJjasleUkq4TR5DOnU50bK0CzzZ6YRJcEAnka2VSt+L1mGPw+FPYGM yaKr0n9IeJkuiMjqgXCuXGg8HCmIn2xKPqaIu35B12gcPBwLY29FdJNj8xXEbjSoxiD0 aIFw== 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 c1si1900474pgv.157.2018.01.04.02.32.26; Thu, 04 Jan 2018 02:32:26 -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 S1752710AbeADKcW (ORCPT + 28 others); Thu, 4 Jan 2018 05:32:22 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:56577 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752159AbeADKcV (ORCPT ); Thu, 4 Jan 2018 05:32:21 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Ly6KL-1f1HRF2E3J-015ZBR; Thu, 04 Jan 2018 11:32:16 +0100 From: Arnd Bergmann To: Mauro Carvalho Chehab Cc: Arnd Bergmann , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] media: dvb: fix DVB_MMAP symbol name Date: Thu, 4 Jan 2018 11:31:30 +0100 Message-Id: <20180104103215.15591-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:UIdfcyp9TOB9l5AFnkC7mJ//DsyjVlWj4gJrb+ZBTHCUJybDtxr S78Blj5qPWbrQg+Yo8uNF7zm+8ArLcB+ax5c4bMYurYHUvWzwrueXTyRNLrXdLkXYoAVKc5 /Ndph2Ucj/IcJb5aPpQNsWhTIZLDTenjHVV/XycbtjGVbGqB1gpW4Yg/GpC5aCCu+NETsBB 4d6IXGAivHLO9sfkSyhnw== X-UI-Out-Filterresults: notjunk:1; V01:K0:nZrP0UVBLWM=:zs8PkCWd7zv5sreaH2lee7 /dBKCfM2x9M7mj08Y6lmRCTaxuwv0AmKYHEH51+7smxK323hgDVWQK7xSQjr3Iy2kSmeGae4M aHiWd2w7rsUH61CTXfoJr4nIW6PP0aVjFBV+9e+VY3vyLYItYntDscZ2Gx4vsRNkMSVL9t3de H48z3OlT/YTntq/4fT4s1DbTNqqD5TFCSIseZjGGI/hDfkqtziehNhRd6E/SasKBkUmlXV+Dx aXEe678kNUyuJkivKekJ6jpdDPfiE/P8el04dKLbenOtJ7ZxhOc+QCEmv+NzHQLw7qqPgumKo KlMaf7XhOMSbHqHvIVcu1z8azGaIEAAhI5lIJ8p44tG/ixQadYfRvpEAKC2ycUwHe7+SqX/ir G7f+ZuA0zM7ZnbbmEpiLzu6oHxFnbaoi5JSYnSlpLXWwuhyGSbpgQDLSYFKjk8YzjiptAdM7G TE1tE8aSOJ3eOidi2I1KZEuU6HfQEXlTlKyebo+B/pMPJiy/1POfO1edFR+B1I3VzI3ArYlYM mPSviXtJged72/La9494+/J/OUXryilISlFDxy5feRZ4jhxpZVwa+zINpuR4grimuVid3QREU HCzqQXKcDuy7bmb9480W1tbyhjlqMhcwoPXjNBpa4sMrlLXUyPlqCCkH7dLW6tuMxPGcalU5f 7BMGpbdxA4lK1u5d7xguXu05vFlByZayVufL4iGAc6iKiw1tqZjWw6O94ifHnb5KdpfOloSMo I00SEOPpJT3jpM2w1qH0FpaVdG6shdyssyQ4Fw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org CONFIG_DVB_MMAP was misspelled either as CONFIG_DVB_MMSP or DVB_MMAP, so it had no effect at all. This fixes that, to make it possible to build it again. Fixes: 4021053ed52d ("media: dvb-core: make DVB mmap API optional") Signed-off-by: Arnd Bergmann --- drivers/media/dvb-core/Makefile | 2 +- drivers/media/dvb-core/dmxdev.c | 30 +++++++++++++++--------------- include/media/dvb_vb2.h | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) -- 2.9.0 diff --git a/drivers/media/dvb-core/Makefile b/drivers/media/dvb-core/Makefile index 3756ccf83384..045e2392c668 100644 --- a/drivers/media/dvb-core/Makefile +++ b/drivers/media/dvb-core/Makefile @@ -4,7 +4,7 @@ # dvb-net-$(CONFIG_DVB_NET) := dvb_net.o -dvb-vb2-$(CONFIG_DVB_MMSP) := dvb_vb2.o +dvb-vb2-$(CONFIG_DVB_MMAP) := dvb_vb2.o dvb-core-objs := dvbdev.o dmxdev.o dvb_demux.o \ dvb_ca_en50221.o dvb_frontend.o \ diff --git a/drivers/media/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c index bc198f84b9cd..41e0259fc1c7 100644 --- a/drivers/media/dvb-core/dmxdev.c +++ b/drivers/media/dvb-core/dmxdev.c @@ -128,7 +128,7 @@ static int dvb_dvr_open(struct inode *inode, struct file *file) struct dvb_device *dvbdev = file->private_data; struct dmxdev *dmxdev = dvbdev->priv; struct dmx_frontend *front; -#ifndef DVB_MMAP +#ifndef CONFIG_DVB_MMAP bool need_ringbuffer = false; #else const bool need_ringbuffer = true; @@ -144,7 +144,7 @@ static int dvb_dvr_open(struct inode *inode, struct file *file) return -ENODEV; } -#ifndef DVB_MMAP +#ifndef CONFIG_DVB_MMAP if ((file->f_flags & O_ACCMODE) == O_RDONLY) need_ringbuffer = true; #else @@ -200,7 +200,7 @@ static int dvb_dvr_release(struct inode *inode, struct file *file) { struct dvb_device *dvbdev = file->private_data; struct dmxdev *dmxdev = dvbdev->priv; -#ifndef DVB_MMAP +#ifndef CONFIG_DVB_MMAP bool need_ringbuffer = false; #else const bool need_ringbuffer = true; @@ -213,7 +213,7 @@ static int dvb_dvr_release(struct inode *inode, struct file *file) dmxdev->demux->connect_frontend(dmxdev->demux, dmxdev->dvr_orig_fe); } -#ifndef DVB_MMAP +#ifndef CONFIG_DVB_MMAP if ((file->f_flags & O_ACCMODE) == O_RDONLY) need_ringbuffer = true; #endif @@ -426,7 +426,7 @@ static int dvb_dmxdev_ts_callback(const u8 *buffer1, size_t buffer1_len, { struct dmxdev_filter *dmxdevfilter = feed->priv; struct dvb_ringbuffer *buffer; -#ifdef DVB_MMAP +#ifdef CONFIG_DVB_MMAP struct dvb_vb2_ctx *ctx; #endif int ret; @@ -440,12 +440,12 @@ static int dvb_dmxdev_ts_callback(const u8 *buffer1, size_t buffer1_len, if (dmxdevfilter->params.pes.output == DMX_OUT_TAP || dmxdevfilter->params.pes.output == DMX_OUT_TSDEMUX_TAP) { buffer = &dmxdevfilter->buffer; -#ifdef DVB_MMAP +#ifdef CONFIG_DVB_MMAP ctx = &dmxdevfilter->vb2_ctx; #endif } else { buffer = &dmxdevfilter->dev->dvr_buffer; -#ifdef DVB_MMAP +#ifdef CONFIG_DVB_MMAP ctx = &dmxdevfilter->dev->dvr_vb2_ctx; #endif } @@ -1111,7 +1111,7 @@ static int dvb_demux_do_ioctl(struct file *file, mutex_unlock(&dmxdevfilter->mutex); break; -#ifdef DVB_MMAP +#ifdef CONFIG_DVB_MMAP case DMX_REQBUFS: if (mutex_lock_interruptible(&dmxdevfilter->mutex)) { mutex_unlock(&dmxdev->mutex); @@ -1199,7 +1199,7 @@ static __poll_t dvb_demux_poll(struct file *file, poll_table *wait) return mask; } -#ifdef DVB_MMAP +#ifdef CONFIG_DVB_MMAP static int dvb_demux_mmap(struct file *file, struct vm_area_struct *vma) { struct dmxdev_filter *dmxdevfilter = file->private_data; @@ -1249,7 +1249,7 @@ static const struct file_operations dvb_demux_fops = { .release = dvb_demux_release, .poll = dvb_demux_poll, .llseek = default_llseek, -#ifdef DVB_MMAP +#ifdef CONFIG_DVB_MMAP .mmap = dvb_demux_mmap, #endif }; @@ -1280,7 +1280,7 @@ static int dvb_dvr_do_ioctl(struct file *file, ret = dvb_dvr_set_buffer_size(dmxdev, arg); break; -#ifdef DVB_MMAP +#ifdef CONFIG_DVB_MMAP case DMX_REQBUFS: ret = dvb_vb2_reqbufs(&dmxdev->dvr_vb2_ctx, parg); break; @@ -1322,7 +1322,7 @@ static __poll_t dvb_dvr_poll(struct file *file, poll_table *wait) struct dvb_device *dvbdev = file->private_data; struct dmxdev *dmxdev = dvbdev->priv; __poll_t mask = 0; -#ifndef DVB_MMAP +#ifndef CONFIG_DVB_MMAP bool need_ringbuffer = false; #else const bool need_ringbuffer = true; @@ -1337,7 +1337,7 @@ static __poll_t dvb_dvr_poll(struct file *file, poll_table *wait) poll_wait(file, &dmxdev->dvr_buffer.queue, wait); -#ifndef DVB_MMAP +#ifndef CONFIG_DVB_MMAP if ((file->f_flags & O_ACCMODE) == O_RDONLY) need_ringbuffer = true; #endif @@ -1353,7 +1353,7 @@ static __poll_t dvb_dvr_poll(struct file *file, poll_table *wait) return mask; } -#ifdef DVB_MMAP +#ifdef CONFIG_DVB_MMAP static int dvb_dvr_mmap(struct file *file, struct vm_area_struct *vma) { struct dvb_device *dvbdev = file->private_data; @@ -1381,7 +1381,7 @@ static const struct file_operations dvb_dvr_fops = { .release = dvb_dvr_release, .poll = dvb_dvr_poll, .llseek = default_llseek, -#ifdef DVB_MMAP +#ifdef CONFIG_DVB_MMAP .mmap = dvb_dvr_mmap, #endif }; diff --git a/include/media/dvb_vb2.h b/include/media/dvb_vb2.h index 49b46e5bdcf0..f511b4d7760b 100644 --- a/include/media/dvb_vb2.h +++ b/include/media/dvb_vb2.h @@ -103,7 +103,7 @@ struct dvb_vb2_ctx { char name[DVB_VB2_NAME_MAX + 1]; }; -#ifndef DVB_MMAP +#ifndef CONFIG_DVB_MMAP static inline int dvb_vb2_init(struct dvb_vb2_ctx *ctx, const char *name, int non_blocking) { 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 From patchwork Thu Jan 4 10:31:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 123404 Delivered-To: patch@linaro.org Received: by 10.80.135.92 with SMTP id 28csp6546702edv; Thu, 4 Jan 2018 02:32:52 -0800 (PST) X-Google-Smtp-Source: ACJfBoslVMEIP0MuthFqOKW4J3HlTh1AWQ20MtVHGznwh+vIC6cOXQFwfLb/qLdRHQYcdH+o2qFd X-Received: by 10.159.194.1 with SMTP id x1mr4141810pln.116.1515061972240; Thu, 04 Jan 2018 02:32:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515061972; cv=none; d=google.com; s=arc-20160816; b=vmdI0ffTL/qj45gNhtDTGonU5dL51/Bs1wacO9XRcj/gFeT7PUpi3jVZ2KTVtytMkR VCVIlo/PW8Qsh6MOmcnQEwn7wwcW6NkRPswFHRAP42akUUcVhGCOCqalnwMAdTnvXihc +IlU3TjKEEVsH+anQx8wHVd6uDc/etpc1qEc3G5Bkt61q35tAKf3DHcF6TwEHmtVmHwm 0yWDqMlHQOW2K9rEYT8oCXccRZtruKKbw8gWOfEWxE7/H/Z7CcfStS7CO+8oMcD7Zjij CUsK4G2ILCUWEfGuQ3mXedrQv7XtGESWpknqMIu9GL8CZ9gs8SVaJtAXwbyym7K6BF6I bZaw== 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=RDZNpO9FhMwLFg8wy/9Y1tIxYNCZz97xk7M/hBBpb28=; b=HACPopjqB3GonrdI4z2un4IDy1solIuBf+IauhLP3jrgdHwrsjRpuzNsedgYS7QT3I ybKmCnjEe9dg7MN1QJ6X0BmUJYkV1VL/6c3RCNMZdt68N+LVRE1P5LNroaj9t47gtOZh cn4mgjK9s0pf+Q+neAz9K3xfcXvC3fndxs4+3ppfTL1pJG8tPQmsdsCLzsutjgyFw3wR ihxynCzrV91tz/6KrhxtiEGDBhb12pY0ZSDjzhXkbtBN7jSoqxnW29xMIQ9eanZ44lNs aKJX7r6Fl1W6E7hB9fOxu0tEqxc8vZSMY3zoEq6rf2ZO0tzTFCzUaWHU5EV12lW2R16S 7fmQ== 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 w8si2146374pfa.267.2018.01.04.02.32.51; Thu, 04 Jan 2018 02:32:52 -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 S1752772AbeADKcs (ORCPT + 28 others); Thu, 4 Jan 2018 05:32:48 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:61093 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752159AbeADKco (ORCPT ); Thu, 4 Jan 2018 05:32:44 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MWbfO-1eQ1PG0GXy-00Xbk6; Thu, 04 Jan 2018 11:32:40 +0100 From: Arnd Bergmann To: Mauro Carvalho Chehab Cc: Arnd Bergmann , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] media: au0828: add VIDEO_V4L2 dependency Date: Thu, 4 Jan 2018 11:31:32 +0100 Message-Id: <20180104103215.15591-3-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:QhEvNci3BcrxSM59GQGUNY7+LaUCVXf168jyn1RcL24LAQDQnWi RwtJ/cmZNlPvX70mLNMrksS3dYPxmSvrurgOuMxIGqdSAnTCKizpZOT7POdB2FF9mGIaQmi +kWVlpyVzVP4EBB9U0fUQA3cfF49MyQMcOfM0bCTSfhX3L5TTgk+NJ/BRX/EV/e/wnklF1N 4f+q57EwZzroHJVkMf7Mw== X-UI-Out-Filterresults: notjunk:1; V01:K0:r5rN/1OMt/Q=:QGUjrNYnQaWYsxqKzTimrQ 6+D2lDhxp2U91WWvLvxA3LanY99oZxBvcqngdG9BPfw3XmCe4f+CNZ0KqYlS6GMaszxkmSIeB rPaiyMUD4Fqlh3QJTt6MXCKBG+iSP2S0nSwwzkXHsA0lPWTES7+oSGOeveBT43gnebLiCctqC prS0Rq9UsB4ZtDFBmPg47xz+rOQX/BxsEPdwbHCneX07FiVz6YzZaeR0u7ZFuQ2zjKWSCvUTm JGhJqNy6I4Isze9Ps3IdkKQ4eMTznpmfS0d8Lh6ZP6aX4ZYgGxEYjQJSe1dCJmjlB1be3DgE2 2r6tA6tBU+Iq6VnU4GQ9YW8k9VoIsiOPxKX7t63Yze0215Jj8N0vetkNNjXsonL37BjnofNVn plsPR7lMW3GMsGv/inVEzR9IPJvYLFn9MMA1h6BeEh2X2FzMyIivUfEgPlbaQkm3WTVeC+X6R 9ROMQZq25BQ7fq2BrcWqOHRrNaKEXs7jXvTDqy3PyRCAAwBoRK7WMilBmRJQL0BiwgiH8j32o qjqSeI6lWfB1C8rYL+QBrLqRnWpngNzyrazHSbAsF5NqbB0AlG75Yv5bA44br0XU2JJcr0fWX mDWoRGjHT1Wta4V+vmPt+ToKIzuC7J3lg7VY0bCN6ylfbCI/aMrLG29fw1Svwfy41N/DhjXmG eTLyMRVk2mCKx7vdDnJMrA01gx0RG13meZVUis+Tk0EfS91TO+dHy8XQQ3PlXuMMZEdxmbRVu rTihvcciyFvuvwko3+hVQ+eU7LlHJDt2YW0etw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org After the move of videobuf2 into the common directory, selecting the au0828 driver with CONFIG_V4L2 disabled started causing a link failure, as we now attempt to build videobuf2 but it still requires v4l2: ERROR: "v4l2_event_pending" [drivers/media/common/videobuf/videobuf2-v4l2.ko] undefined! ERROR: "v4l2_fh_release" [drivers/media/common/videobuf/videobuf2-v4l2.ko] undefined! ERROR: "video_devdata" [drivers/media/common/videobuf/videobuf2-v4l2.ko] undefined! ERROR: "__tracepoint_vb2_buf_done" [drivers/media/common/videobuf/videobuf2-core.ko] undefined! ERROR: "__tracepoint_vb2_dqbuf" [drivers/media/common/videobuf/videobuf2-core.ko] undefined! ERROR: "v4l_vb2q_enable_media_source" [drivers/media/common/videobuf/videobuf2-core.ko] undefined! This adds the same dependency in au0828 that the other users of videobuf2 have. Fixes: 03fbdb2fc2b8 ("media: move videobuf2 to drivers/media/common") Fixes: 05439b1a3693 ("[media] media: au0828 - convert to use videobuf2") Signed-off-by: Arnd Bergmann --- drivers/media/usb/au0828/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/media/usb/au0828/Kconfig b/drivers/media/usb/au0828/Kconfig index 70521e0b4c53..bfaa806633df 100644 --- a/drivers/media/usb/au0828/Kconfig +++ b/drivers/media/usb/au0828/Kconfig @@ -1,7 +1,7 @@ config VIDEO_AU0828 tristate "Auvitek AU0828 support" - depends on I2C && INPUT && DVB_CORE && USB + depends on I2C && INPUT && DVB_CORE && USB && VIDEO_V4L2 select I2C_ALGOBIT select VIDEO_TVEEPROM select VIDEOBUF2_VMALLOC