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 783493FD8C7; Sat, 28 Feb 2026 17:43:18 +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=1772300598; cv=none; b=TDOabG9G0d8kc3IN+acvmQvzHsCQY2EAIHHgh9uxW5WuC9WWnEr5IetT5cQ0zxvTI/+/NgrYO/Ql8AUwgB/t/uOr5R9hDOxcy8FDDz83oc2bGPX+h4hw2E8EPe+vJtPDjq9WDQ2YHVSJnGiGwVWM3p7AL1yTLnMc1+xkPdOI2DA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300598; c=relaxed/simple; bh=n0PXaKyAqNUZPAHd67/QmjvwzkMs1oyIMBBXVPbsPcA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ixF3HyncCzvxSHFh4+FdE+9aYZ6s1KiHbRS7UShItg6XSDiMd0pCUjP745pL+ert/zz1ujVmKPdrP9PTxNRnUY0DGhAfF8LeAE0Yzg6GG2FmryVRhfkAqEK+Mdx19VvZCJ3OMzXgWDESHllXwksHq7j6NaTCUOSd9bjjVL96qUs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GJrlSx02; 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="GJrlSx02" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 96EB3C19424; Sat, 28 Feb 2026 17:43:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772300598; bh=n0PXaKyAqNUZPAHd67/QmjvwzkMs1oyIMBBXVPbsPcA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GJrlSx02tXOapJ43fFgpB5jfcl0VlgX108aMvHXtrqQGJxUMf7ezaM5M8YiDQVAWf 0xwKlskZ0FsfHfLzVYvuc0QOWN80BcLqWfovqZ+Oq6WFZT5oQ6CFKW1t7pYd4sgeoo v0ZXYni+8xKGi4o+LuWTy8R9qG95ytbMpUEnBiZ9PM/uUf7DSS+I+lFLOkx8HRa2a+ GB5+yUAYGkCysSSO/dO7VC/3eDsd8gBlfsLnf3hayy8ot5eKBZa7PowczFR7TJgiHA ZPevrAK1f0U2PaVbg7zsitWRTgFmW+I7K1ZyLWOT/q1Dm9hj4BjRoINZ7vgXUShvRS BYe/UCbvxstHA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dikshita Agarwal , Bryan O'Donoghue , Vikash Garodia , Hans Verkuil , Sasha Levin Subject: [PATCH 6.19 639/844] media: iris: Skip resolution set on first IPSC Date: Sat, 28 Feb 2026 12:29:12 -0500 Message-ID: <20260228173244.1509663-640-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: Dikshita Agarwal [ Upstream commit 811dbc546f47559dc9d2098c612acfd47e32479e ] The resolution property is not supposed to be set during reconfig. Existing iris_drc_pending(inst) check is insufficient, as it doesn't cover the first port setting change. Extend the conditional check to also skip resolution setting when the instance is in IRIS_INST_SUB_FIRST_IPSC. Fixes: caf205548769 ("media: iris: Avoid updating frame size to firmware during reconfig") Reviewed-by: Bryan O'Donoghue Signed-off-by: Dikshita Agarwal Reviewed-by: Vikash Garodia Cc: stable@vger.kernel.org Signed-off-by: Bryan O'Donoghue Signed-off-by: Hans Verkuil Signed-off-by: Sasha Levin --- drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c b/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c index b6261d186d215..1c107daca9e89 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c @@ -733,7 +733,7 @@ static int iris_hfi_gen1_set_resolution(struct iris_inst *inst, u32 plane) struct hfi_framesize fs; int ret; - if (!iris_drc_pending(inst)) { + if (!iris_drc_pending(inst) && !(inst->sub_state & IRIS_INST_SUB_FIRST_IPSC)) { fs.buffer_type = HFI_BUFFER_INPUT; fs.width = inst->fmt_src->fmt.pix_mp.width; fs.height = inst->fmt_src->fmt.pix_mp.height; -- 2.51.0