From patchwork Fri Feb 21 08:45:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Verkuil X-Patchwork-Id: 210816 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 179E0C35643 for ; Fri, 21 Feb 2020 08:46:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D2DC82073A for ; Fri, 21 Feb 2020 08:46:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=xs4all.nl header.i=@xs4all.nl header.b="kXHB7C4J" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732565AbgBUIqt (ORCPT ); Fri, 21 Feb 2020 03:46:49 -0500 Received: from lb3-smtp-cloud8.xs4all.net ([194.109.24.29]:54399 "EHLO lb3-smtp-cloud8.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728761AbgBUIql (ORCPT ); Fri, 21 Feb 2020 03:46:41 -0500 Received: from tschai.fritz.box ([46.9.235.248]) by smtp-cloud8.xs4all.net with ESMTPA id 53xEjunXDPKvK53xHjhWWE; Fri, 21 Feb 2020 09:46:39 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xs4all.nl; s=s1; t=1582274799; bh=ra+c3Ufy0VWHCHsRdQ0qpxgmqP9MAJxEIIWCMzUQw1k=; h=From:To:Subject:Date:Message-Id:MIME-Version:From:Subject; b=kXHB7C4JJOnYFsFOZsw46a+TNFj/FVodNYP+wRsJGkd3jIawtPEzsPjyJ5vvfVhki Qr+QiSbwoOucoEDXrWWkvmECAS8nGJv0uoJBBegYpV10DfF2Vq2W7fN3VEndFW8LDi lJHqJu9vSm1IjiTk3WN6utmt2s0caSiwzS5sTwUPXptdLyuJ6aEqlGzLtdgcAvzu7w 7IGpZ/9Oby/iGAO+3y7REetOPAlJWrJigRjas3aqinqwsy0rjUR85rtEzuG50MioJb graw3wgTZ5bHfZhGu25Rwwu2qx80bw3kgB7t6lOx1o/R3YzzfGy9Y4gCUX2dHhzMkp zq7q2I9XT1EiQ== From: Hans Verkuil To: linux-media@vger.kernel.org Cc: Hans Verkuil Subject: [RFC PATCH 5/9] sh_veu: drop VB2_USERPTR Date: Fri, 21 Feb 2020 09:45:27 +0100 Message-Id: <20200221084531.576156-6-hverkuil-cisco@xs4all.nl> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200221084531.576156-1-hverkuil-cisco@xs4all.nl> References: <20200221084531.576156-1-hverkuil-cisco@xs4all.nl> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfGQ+Mz8+eZr5l5sM+8r0tyCOWMT7xuPVNkC5DPZcqNik9UQFVALGO13aRtxJP1vlp0W18Sf2BT+113CCmru7kQedIHxgLQIl6z2pnfjqhJrsVEFPX6ji vJ+XY9ceKuByj8ko38YD3GZeP/kgusdXcR/vLXOCMXnWq7ImMaFq7OqC00JDEY99ap6HroSo334ca/CHjKv5GdhMnlB+XUdWqtvH5DtEzB9E6dNIJu7jk4vR Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The combination of VB2_USERPTR and dma-contig makes no sense for this device, drop it. Signed-off-by: Hans Verkuil --- drivers/media/platform/sh_veu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/sh_veu.c b/drivers/media/platform/sh_veu.c index b95a7e2ede55..fc5b31da6f83 100644 --- a/drivers/media/platform/sh_veu.c +++ b/drivers/media/platform/sh_veu.c @@ -924,7 +924,7 @@ static int sh_veu_queue_init(void *priv, struct vb2_queue *src_vq, memset(src_vq, 0, sizeof(*src_vq)); src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT; - src_vq->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR; + src_vq->io_modes = VB2_MMAP | VB2_DMABUF; src_vq->drv_priv = veu; src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer); src_vq->ops = &sh_veu_qops; @@ -939,7 +939,7 @@ static int sh_veu_queue_init(void *priv, struct vb2_queue *src_vq, memset(dst_vq, 0, sizeof(*dst_vq)); dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - dst_vq->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR; + dst_vq->io_modes = VB2_MMAP | VB2_DMABUF; dst_vq->drv_priv = veu; dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer); dst_vq->ops = &sh_veu_qops;