From mboxrd@z Thu Jan 1 00:00:00 1970 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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_GIT autolearn=unavailable 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 73A98C43603 for ; Wed, 4 Dec 2019 12:58:47 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 37E8120674 for ; Wed, 4 Dec 2019 12:58:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="s7nF9F72"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="rdUNfcQI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 37E8120674 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Y6M2ECSZmnCxKrUSs3XMJK8lo2MkbX69+xztq1qKAWk=; b=s7nF9F7225c5tG BE54gHkOCX6UTZNx1i+c7rbFfK3aUXgn9PWuF7zTEBteiH/2YAcDDYwq+KzDLLMjicMOCo0V53x6u IEiFAq9nzDdR+voy51/CB4MAYhzXauDVcrKNdWk8Y3bMarRVLwkNg1BBrxk+yJGoIoiy3djSnrFQO Dz+SdhJTbkdRLIwg3JiIwB5nBX1HlfeIMa1VHbV4gOW6fjkXirrOwJatL18DjQN2usPHdYYWYsEGw BU0aB2bCjW53lHYkim2oDpys1Gee3yRXFnckondpW8I50UHJaxC0vDa3iWVcJ6E/RUtxVGqHlojUG OQT7So97Mx57Svw/JM7w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1icUEv-0002WR-Sd; Wed, 04 Dec 2019 12:58:45 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1icUDz-0001lE-5h; Wed, 04 Dec 2019 12:57:50 +0000 X-UUID: 1c7a6ef0367f417798e3758d4cf8d2fb-20191204 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=AJ6EJ09qaARojHJVEQN6B8vyTmhEAX2xvL+vGW8QBaU=; b=rdUNfcQIvYCeI2NBJoGMPH8MeXwADc7TbsJv5o0UfBbDLYwboAHoEv62c3WRETa7Qn4vWwlIp2x3lQrdq9fCj9dkBHPAKZsvcIHPPwJkP1CqpRPTz2bfNJk9zHeZ1nCveoC4ARQUqiIiPbXh+88wz1qnok6hFSTae7wIi72Gmew=; X-UUID: 1c7a6ef0367f417798e3758d4cf8d2fb-20191204 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 110816230; Wed, 04 Dec 2019 04:57:44 -0800 Received: from mtkmbs05n2.mediatek.inc (172.21.101.140) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 4 Dec 2019 04:48:33 -0800 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs05n2.mediatek.inc (172.21.101.140) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 4 Dec 2019 20:47:25 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Wed, 4 Dec 2019 20:46:45 +0800 From: Jerry-ch Chen To: , , , , Subject: [RFC PATCH V4 1/4] media: v4l2-mem2mem: add v4l2_m2m_suspend, v4l2_m2m_resume Date: Wed, 4 Dec 2019 20:47:29 +0800 Message-ID: <20191204124732.10932-2-Jerry-Ch.chen@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20191204124732.10932-1-Jerry-Ch.chen@mediatek.com> References: <20191204124732.10932-1-Jerry-Ch.chen@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191204_045747_254273_D7272997 X-CRM114-Status: GOOD ( 12.76 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Sean.Cheng@mediatek.com, Rynn.Wu@mediatek.com, pihsun@chromium.org, srv_heupstream@mediatek.com, Jerry-ch.Chen@mediatek.com, jungo.lin@mediatek.com, sj.huang@mediatek.com, yuzhao@chromium.org, linux-mediatek@lists.infradead.org, zwisler@chromium.org, Jerry-ch Chen , christie.yu@mediatek.com, frederic.chen@mediatek.com, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org From: Pi-Hsun Shih Add two functions that can be used to stop new jobs from being queued / continue running queued job. This can be used while a driver using m2m helper is going to suspend / wake up from resume, and can ensure that there's no job running in suspend process. BUG=b:143046833 TEST=build Signed-off-by: Pi-Hsun Shih Signed-off-by: Jerry-ch Chen --- drivers/media/v4l2-core/v4l2-mem2mem.c | 40 ++++++++++++++++++++++++++ include/media/v4l2-mem2mem.h | 22 ++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c index 5bbdec55b7d7..76ba203e0035 100644 --- a/drivers/media/v4l2-core/v4l2-mem2mem.c +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c @@ -47,6 +47,10 @@ module_param(debug, bool, 0644); #define TRANS_ABORT (1 << 2) +/* The job queue is not running new jobs */ +#define QUEUE_PAUSED (1 << 0) + + /* Offset base for buffers on the destination queue - used to distinguish * between source and destination buffers when mmapping - they receive the same * offsets but for different queues */ @@ -88,6 +92,7 @@ static const char * const m2m_entity_name[] = { * @job_queue: instances queued to run * @job_spinlock: protects job_queue * @job_work: worker to run queued jobs. + * @job_queue_flags: flags of the queue status, %QUEUE_PAUSED. * @m2m_ops: driver callbacks */ struct v4l2_m2m_dev { @@ -105,6 +110,7 @@ struct v4l2_m2m_dev { struct list_head job_queue; spinlock_t job_spinlock; struct work_struct job_work; + unsigned long job_queue_flags; const struct v4l2_m2m_ops *m2m_ops; }; @@ -267,6 +273,12 @@ static void v4l2_m2m_try_run(struct v4l2_m2m_dev *m2m_dev) return; } + if (m2m_dev->job_queue_flags & QUEUE_PAUSED) { + spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags); + dprintk("Running new jobs is paused\n"); + return; + } + m2m_dev->curr_ctx = list_first_entry(&m2m_dev->job_queue, struct v4l2_m2m_ctx, queue); m2m_dev->curr_ctx->job_flags |= TRANS_RUNNING; @@ -447,6 +459,34 @@ void v4l2_m2m_job_finish(struct v4l2_m2m_dev *m2m_dev, } EXPORT_SYMBOL(v4l2_m2m_job_finish); +void v4l2_m2m_suspend(struct v4l2_m2m_dev *m2m_dev) +{ + unsigned long flags; + struct v4l2_m2m_ctx *curr_ctx; + + spin_lock_irqsave(&m2m_dev->job_spinlock, flags); + m2m_dev->job_queue_flags |= QUEUE_PAUSED; + curr_ctx = m2m_dev->curr_ctx; + spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags); + + if (curr_ctx) + wait_event(curr_ctx->finished, + !(curr_ctx->job_flags & TRANS_RUNNING)); +} +EXPORT_SYMBOL(v4l2_m2m_suspend); + +void v4l2_m2m_resume(struct v4l2_m2m_dev *m2m_dev) +{ + unsigned long flags; + + spin_lock_irqsave(&m2m_dev->job_spinlock, flags); + m2m_dev->job_queue_flags &= ~QUEUE_PAUSED; + spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags); + + v4l2_m2m_try_run(m2m_dev); +} +EXPORT_SYMBOL(v4l2_m2m_resume); + int v4l2_m2m_reqbufs(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, struct v4l2_requestbuffers *reqbufs) { diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h index 5467264771ec..119a195da390 100644 --- a/include/media/v4l2-mem2mem.h +++ b/include/media/v4l2-mem2mem.h @@ -183,6 +183,28 @@ v4l2_m2m_buf_done(struct vb2_v4l2_buffer *buf, enum vb2_buffer_state state) vb2_buffer_done(&buf->vb2_buf, state); } +/** + * v4l2_m2m_suspend() - stop new jobs from being run and wait for current job + * to finish + * + * @m2m_dev: opaque pointer to the internal data to handle M2M context + * + * Called by a driver in the suspend hook. Stop new jobs from being run, and + * wait for current running job to finish. + */ +void v4l2_m2m_suspend(struct v4l2_m2m_dev *m2m_dev); + +/** + * v4l2_m2m_resume() - resume job running and try to run a queued job + * + * @m2m_dev: opaque pointer to the internal data to handle M2M context + * + * Called by a driver in the resume hook. This reverts the operation of + * v4l2_m2m_suspend() and allows job to be run. Also try to run a queued job if + * there is any. + */ +void v4l2_m2m_resume(struct v4l2_m2m_dev *m2m_dev); + /** * v4l2_m2m_reqbufs() - multi-queue-aware REQBUFS multiplexer * -- 2.18.0 _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek From mboxrd@z Thu Jan 1 00:00:00 1970 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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,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 F2A45C43603 for ; Wed, 4 Dec 2019 12:58:22 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C2C5E20674 for ; Wed, 4 Dec 2019 12:58:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="TqJdZdx9"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="rdUNfcQI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C2C5E20674 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=p7XS+ufBgeXUZtea8brCde+ugk9XeGw+Syd9KDmiPls=; b=TqJdZdx9G/sHQt Jpy0plJwdR9iAL/5cGD+b9ZSB6b6XlbFgJLP23IakKVeDsZ64f8oB1xJFJ4aVEG+f/frcC7YGWe44 1tOtI+TC91tb16NF83XHHRU9aW0GXwlEW848lrOfxAgZdzu8CYZ9Veq2Sq32OK3SuA2UwXy6cnWvv pC6yDVq42mjQddBPm7PCZbNQTwOjaAJhpAUJC3EPJdJjMHEw0Ir1fnoARgMfjXbORLxVLatcVwLeH dc26pcCdlucK5hGL3pLfa45O0U4LZwGNPvOoopSs4ojMMK5kyKUXM0GhclKjQU42+PnFfsFDpKBtR MsYjLa6AGDsaaGwHl+Ew==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1icUEX-0002DF-Ud; Wed, 04 Dec 2019 12:58:22 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1icUDz-0001lE-5h; Wed, 04 Dec 2019 12:57:50 +0000 X-UUID: 1c7a6ef0367f417798e3758d4cf8d2fb-20191204 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=AJ6EJ09qaARojHJVEQN6B8vyTmhEAX2xvL+vGW8QBaU=; b=rdUNfcQIvYCeI2NBJoGMPH8MeXwADc7TbsJv5o0UfBbDLYwboAHoEv62c3WRETa7Qn4vWwlIp2x3lQrdq9fCj9dkBHPAKZsvcIHPPwJkP1CqpRPTz2bfNJk9zHeZ1nCveoC4ARQUqiIiPbXh+88wz1qnok6hFSTae7wIi72Gmew=; X-UUID: 1c7a6ef0367f417798e3758d4cf8d2fb-20191204 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 110816230; Wed, 04 Dec 2019 04:57:44 -0800 Received: from mtkmbs05n2.mediatek.inc (172.21.101.140) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 4 Dec 2019 04:48:33 -0800 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs05n2.mediatek.inc (172.21.101.140) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 4 Dec 2019 20:47:25 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Wed, 4 Dec 2019 20:46:45 +0800 From: Jerry-ch Chen To: , , , , Subject: [RFC PATCH V4 1/4] media: v4l2-mem2mem: add v4l2_m2m_suspend, v4l2_m2m_resume Date: Wed, 4 Dec 2019 20:47:29 +0800 Message-ID: <20191204124732.10932-2-Jerry-Ch.chen@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20191204124732.10932-1-Jerry-Ch.chen@mediatek.com> References: <20191204124732.10932-1-Jerry-Ch.chen@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191204_045747_254273_D7272997 X-CRM114-Status: GOOD ( 12.76 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Sean.Cheng@mediatek.com, Rynn.Wu@mediatek.com, pihsun@chromium.org, srv_heupstream@mediatek.com, Jerry-ch.Chen@mediatek.com, jungo.lin@mediatek.com, sj.huang@mediatek.com, yuzhao@chromium.org, linux-mediatek@lists.infradead.org, zwisler@chromium.org, Jerry-ch Chen , christie.yu@mediatek.com, frederic.chen@mediatek.com, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Pi-Hsun Shih Add two functions that can be used to stop new jobs from being queued / continue running queued job. This can be used while a driver using m2m helper is going to suspend / wake up from resume, and can ensure that there's no job running in suspend process. BUG=b:143046833 TEST=build Signed-off-by: Pi-Hsun Shih Signed-off-by: Jerry-ch Chen --- drivers/media/v4l2-core/v4l2-mem2mem.c | 40 ++++++++++++++++++++++++++ include/media/v4l2-mem2mem.h | 22 ++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c index 5bbdec55b7d7..76ba203e0035 100644 --- a/drivers/media/v4l2-core/v4l2-mem2mem.c +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c @@ -47,6 +47,10 @@ module_param(debug, bool, 0644); #define TRANS_ABORT (1 << 2) +/* The job queue is not running new jobs */ +#define QUEUE_PAUSED (1 << 0) + + /* Offset base for buffers on the destination queue - used to distinguish * between source and destination buffers when mmapping - they receive the same * offsets but for different queues */ @@ -88,6 +92,7 @@ static const char * const m2m_entity_name[] = { * @job_queue: instances queued to run * @job_spinlock: protects job_queue * @job_work: worker to run queued jobs. + * @job_queue_flags: flags of the queue status, %QUEUE_PAUSED. * @m2m_ops: driver callbacks */ struct v4l2_m2m_dev { @@ -105,6 +110,7 @@ struct v4l2_m2m_dev { struct list_head job_queue; spinlock_t job_spinlock; struct work_struct job_work; + unsigned long job_queue_flags; const struct v4l2_m2m_ops *m2m_ops; }; @@ -267,6 +273,12 @@ static void v4l2_m2m_try_run(struct v4l2_m2m_dev *m2m_dev) return; } + if (m2m_dev->job_queue_flags & QUEUE_PAUSED) { + spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags); + dprintk("Running new jobs is paused\n"); + return; + } + m2m_dev->curr_ctx = list_first_entry(&m2m_dev->job_queue, struct v4l2_m2m_ctx, queue); m2m_dev->curr_ctx->job_flags |= TRANS_RUNNING; @@ -447,6 +459,34 @@ void v4l2_m2m_job_finish(struct v4l2_m2m_dev *m2m_dev, } EXPORT_SYMBOL(v4l2_m2m_job_finish); +void v4l2_m2m_suspend(struct v4l2_m2m_dev *m2m_dev) +{ + unsigned long flags; + struct v4l2_m2m_ctx *curr_ctx; + + spin_lock_irqsave(&m2m_dev->job_spinlock, flags); + m2m_dev->job_queue_flags |= QUEUE_PAUSED; + curr_ctx = m2m_dev->curr_ctx; + spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags); + + if (curr_ctx) + wait_event(curr_ctx->finished, + !(curr_ctx->job_flags & TRANS_RUNNING)); +} +EXPORT_SYMBOL(v4l2_m2m_suspend); + +void v4l2_m2m_resume(struct v4l2_m2m_dev *m2m_dev) +{ + unsigned long flags; + + spin_lock_irqsave(&m2m_dev->job_spinlock, flags); + m2m_dev->job_queue_flags &= ~QUEUE_PAUSED; + spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags); + + v4l2_m2m_try_run(m2m_dev); +} +EXPORT_SYMBOL(v4l2_m2m_resume); + int v4l2_m2m_reqbufs(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, struct v4l2_requestbuffers *reqbufs) { diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h index 5467264771ec..119a195da390 100644 --- a/include/media/v4l2-mem2mem.h +++ b/include/media/v4l2-mem2mem.h @@ -183,6 +183,28 @@ v4l2_m2m_buf_done(struct vb2_v4l2_buffer *buf, enum vb2_buffer_state state) vb2_buffer_done(&buf->vb2_buf, state); } +/** + * v4l2_m2m_suspend() - stop new jobs from being run and wait for current job + * to finish + * + * @m2m_dev: opaque pointer to the internal data to handle M2M context + * + * Called by a driver in the suspend hook. Stop new jobs from being run, and + * wait for current running job to finish. + */ +void v4l2_m2m_suspend(struct v4l2_m2m_dev *m2m_dev); + +/** + * v4l2_m2m_resume() - resume job running and try to run a queued job + * + * @m2m_dev: opaque pointer to the internal data to handle M2M context + * + * Called by a driver in the resume hook. This reverts the operation of + * v4l2_m2m_suspend() and allows job to be run. Also try to run a queued job if + * there is any. + */ +void v4l2_m2m_resume(struct v4l2_m2m_dev *m2m_dev); + /** * v4l2_m2m_reqbufs() - multi-queue-aware REQBUFS multiplexer * -- 2.18.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 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.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MIME_BASE64_TEXT,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, 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 38CB7C2BD09 for ; Wed, 4 Dec 2019 12:47:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 075162081B for ; Wed, 4 Dec 2019 12:47:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="rdUNfcQI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727872AbfLDMrs (ORCPT ); Wed, 4 Dec 2019 07:47:48 -0500 Received: from mailgw02.mediatek.com ([210.61.82.184]:60395 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726832AbfLDMrs (ORCPT ); Wed, 4 Dec 2019 07:47:48 -0500 X-UUID: c4ca31fc9e5a4bff89753803b7f98c39-20191204 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=AJ6EJ09qaARojHJVEQN6B8vyTmhEAX2xvL+vGW8QBaU=; b=rdUNfcQIvYCeI2NBJoGMPH8MeXwADc7TbsJv5o0UfBbDLYwboAHoEv62c3WRETa7Qn4vWwlIp2x3lQrdq9fCj9dkBHPAKZsvcIHPPwJkP1CqpRPTz2bfNJk9zHeZ1nCveoC4ARQUqiIiPbXh+88wz1qnok6hFSTae7wIi72Gmew=; X-UUID: c4ca31fc9e5a4bff89753803b7f98c39-20191204 Received: from mtkcas07.mediatek.inc [(172.21.101.84)] by mailgw02.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 1339013228; Wed, 04 Dec 2019 20:47:42 +0800 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs05n2.mediatek.inc (172.21.101.140) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 4 Dec 2019 20:47:25 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Wed, 4 Dec 2019 20:46:45 +0800 From: Jerry-ch Chen To: , , , , CC: , , , , , , , , , , , , , , , Jerry-ch Chen Subject: [RFC PATCH V4 1/4] media: v4l2-mem2mem: add v4l2_m2m_suspend, v4l2_m2m_resume Date: Wed, 4 Dec 2019 20:47:29 +0800 Message-ID: <20191204124732.10932-2-Jerry-Ch.chen@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20191204124732.10932-1-Jerry-Ch.chen@mediatek.com> References: <20191204124732.10932-1-Jerry-Ch.chen@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Content-Transfer-Encoding: base64 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org RnJvbTogUGktSHN1biBTaGloIDxwaWhzdW5AY2hyb21pdW0ub3JnPg0KDQpBZGQgdHdvIGZ1bmN0 aW9ucyB0aGF0IGNhbiBiZSB1c2VkIHRvIHN0b3AgbmV3IGpvYnMgZnJvbSBiZWluZyBxdWV1ZWQg Lw0KY29udGludWUgcnVubmluZyBxdWV1ZWQgam9iLiBUaGlzIGNhbiBiZSB1c2VkIHdoaWxlIGEg ZHJpdmVyIHVzaW5nIG0ybQ0KaGVscGVyIGlzIGdvaW5nIHRvIHN1c3BlbmQgLyB3YWtlIHVwIGZy b20gcmVzdW1lLCBhbmQgY2FuIGVuc3VyZSB0aGF0DQp0aGVyZSdzIG5vIGpvYiBydW5uaW5nIGlu IHN1c3BlbmQgcHJvY2Vzcy4NCg0KQlVHPWI6MTQzMDQ2ODMzDQpURVNUPWJ1aWxkDQoNClNpZ25l ZC1vZmYtYnk6IFBpLUhzdW4gU2hpaCA8cGloc3VuQGNocm9taXVtLm9yZz4NClNpZ25lZC1vZmYt Ynk6IEplcnJ5LWNoIENoZW4gPGplcnJ5LWNoLmNoZW5AbWVkaWF0ZWsuY29ycC1wYXJ0bmVyLmdv b2dsZS5jb20+DQotLS0NCiBkcml2ZXJzL21lZGlhL3Y0bDItY29yZS92NGwyLW1lbTJtZW0uYyB8 IDQwICsrKysrKysrKysrKysrKysrKysrKysrKysrDQogaW5jbHVkZS9tZWRpYS92NGwyLW1lbTJt ZW0uaCAgICAgICAgICAgfCAyMiArKysrKysrKysrKysrKw0KIDIgZmlsZXMgY2hhbmdlZCwgNjIg aW5zZXJ0aW9ucygrKQ0KDQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9tZWRpYS92NGwyLWNvcmUvdjRs Mi1tZW0ybWVtLmMgYi9kcml2ZXJzL21lZGlhL3Y0bDItY29yZS92NGwyLW1lbTJtZW0uYw0KaW5k ZXggNWJiZGVjNTViN2Q3Li43NmJhMjAzZTAwMzUgMTAwNjQ0DQotLS0gYS9kcml2ZXJzL21lZGlh L3Y0bDItY29yZS92NGwyLW1lbTJtZW0uYw0KKysrIGIvZHJpdmVycy9tZWRpYS92NGwyLWNvcmUv djRsMi1tZW0ybWVtLmMNCkBAIC00Nyw2ICs0NywxMCBAQCBtb2R1bGVfcGFyYW0oZGVidWcsIGJv b2wsIDA2NDQpOw0KICNkZWZpbmUgVFJBTlNfQUJPUlQJCSgxIDw8IDIpDQogDQogDQorLyogVGhl IGpvYiBxdWV1ZSBpcyBub3QgcnVubmluZyBuZXcgam9icyAqLw0KKyNkZWZpbmUgUVVFVUVfUEFV U0VECQkoMSA8PCAwKQ0KKw0KKw0KIC8qIE9mZnNldCBiYXNlIGZvciBidWZmZXJzIG9uIHRoZSBk ZXN0aW5hdGlvbiBxdWV1ZSAtIHVzZWQgdG8gZGlzdGluZ3Vpc2gNCiAgKiBiZXR3ZWVuIHNvdXJj ZSBhbmQgZGVzdGluYXRpb24gYnVmZmVycyB3aGVuIG1tYXBwaW5nIC0gdGhleSByZWNlaXZlIHRo ZSBzYW1lDQogICogb2Zmc2V0cyBidXQgZm9yIGRpZmZlcmVudCBxdWV1ZXMgKi8NCkBAIC04OCw2 ICs5Miw3IEBAIHN0YXRpYyBjb25zdCBjaGFyICogY29uc3QgbTJtX2VudGl0eV9uYW1lW10gPSB7 DQogICogQGpvYl9xdWV1ZToJCWluc3RhbmNlcyBxdWV1ZWQgdG8gcnVuDQogICogQGpvYl9zcGlu bG9jazoJcHJvdGVjdHMgam9iX3F1ZXVlDQogICogQGpvYl93b3JrOgkJd29ya2VyIHRvIHJ1biBx dWV1ZWQgam9icy4NCisgKiBAam9iX3F1ZXVlX2ZsYWdzOglmbGFncyBvZiB0aGUgcXVldWUgc3Rh dHVzLCAlUVVFVUVfUEFVU0VELg0KICAqIEBtMm1fb3BzOgkJZHJpdmVyIGNhbGxiYWNrcw0KICAq Lw0KIHN0cnVjdCB2NGwyX20ybV9kZXYgew0KQEAgLTEwNSw2ICsxMTAsNyBAQCBzdHJ1Y3QgdjRs Ml9tMm1fZGV2IHsNCiAJc3RydWN0IGxpc3RfaGVhZAlqb2JfcXVldWU7DQogCXNwaW5sb2NrX3QJ CWpvYl9zcGlubG9jazsNCiAJc3RydWN0IHdvcmtfc3RydWN0CWpvYl93b3JrOw0KKwl1bnNpZ25l ZCBsb25nCQlqb2JfcXVldWVfZmxhZ3M7DQogDQogCWNvbnN0IHN0cnVjdCB2NGwyX20ybV9vcHMg Km0ybV9vcHM7DQogfTsNCkBAIC0yNjcsNiArMjczLDEyIEBAIHN0YXRpYyB2b2lkIHY0bDJfbTJt X3RyeV9ydW4oc3RydWN0IHY0bDJfbTJtX2RldiAqbTJtX2RldikNCiAJCXJldHVybjsNCiAJfQ0K IA0KKwlpZiAobTJtX2Rldi0+am9iX3F1ZXVlX2ZsYWdzICYgUVVFVUVfUEFVU0VEKSB7DQorCQlz cGluX3VubG9ja19pcnFyZXN0b3JlKCZtMm1fZGV2LT5qb2Jfc3BpbmxvY2ssIGZsYWdzKTsNCisJ CWRwcmludGsoIlJ1bm5pbmcgbmV3IGpvYnMgaXMgcGF1c2VkXG4iKTsNCisJCXJldHVybjsNCisJ fQ0KKw0KIAltMm1fZGV2LT5jdXJyX2N0eCA9IGxpc3RfZmlyc3RfZW50cnkoJm0ybV9kZXYtPmpv Yl9xdWV1ZSwNCiAJCQkJICAgc3RydWN0IHY0bDJfbTJtX2N0eCwgcXVldWUpOw0KIAltMm1fZGV2 LT5jdXJyX2N0eC0+am9iX2ZsYWdzIHw9IFRSQU5TX1JVTk5JTkc7DQpAQCAtNDQ3LDYgKzQ1OSwz NCBAQCB2b2lkIHY0bDJfbTJtX2pvYl9maW5pc2goc3RydWN0IHY0bDJfbTJtX2RldiAqbTJtX2Rl diwNCiB9DQogRVhQT1JUX1NZTUJPTCh2NGwyX20ybV9qb2JfZmluaXNoKTsNCiANCit2b2lkIHY0 bDJfbTJtX3N1c3BlbmQoc3RydWN0IHY0bDJfbTJtX2RldiAqbTJtX2RldikNCit7DQorCXVuc2ln bmVkIGxvbmcgZmxhZ3M7DQorCXN0cnVjdCB2NGwyX20ybV9jdHggKmN1cnJfY3R4Ow0KKw0KKwlz cGluX2xvY2tfaXJxc2F2ZSgmbTJtX2Rldi0+am9iX3NwaW5sb2NrLCBmbGFncyk7DQorCW0ybV9k ZXYtPmpvYl9xdWV1ZV9mbGFncyB8PSBRVUVVRV9QQVVTRUQ7DQorCWN1cnJfY3R4ID0gbTJtX2Rl di0+Y3Vycl9jdHg7DQorCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJm0ybV9kZXYtPmpvYl9zcGlu bG9jaywgZmxhZ3MpOw0KKw0KKwlpZiAoY3Vycl9jdHgpDQorCQl3YWl0X2V2ZW50KGN1cnJfY3R4 LT5maW5pc2hlZCwNCisJCQkgICAhKGN1cnJfY3R4LT5qb2JfZmxhZ3MgJiBUUkFOU19SVU5OSU5H KSk7DQorfQ0KK0VYUE9SVF9TWU1CT0wodjRsMl9tMm1fc3VzcGVuZCk7DQorDQordm9pZCB2NGwy X20ybV9yZXN1bWUoc3RydWN0IHY0bDJfbTJtX2RldiAqbTJtX2RldikNCit7DQorCXVuc2lnbmVk IGxvbmcgZmxhZ3M7DQorDQorCXNwaW5fbG9ja19pcnFzYXZlKCZtMm1fZGV2LT5qb2Jfc3Bpbmxv Y2ssIGZsYWdzKTsNCisJbTJtX2Rldi0+am9iX3F1ZXVlX2ZsYWdzICY9IH5RVUVVRV9QQVVTRUQ7 DQorCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJm0ybV9kZXYtPmpvYl9zcGlubG9jaywgZmxhZ3Mp Ow0KKw0KKwl2NGwyX20ybV90cnlfcnVuKG0ybV9kZXYpOw0KK30NCitFWFBPUlRfU1lNQk9MKHY0 bDJfbTJtX3Jlc3VtZSk7DQorDQogaW50IHY0bDJfbTJtX3JlcWJ1ZnMoc3RydWN0IGZpbGUgKmZp bGUsIHN0cnVjdCB2NGwyX20ybV9jdHggKm0ybV9jdHgsDQogCQkgICAgIHN0cnVjdCB2NGwyX3Jl cXVlc3RidWZmZXJzICpyZXFidWZzKQ0KIHsNCmRpZmYgLS1naXQgYS9pbmNsdWRlL21lZGlhL3Y0 bDItbWVtMm1lbS5oIGIvaW5jbHVkZS9tZWRpYS92NGwyLW1lbTJtZW0uaA0KaW5kZXggNTQ2NzI2 NDc3MWVjLi4xMTlhMTk1ZGEzOTAgMTAwNjQ0DQotLS0gYS9pbmNsdWRlL21lZGlhL3Y0bDItbWVt Mm1lbS5oDQorKysgYi9pbmNsdWRlL21lZGlhL3Y0bDItbWVtMm1lbS5oDQpAQCAtMTgzLDYgKzE4 MywyOCBAQCB2NGwyX20ybV9idWZfZG9uZShzdHJ1Y3QgdmIyX3Y0bDJfYnVmZmVyICpidWYsIGVu dW0gdmIyX2J1ZmZlcl9zdGF0ZSBzdGF0ZSkNCiAJdmIyX2J1ZmZlcl9kb25lKCZidWYtPnZiMl9i dWYsIHN0YXRlKTsNCiB9DQogDQorLyoqDQorICogdjRsMl9tMm1fc3VzcGVuZCgpIC0gc3RvcCBu ZXcgam9icyBmcm9tIGJlaW5nIHJ1biBhbmQgd2FpdCBmb3IgY3VycmVudCBqb2INCisgKiB0byBm aW5pc2gNCisgKg0KKyAqIEBtMm1fZGV2OiBvcGFxdWUgcG9pbnRlciB0byB0aGUgaW50ZXJuYWwg ZGF0YSB0byBoYW5kbGUgTTJNIGNvbnRleHQNCisgKg0KKyAqIENhbGxlZCBieSBhIGRyaXZlciBp biB0aGUgc3VzcGVuZCBob29rLiBTdG9wIG5ldyBqb2JzIGZyb20gYmVpbmcgcnVuLCBhbmQNCisg KiB3YWl0IGZvciBjdXJyZW50IHJ1bm5pbmcgam9iIHRvIGZpbmlzaC4NCisgKi8NCit2b2lkIHY0 bDJfbTJtX3N1c3BlbmQoc3RydWN0IHY0bDJfbTJtX2RldiAqbTJtX2Rldik7DQorDQorLyoqDQor ICogdjRsMl9tMm1fcmVzdW1lKCkgLSByZXN1bWUgam9iIHJ1bm5pbmcgYW5kIHRyeSB0byBydW4g YSBxdWV1ZWQgam9iDQorICoNCisgKiBAbTJtX2Rldjogb3BhcXVlIHBvaW50ZXIgdG8gdGhlIGlu dGVybmFsIGRhdGEgdG8gaGFuZGxlIE0yTSBjb250ZXh0DQorICoNCisgKiBDYWxsZWQgYnkgYSBk cml2ZXIgaW4gdGhlIHJlc3VtZSBob29rLiBUaGlzIHJldmVydHMgdGhlIG9wZXJhdGlvbiBvZg0K KyAqIHY0bDJfbTJtX3N1c3BlbmQoKSBhbmQgYWxsb3dzIGpvYiB0byBiZSBydW4uIEFsc28gdHJ5 IHRvIHJ1biBhIHF1ZXVlZCBqb2IgaWYNCisgKiB0aGVyZSBpcyBhbnkuDQorICovDQordm9pZCB2 NGwyX20ybV9yZXN1bWUoc3RydWN0IHY0bDJfbTJtX2RldiAqbTJtX2Rldik7DQorDQogLyoqDQog ICogdjRsMl9tMm1fcmVxYnVmcygpIC0gbXVsdGktcXVldWUtYXdhcmUgUkVRQlVGUyBtdWx0aXBs ZXhlcg0KICAqDQotLSANCjIuMTguMA0K