From patchwork Fri Nov 6 23:02:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helen Koike X-Patchwork-Id: 11888327 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 AB95314C0 for ; Fri, 6 Nov 2020 23:03:05 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 207A52078B for ; Fri, 6 Nov 2020 23:03:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="S3Eb3tpz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 207A52078B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References:List-Owner; bh=NjvmXQ7dAgzRzBwLLFZnBO2L3R+j7EdDSGqz9STfAgs=; b=S3Eb3tpzi3Akfqg9AwlNLjPtyl m3JsbjiX0BYAbR4aEtmvx5PlFPzQvDHqwBBd4mNrB61UXXeEOVC3yQy0wGb0GBYSQpCE+72CIpelL 69RgoT9Ji7+ye4LBwviMzY57ASQyG4qPU40kJTnMUUUyIcditxYCF9JSKEfpKUoJTdLk8vA4vOQqR ZMK8eQeTwi1kiKKJJY0hx9mCGyJ0X7xWvjFGdWSTQSXrKz9oNpX/HytpCdGnF8jYchGQi2dlEwBkd dxEz2L+jqETtng82ru1ugc2nHHZZPODV0hAdz7sAXjuytuIuvksTvuokYJZ4LIkMQqo76Pote6C7c mMGEAaxA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kbAkv-0004SJ-Sn; Fri, 06 Nov 2020 23:02:53 +0000 Received: from bhuna.collabora.co.uk ([2a00:1098:0:82:1000:25:2eeb:e3e3]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kbAkt-0004Ra-GT for linux-rockchip@lists.infradead.org; Fri, 06 Nov 2020 23:02:52 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: koike) with ESMTPSA id D1AD01F46BD1 From: Helen Koike To: linux-media@vger.kernel.org Subject: [PATCH] media: staging: rkisp1: cap: fix timeout when stopping the stream Date: Fri, 6 Nov 2020 20:02:36 -0300 Message-Id: <20201106230236.1884387-1-helen.koike@collabora.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201106_180251_695602_BBB778AE X-CRM114-Status: GOOD ( 12.22 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mchehab@kernel.org, dafna.hirschfeld@collabora.com, heiko@sntech.de, niklas.soderlund@ragnatech.se, linux-kernel@vger.kernel.org, tfiga@chromium.org, linux-rockchip@lists.infradead.org, laurent.pinchart@ideasonboard.com, hverkuil-cisco@xs4all.nl, kernel@collabora.com, zhengsq@rock-chips.com, ribalda@google.com Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org The dma engine should be stopped first. The driver waits for an interrupt to stop the stream in a known state after a frame. If rkisp1_cap_stream_disable() is called after stopping the rest of the pipeline, then most likely the interrupt won't arrive, we'll get a timeout and debugfs variables mp_stop_timeout or sp_stop_timeout will be incremented. Fixes: 37db540bb9d1f ("media: staging: rkisp1: cap: refactor enable/disable stream to allow multistreaming") Signed-off-by: Helen Koike --- drivers/staging/media/rkisp1/rkisp1-capture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/media/rkisp1/rkisp1-capture.c b/drivers/staging/media/rkisp1/rkisp1-capture.c index 6d2fd27970f28..b81235afd0534 100644 --- a/drivers/staging/media/rkisp1/rkisp1-capture.c +++ b/drivers/staging/media/rkisp1/rkisp1-capture.c @@ -895,6 +895,8 @@ static void rkisp1_pipeline_stream_disable(struct rkisp1_capture *cap) { struct rkisp1_device *rkisp1 = cap->rkisp1; + rkisp1_cap_stream_disable(cap); + /* * If the other capture is streaming, isp and sensor nodes shouldn't * be disabled, skip them. @@ -907,8 +909,6 @@ static void rkisp1_pipeline_stream_disable(struct rkisp1_capture *cap) v4l2_subdev_call(&rkisp1->resizer_devs[cap->id].sd, video, s_stream, false); - - rkisp1_cap_stream_disable(cap); } /*