From patchwork Tue Nov 18 11:23:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 5327811 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9C683C11AC for ; Tue, 18 Nov 2014 11:27:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C60BF200DB for ; Tue, 18 Nov 2014 11:27:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E7AC8200D0 for ; Tue, 18 Nov 2014 11:27:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753829AbaKRL11 (ORCPT ); Tue, 18 Nov 2014 06:27:27 -0500 Received: from mail-wg0-f54.google.com ([74.125.82.54]:46187 "EHLO mail-wg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754031AbaKRLYD (ORCPT ); Tue, 18 Nov 2014 06:24:03 -0500 Received: by mail-wg0-f54.google.com with SMTP id y10so5783007wgg.13 for ; Tue, 18 Nov 2014 03:24:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sJkeT53sZpGEgKujhMhWf4UU9H38bL+6G2GeT6gkxTY=; b=j2OL4YGGwd+T9Ac5ihk5OplfgvGwsYkCTlBJj27BRlK4fHhY9GfZ3vb5mhM/O+NtgZ Riy398f/NoQiSyBnHyVqEZPjxwoJUSpdy+T3T8KIF2c4v9DIItGtzp5myJ49Uec8idz+ KQPe4LAjgQzhHyDTvIMpSWT1LUZcsNWhMnhD9yBYOMfya4BZ/tCvUmwyfTzWkMqxhmjh W8WOW1z2ocQjqef98RQe/qF5/7dbzluQ+3uIO4T+fr4mJHeyggSuEB7hqO3paDhgPBqt nUNyBFv9KnNEq4B2/Io71tiWhRrZTkYrkuC31HGbT2c7ItLVy0PqwxoJ07iKyWSKm/qL JW9g== X-Received: by 10.180.108.167 with SMTP id hl7mr3555122wib.68.1416309842436; Tue, 18 Nov 2014 03:24:02 -0800 (PST) Received: from tango-charlie.RL.local ([194.72.83.162]) by mx.google.com with ESMTPSA id cu9sm55428904wjb.0.2014.11.18.03.24.01 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Nov 2014 03:24:01 -0800 (PST) From: "Lad, Prabhakar" To: Hans Verkuil , Mauro Carvalho Chehab , LMML Cc: LKML , "Lad, Prabhakar" , Kukjin Kim Subject: [PATCH 03/12] media: exynos-gsc: use vb2_ops_wait_prepare/finish helper Date: Tue, 18 Nov 2014 11:23:32 +0000 Message-Id: <1416309821-5426-4-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1416309821-5426-1-git-send-email-prabhakar.csengg@gmail.com> References: <1416309821-5426-1-git-send-email-prabhakar.csengg@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Lad, Prabhakar Cc: Kukjin Kim --- drivers/media/platform/exynos-gsc/gsc-core.h | 12 ------------ drivers/media/platform/exynos-gsc/gsc-m2m.c | 6 ++++-- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/drivers/media/platform/exynos-gsc/gsc-core.h b/drivers/media/platform/exynos-gsc/gsc-core.h index 0abdb17..fa572aa 100644 --- a/drivers/media/platform/exynos-gsc/gsc-core.h +++ b/drivers/media/platform/exynos-gsc/gsc-core.h @@ -466,18 +466,6 @@ static inline void gsc_hw_clear_irq(struct gsc_dev *dev, int irq) writel(cfg, dev->regs + GSC_IRQ); } -static inline void gsc_lock(struct vb2_queue *vq) -{ - struct gsc_ctx *ctx = vb2_get_drv_priv(vq); - mutex_lock(&ctx->gsc_dev->lock); -} - -static inline void gsc_unlock(struct vb2_queue *vq) -{ - struct gsc_ctx *ctx = vb2_get_drv_priv(vq); - mutex_unlock(&ctx->gsc_dev->lock); -} - static inline bool gsc_ctx_state_is_set(u32 mask, struct gsc_ctx *ctx) { unsigned long flags; diff --git a/drivers/media/platform/exynos-gsc/gsc-m2m.c b/drivers/media/platform/exynos-gsc/gsc-m2m.c index 74e1de6..d5cffef 100644 --- a/drivers/media/platform/exynos-gsc/gsc-m2m.c +++ b/drivers/media/platform/exynos-gsc/gsc-m2m.c @@ -267,8 +267,8 @@ static struct vb2_ops gsc_m2m_qops = { .queue_setup = gsc_m2m_queue_setup, .buf_prepare = gsc_m2m_buf_prepare, .buf_queue = gsc_m2m_buf_queue, - .wait_prepare = gsc_unlock, - .wait_finish = gsc_lock, + .wait_prepare = vb2_ops_wait_prepare, + .wait_finish = vb2_ops_wait_finish, .stop_streaming = gsc_m2m_stop_streaming, .start_streaming = gsc_m2m_start_streaming, }; @@ -590,6 +590,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, src_vq->mem_ops = &vb2_dma_contig_memops; src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer); src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY; + src_vq->lock = &ctx->gsc_dev->lock; ret = vb2_queue_init(src_vq); if (ret) @@ -603,6 +604,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, dst_vq->mem_ops = &vb2_dma_contig_memops; dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer); dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY; + dst_vq->lock = &ctx->gsc_dev->lock; return vb2_queue_init(dst_vq); }