From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A1F01301F04; Sat, 28 Feb 2026 17:35:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300137; cv=none; b=MYy7G/Kql/BYuUvimK9Le1TTW2yyM6ic/s/mccnFGleBVgb19VLkoUK3DG1QklVKZMJm+9Tqh+YzB0QPh7TYPYT5msvHgH6yy67OHgGlSllI5O100J87J6CmBD3tYvaWrzIDQlTG1Y1T+ZC0qHdnHtst/patnZbx92GJjNvi0rg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300137; c=relaxed/simple; bh=hXFZmuqxr72Et5WWnpswSxvsRGJlQHJGxp3QLH3btng=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j/fSsvYJ9XXco+5RNQPMWUs4aPAvub8n6nTYt5cTn78vto6zM2oSlXNR8VcWaaZ6n2ctMHvjobpJ36XJWtw0fWX+oWAVOOEhsaKV1Yd5ht7P4M9X+eC2UHsDfLmnOAVtQTohjgUUTUpJIsucQNEsX+EWhAHenu2mpQYgbDsYaNc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZJe8cTrp; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZJe8cTrp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D0CAEC19424; Sat, 28 Feb 2026 17:35:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772300137; bh=hXFZmuqxr72Et5WWnpswSxvsRGJlQHJGxp3QLH3btng=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZJe8cTrpIMkZWWmpJriYT4v6UHOT5I3rbQdmmomfJw9CB7gwt2Id62JGkc8LMeuY9 lqAO+5ehnau60S88vSXRLJ3G6YgE2L0Qg/XCLelqQGahwx1/gmnBmqvmXnUuZ1BcSc MeK65BojeuOFCQegaMeI6fCNF/6cG6b+u5PU3pCUwkQQ96dVh/nQ6iIhe8LAevoBow fTDAU12rg363A2rLvMEPfmdvyXOltTWaqt8+9uzbWKI/AlAtHulZAABnFLCyUFehdW LiSFYiCTvQE7wfV6oAArjip0tM3ag4pFonxjGxhTFzRUo5wS85e+j7OEz7RQlhFrsN ok0ve/rlXhKgw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Brandon Brnich , Nicolas Dufresne , Hans Verkuil , Sasha Levin Subject: [PATCH 6.19 155/844] media: chips-media: wave5: Fix conditional in start_streaming Date: Sat, 28 Feb 2026 12:21:08 -0500 Message-ID: <20260228173244.1509663-156-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260228173244.1509663-1-sashal@kernel.org> References: <20260228173244.1509663-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Brandon Brnich [ Upstream commit b4e26c6fc1b3c225caf80d4a95c6f9fcbe959e17 ] When STREAMON(CAP) is called after STREAMON(OUT), the driver was failing to switch states from VPU_INST_STATE_OPEN to VPU_INST_STATE_INIT_SEQ and VPU_INST_STATE_PIC_RUN because the capture queue streaming boolean had not yet been set to true. This led to a hang in the encoder since the state was stuck in VPU_INST_STATE_OPEN. During the second call to start_streaming, the sequence initialization and frame buffer allocation should occur. Signed-off-by: Brandon Brnich Reviewed-by: Nicolas Dufresne Signed-off-by: Nicolas Dufresne Signed-off-by: Hans Verkuil Signed-off-by: Sasha Levin --- drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c b/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c index 94fb5d7c87021..a11f0f7c7d7b0 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c @@ -1367,7 +1367,8 @@ static int wave5_vpu_enc_start_streaming(struct vb2_queue *q, unsigned int count if (ret) goto return_buffers; } - if (inst->state == VPU_INST_STATE_OPEN && m2m_ctx->cap_q_ctx.q.streaming) { + if (inst->state == VPU_INST_STATE_OPEN && + (m2m_ctx->cap_q_ctx.q.streaming || q->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE)) { ret = initialize_sequence(inst); if (ret) { dev_warn(inst->dev->dev, "Sequence not found: %d\n", ret); -- 2.51.0