Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp1811888pxb; Fri, 22 Oct 2021 08:07:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyeiIgsHJQ7QeabQ6ZmwFfkmn/UwVUJf7jBavrXbgSWh164uWGRvdwkZ2IE+edW8TgzaMUv X-Received: by 2002:a05:600c:1c10:: with SMTP id j16mr30902746wms.12.1634915264912; Fri, 22 Oct 2021 08:07:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634915264; cv=none; d=google.com; s=arc-20160816; b=GJVLVYvm34wjmwKILb5CXMnfQP+lXiAiJToIZhPnTtvxIHX7qjAmsaI+6VP5sK/Qml 7UhXKQfzx+AYBsftVgHDel0CdChPp/gygtWW4BLCh1g25LufMSTgRzb67lsN4RGlitV3 qL+gaKEsh6tyUkoyAQlJ5ocuQnGXpniOg+TcCi6l82eBiI9Jxlbqc4XT+TjjOL5BJoAO FYckH7krbR4gD23dHLLk4DQil3tMETzXyzmnOqnBeIv3n3tQy/9w88jbf6skVwd8ldxJ wkvx9p4Zm5p7gseudud+v88Fz5qnMjRBaLqDmzSvXhVXfxM+GEoE4liqIcH9xv2I2Sre JizA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from; bh=5B+sxYkB7VlbIaS1M065dXbHpso+wYrW0S0zei6c8SE=; b=peKgZR5f97d9jPyDxcxDeRaAOB/K1lOoxaKSXtkJuvO4B9lFXsxSRCxcuGU+/cXrYq SNcJf9GDdJipf+ggNI6UjG25NUsnhtA3LhhmYtd91PFk1+G7Eq0C9tPeh2ldro1yRO2O Mf6UwJYDjaBhWP7lLa8wuVZOpDuYpZ/CPmbVUw+ucnZE1qH2gD1UC2ajX0yHCXt4RUBh ihKtgWJbNXcCs+lWLw0UUk99TGD8maCIj/7MT0fMF/UE7P74g9IBuLC8SAMZFwE9YoGz XxyayEc0RNTpNB4LnIdYdPvDk5ITEfiygIkeb87zLyZSswvUPEeK7NdH7n7NN57L3Yas F8bg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dz20si17065591edb.246.2021.10.22.08.07.21; Fri, 22 Oct 2021 08:07:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233371AbhJVPGr (ORCPT + 99 others); Fri, 22 Oct 2021 11:06:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233069AbhJVPGi (ORCPT ); Fri, 22 Oct 2021 11:06:38 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E4B83C061764; Fri, 22 Oct 2021 08:04:20 -0700 (PDT) Received: from guri.fritz.box (unknown [IPv6:2a02:810a:880:f54:50fa:5c7d:20f4:e8d3]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: dafna) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id 117821F4163C; Fri, 22 Oct 2021 16:04:19 +0100 (BST) From: Dafna Hirschfeld To: linux-media@vger.kernel.org Cc: Dafna Hirschfeld , kernel@collabora.com, acourbot@chromium.org, andrew-ct.chen@mediatek.com, courbot@chromium.org, dafna3@gmail.com, eizan@chromium.org, houlong.wei@mediatek.com, hsinyi@chromium.org, hverkuil@xs4all.nl, irui.wang@mediatek.com, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, maoguang.meng@mediatek.com, matthias.bgg@gmail.com, mchehab@kernel.org, minghsiu.tsai@mediatek.com, tfiga@chromium.org, tiffany.lin@mediatek.com Subject: [PATCH 2/3] media: mtk-vcodec: enc: use "stream_started" flag for "stop/start_streaming" Date: Fri, 22 Oct 2021 17:04:09 +0200 Message-Id: <20211022150410.29335-3-dafna.hirschfeld@collabora.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211022150410.29335-1-dafna.hirschfeld@collabora.com> References: <20211022150410.29335-1-dafna.hirschfeld@collabora.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently the mtk-vcodec encoder init the hardware upon "start_streaming" cb when both queues are streaming and turns off the hardware upon "stop_streaming" when both queues stop streaming. This is wrong since the same queue might be started and then stopped causing the driver to turn off the hardware without turning it on. This cause for example unbalanced calls to pm_runtime_* Fixes: 4e855a6efa547 ("[media] vcodec: mediatek: Add Mediatek V4L2 Video Encoder Driver") Signed-off-by: Dafna Hirschfeld --- drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 4 ++++ drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h index 9d36e3d27369..84c5289f872b 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h @@ -259,6 +259,9 @@ struct vdec_pic_info { * @decoded_frame_cnt: number of decoded frames * @lock: protect variables accessed by V4L2 threads and worker thread such as * mtk_video_dec_buf. + * @stream_started: this flag is turned on when both queues (cap and out) starts streaming + * and it is turned off once both queues stop streaming. It is used for a correct + * setup and set-down of the hardware when starting and stopping streaming. */ struct mtk_vcodec_ctx { enum mtk_instance_type type; @@ -301,6 +304,7 @@ struct mtk_vcodec_ctx { int decoded_frame_cnt; struct mutex lock; + bool stream_started; }; diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c index 87a5114bf680..fb3cf804c96a 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c @@ -890,6 +890,9 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count) goto err_start_stream; } + if (ctx->stream_started) + return 0; + /* Do the initialization when both start_streaming have been called */ if (V4L2_TYPE_IS_OUTPUT(q->type)) { if (!vb2_start_streaming_called(&ctx->m2m_ctx->cap_q_ctx.q)) @@ -928,6 +931,7 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count) ctx->state = MTK_STATE_HEADER; } + ctx->stream_started = true; return 0; err_set_param: @@ -1002,6 +1006,9 @@ static void vb2ops_venc_stop_streaming(struct vb2_queue *q) } } + if (!ctx->stream_started) + return; + if ((q->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE && vb2_is_streaming(&ctx->m2m_ctx->out_q_ctx.q)) || (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE && @@ -1023,6 +1030,7 @@ static void vb2ops_venc_stop_streaming(struct vb2_queue *q) mtk_v4l2_err("pm_runtime_put fail %d", ret); ctx->state = MTK_STATE_FREE; + ctx->stream_started = false; } static int vb2ops_venc_buf_out_validate(struct vb2_buffer *vb) -- 2.17.1