From patchwork Tue Dec 17 03:20:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 11296463 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5BC8D139A for ; Tue, 17 Dec 2019 03:21:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2F9AF24676 for ; Tue, 17 Dec 2019 03:21:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="JuuHTj7J" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727495AbfLQDVJ (ORCPT ); Mon, 16 Dec 2019 22:21:09 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:34101 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727490AbfLQDVI (ORCPT ); Mon, 16 Dec 2019 22:21:08 -0500 Received: by mail-pg1-f195.google.com with SMTP id r11so4863513pgf.1 for ; Mon, 16 Dec 2019 19:21:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ej/RcdrFG7I5h21qch/EfpaB8ZDY7oPr0PYcdyttmnc=; b=JuuHTj7JvaiZedUrJCfHiCf6RQkVD16TxV/PkyG4BS4uIEZkVWX0sGB6LA0Dx5PTju 41XOdwITYe577fjGfzFvpivruURkH7Z01wnrZ0FT4crH+pG6hUC+/o9L8jlNUN0uD4HI Z7B1fPuRMEDeKDYffEuzMs46hja0cIHqYneac= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ej/RcdrFG7I5h21qch/EfpaB8ZDY7oPr0PYcdyttmnc=; b=Jx68yV0ntCNTFaDrNQmtXMY7LDzaGLDJNqDOERaE7kQbijPmGOzz+r1b07mQRPnGs1 5kuMZL2MJy/il2y5JKx+3juXBKX6wC1l1DLvhJen6tkFmM3aq5MNqXnw+es3+nWAldUO JZ/85gCeTstbNlPNrdAF2SemBwxu0ka2NzJ/ABBxi3BB/C0y6MrKUgcy/tkArFv1XOYi LyNHhtZAAqhm2A7AAkTfbXPnE5ZmOgmBi+e/2cw6HV0JOTub7ZfkNkxurtv+zBOHQk9h +3HQ9tF//Bv6xb7YmnIGrPFIIL7lAutDQ0yEHXuvn48H2Rm3+nU6unh+EQDKUxO17sM8 dfIA== X-Gm-Message-State: APjAAAW10zXRQpkUiL4MYFY58/3hjjuDl33AbePia/7aqE1iMp+WbvVQ iMeaCGb78PstYnXpnzlSkLJi1PRCRRI= X-Google-Smtp-Source: APXvYqzg1hoSwFIM3BoSZfc7Iw2qROpqjjZt0tHFcE4/EsgoChomyU3ntCswNMphxXxycQdPzPUlQA== X-Received: by 2002:a65:5cc2:: with SMTP id b2mr4958161pgt.51.1576552867920; Mon, 16 Dec 2019 19:21:07 -0800 (PST) Received: from tigerii.tok.corp.google.com ([2401:fa00:8f:203:250d:e71d:5a0a:9afe]) by smtp.gmail.com with ESMTPSA id j3sm24387455pfi.8.2019.12.16.19.21.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2019 19:21:07 -0800 (PST) From: Sergey Senozhatsky To: Hans Verkuil , Tomasz Figa , Mauro Carvalho Chehab , Kyungmin Park , Marek Szyprowski Cc: Sakari Ailus , Laurent Pinchart , Pawel Osciak , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [RFC][PATCH 07/15] videobuf2: factor out planes prepare/finish functions Date: Tue, 17 Dec 2019 12:20:26 +0900 Message-Id: <20191217032034.54897-8-senozhatsky@chromium.org> X-Mailer: git-send-email 2.24.1.735.g03f4e72817-goog In-Reply-To: <20191217032034.54897-1-senozhatsky@chromium.org> References: <20191217032034.54897-1-senozhatsky@chromium.org> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Factor out the code, no functional changes. Signed-off-by: Sergey Senozhatsky --- .../media/common/videobuf2/videobuf2-core.c | 52 +++++++++++-------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c index d1012a24755d..492ed2577219 100644 --- a/drivers/media/common/videobuf2/videobuf2-core.c +++ b/drivers/media/common/videobuf2/videobuf2-core.c @@ -296,6 +296,32 @@ static void __vb2_buf_dmabuf_put(struct vb2_buffer *vb) __vb2_plane_dmabuf_put(vb, &vb->planes[plane]); } +/* + * __vb2_buf_mem_prepare() - call ->prepare() on buffer's private memory + * to sync caches + */ +static void __vb2_buf_mem_prepare(struct vb2_buffer *vb) +{ + unsigned int plane; + + for (plane = 0; plane < vb->num_planes; ++plane) + call_void_memop(vb, prepare, vb->planes[plane].mem_priv); + vb->synced = 1; +} + +/* + * __vb2_buf_mem_finish() - call ->finish on buffer's private memory + * to sync caches + */ +static void __vb2_buf_mem_finish(struct vb2_buffer *vb) +{ + unsigned int plane; + + for (plane = 0; plane < vb->num_planes; ++plane) + call_void_memop(vb, finish, vb->planes[plane].mem_priv); + vb->synced = 0; +} + /* * __setup_offsets() - setup unique offsets ("cookies") for every plane in * the buffer. @@ -948,7 +974,6 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state) { struct vb2_queue *q = vb->vb2_queue; unsigned long flags; - unsigned int plane; if (WARN_ON(vb->state != VB2_BUF_STATE_ACTIVE)) return; @@ -968,12 +993,8 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state) dprintk(4, "done processing on buffer %d, state: %d\n", vb->index, state); - if (state != VB2_BUF_STATE_QUEUED) { - /* sync buffers */ - for (plane = 0; plane < vb->num_planes; ++plane) - call_void_memop(vb, finish, vb->planes[plane].mem_priv); - vb->synced = 0; - } + if (state != VB2_BUF_STATE_QUEUED) + __vb2_buf_mem_finish(vb); spin_lock_irqsave(&q->done_lock, flags); if (state == VB2_BUF_STATE_QUEUED) { @@ -1298,7 +1319,6 @@ static int __buf_prepare(struct vb2_buffer *vb) { struct vb2_queue *q = vb->vb2_queue; enum vb2_buffer_state orig_state = vb->state; - unsigned int plane; int ret; if (q->error) { @@ -1342,11 +1362,7 @@ static int __buf_prepare(struct vb2_buffer *vb) return ret; } - /* sync buffers */ - for (plane = 0; plane < vb->num_planes; ++plane) - call_void_memop(vb, prepare, vb->planes[plane].mem_priv); - - vb->synced = 1; + __vb2_buf_mem_prepare(vb); vb->prepared = 1; vb->state = orig_state; @@ -1966,14 +1982,8 @@ static void __vb2_queue_cancel(struct vb2_queue *q) call_void_vb_qop(vb, buf_request_complete, vb); } - if (vb->synced) { - unsigned int plane; - - for (plane = 0; plane < vb->num_planes; ++plane) - call_void_memop(vb, finish, - vb->planes[plane].mem_priv); - vb->synced = 0; - } + if (vb->synced) + __vb2_buf_mem_finish(vb); if (vb->prepared) { call_void_vb_qop(vb, buf_finish, vb);