From patchwork Mon Aug 7 10:49:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 109547 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp1440443qge; Mon, 7 Aug 2017 03:49:53 -0700 (PDT) X-Received: by 10.99.123.78 with SMTP id k14mr77398pgn.47.1502102993335; Mon, 07 Aug 2017 03:49:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502102993; cv=none; d=google.com; s=arc-20160816; b=r+nNf34dGR1nDG57HHFvP/F9ca9a12DLJajD4SbUGCiPy4BP5jH7JrWrQPV6h4PSTq IBOOc45guZCeGFm56lmBcaMk7yiqswLPQUmjJXEVAQU/9bRloPqzcUfmhmUCTPKcssog 7jTp+D6qofQbQeWL9DzGE8fwOU8UAQbsgL3pOaFo91rqOk8tlyFmRKNVxw7FizFLE+X5 qkJl5A6qMYN+zhEQydn5A118Qz7WGMW6jNvjyJDhXVoI+2kiYWBVpyfs8KnRtlwqsPMd XlH5kjwLRGv3UxOSf8ZEReJj8hj4VdhppTswIynJ5Xc3bmTZud1QNT8yhB6POXgX+NDg B0Uw== 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=A/TliAqltXoYSEGY+uJQn9cLkDb4f6zivRVbobBLXoE=; b=YxEmHtTGONUzRpw5j+Qd4uuMg15B6+5RZtF4mc1ZpkzhIexPFiD1XOzfuwt515YHNi FNueRSfGfNs68IapT/RJp9riAklkwYiBowDN1KQn9qIwuLnKr9B045ZPJ+7lyBZ4hbIU xbp39BTK4C93PuXrvTMMdIIEnbtkwhxT887xBKvAqVkEr/hNUv+f7qEMjsKolvP/8Hgb RJzhwelI4t/cKWcrlpI2+4LEYB/upsuT/CJPz7wWo8LsGh7YMy9qhjiMhZjlxULyGEht kH9VxpVJXIljp54jERinwki5QVBTHHkMmoBwlMPKP0RIAuMjQ8u1uKWDZFqaBeKiShOw 0Grg== 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 t11si4500100pgo.703.2017.08.07.03.49.52; Mon, 07 Aug 2017 03:49:53 -0700 (PDT) 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 S1752866AbdHGKts (ORCPT + 25 others); Mon, 7 Aug 2017 06:49:48 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:57535 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752487AbdHGKtr (ORCPT ); Mon, 7 Aug 2017 06:49:47 -0400 Received: from wuerfel.lan ([78.43.238.10]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0MYrHb-1eAHEN1aKJ-00VhBN; Mon, 07 Aug 2017 12:49:32 +0200 From: Arnd Bergmann To: Steve Longerbeam , Philipp Zabel , Mauro Carvalho Chehab , Greg Kroah-Hartman Cc: Arnd Bergmann , Russell King , Hans Verkuil , linux-media@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH] [media] staging/imx: always select VIDEOBUF2_DMA_CONTIG Date: Mon, 7 Aug 2017 12:49:18 +0200 Message-Id: <20170807104929.3651892-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:Pdq1NcNOeGcxocE3gaK08l4mjp1yhBgm17OL/89oYn/0Akm15eV BAC3Nl1Fw0imrzxz4u477oggCYMrF5dzSfli0L3ygzEfME/jSv8H5/NEM/8nRmh33KjWq5V hkwMlAOn3r3sq27pBSFr74p4iltAF+KFUxHzx4FD4XvoyslSHTAPjUcCNo1E5f6DVoKP8FQ VFES/+wvr4zCvatGY1xNA== X-UI-Out-Filterresults: notjunk:1; V01:K0:cladeyXVJuw=:wqXqDICNULyXHbaJ/shaSz 65HyaEBCvCVCgBukVd4SYHAww0Nr8i4fS2QIIqL0PefwUI3r+EPHgkH4IQwl43Pdn3ewwD3Y9 GwHIJY39XvmBe2b3jH2O++KA97JPKx4y5FQhbh0wtYZxmiEXwsp2r2iFQv9UBHKC/K1WIT3nG EHICkiRgxaOlmtpkpXJLiQj5oTlgUXOO9NYJD/NzuN9sG+6kJaFYIp9Gn7zpceiSKbH/4PI+p vIn5iRppYqemWsNzIasyvZIOeRaAibFIi9F39m8ykheMP+a4GsqkIOMbd2Secd1AwfRn4dkyo YjZpoEz/RsUh7wm7bWslM12Nlf18KhfyGRATgg8fIf9Y247oX5y09PvOWmuCwxC44p6ISsWQM 2Z9Hc9k4N3zrgdNcIwf2GzUWyZYXYI2QrnvFdZ4zqhiJ9N3NaaPp0SjfRLzmqfwsm/jq2mQFI 6AhDKi2kGkRiI73+j4gOXVmjcSDWASYLSJvJz8R1Tx4fj0YoLdRkq60IBcnUtqK4qxf+9im7L Ya62qZ3BddjGXuaiXJf7MpQgoZPjot1STiylg5zHLwUwsFROSW/xrs2ctZGTq29KhFfTBYfA+ nMWqacohH5F24a+WX8z9BrTF3WGMSerPtS9keU/6x/tZGl3lmHME8Y/9Ze737ZLmaPrk3lOyc 5jPXfglYtb0Sl79R8ImFydEEU5vDI/sz0GS6KIBHVe49Nu25b9tnK1ip63MPJ/iiSZcePX+MC 4S5vfHomjNqOGQd0dYRni8Elz+b8ttjJLMYe3g== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I ran into a rare build error during randconfig testing: drivers/staging/media/imx/imx-media-capture.o: In function `capture_stop_streaming': imx-media-capture.c:(.text+0x224): undefined reference to `vb2_buffer_done' drivers/staging/media/imx/imx-media-capture.o: In function `imx_media_capture_device_register': imx-media-capture.c:(.text+0xe60): undefined reference to `vb2_queue_init' imx-media-capture.c:(.text+0xfa0): undefined reference to `vb2_dma_contig_memops' While VIDEOBUF2_DMA_CONTIG was already selected by the camera driver, it wasn't necessarily there with just the base driver enabled. This moves the 'select' statement to the top-level option to make sure it's always available. Fixes: 64b5a49df486 ("[media] media: imx: Add Capture Device Interface") Signed-off-by: Arnd Bergmann --- drivers/staging/media/imx/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 Reviewed-by: Steve Longerbeam diff --git a/drivers/staging/media/imx/Kconfig b/drivers/staging/media/imx/Kconfig index 719508fcb0e9..2be921cd0d55 100644 --- a/drivers/staging/media/imx/Kconfig +++ b/drivers/staging/media/imx/Kconfig @@ -2,6 +2,7 @@ config VIDEO_IMX_MEDIA tristate "i.MX5/6 V4L2 media core driver" depends on MEDIA_CONTROLLER && VIDEO_V4L2 && ARCH_MXC && IMX_IPUV3_CORE depends on VIDEO_V4L2_SUBDEV_API + select VIDEOBUF2_DMA_CONTIG select V4L2_FWNODE ---help--- Say yes here to enable support for video4linux media controller @@ -13,7 +14,6 @@ menu "i.MX5/6 Media Sub devices" config VIDEO_IMX_CSI tristate "i.MX5/6 Camera Sensor Interface driver" depends on VIDEO_IMX_MEDIA && VIDEO_DEV && I2C - select VIDEOBUF2_DMA_CONTIG default y ---help--- A video4linux camera sensor interface driver for i.MX5/6.