From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (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 5613330FC03 for ; Wed, 24 Dec 2025 06:28:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766557684; cv=none; b=b3EAYxhUx1I/qHuj2r1zQ2/YEmvQcQ6yO8NLtHisXxvUNd+4TruoVP+LcrPrlOLwCMnRE9iCRG+pp3u6+LvhKmse953cF55TaNWFpm+PiEMNfcNA/XiLRJnQBtslUQearSReImzx34gTaBc4nLsyUOxb/uccRdv/Z8MCvSQi5Es= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766557684; c=relaxed/simple; bh=M+GIoy2gxHtpG8kWRg8hudwnpGiElTFNCgid9xEAMgo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=izqQ9SI8BaOiJKH1elGB6AiP56BKC3hN+T4NRtFwyvCeRTSrg7bPjAbBiOGOz1yUh76EAChT+kGx/zHUndYfVE05J5aIPGPuB9goUjouGCLKa2vLNsPZVg+Nh3rCVw1047ckAJCc4+ZobYSlyQJF2NU86nyEQy/sH6UNTvCoaC4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=ICiPB2DA; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=LBOj0ztr; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="ICiPB2DA"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="LBOj0ztr" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5BO17W2Y1597811 for ; Wed, 24 Dec 2025 06:28:01 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= dmGzRYHDeCe94sK8XcLR661ULH1uWhl3sDxeRfzlGhw=; b=ICiPB2DAWl0+fPhr e/EpGPOyxj58Mx4yW0PO03FdN7u5MInSDnJ0N6x6Ab+ksieFjB70T0V0EHMJo7Vz 32GKqXB6kWvJDiFZkSNstl9oyCuLlMu70yEBG/DX2xZP0BVGvtMXD3EI0LRwRRqb +enP2R41m1YOPrRq1iyEtOi8bxrZcGMdJskeMxpvXeXfrKA5EpKIcQDmqNDGGPwQ JcxoDtkYgI7AqqkfaeI8OuJ52f2N/Dkb33i2jPwUrf7fnHqBACJ4Y/ciFx9uFkia /TuUyz2VIFPCMjBM40ZPQ7HD3QhF0OrzJpaLb80BEDHTa8yB8P3920ctju6HKaWR LkU/Kw== Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4b8683gq07-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 24 Dec 2025 06:28:01 +0000 (GMT) Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-7c7957d978aso6806831b3a.1 for ; Tue, 23 Dec 2025 22:28:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1766557681; x=1767162481; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=dmGzRYHDeCe94sK8XcLR661ULH1uWhl3sDxeRfzlGhw=; b=LBOj0ztrrqA/panP9E7ZZZ95Rt6ufoPx1qx++ROTez1cme4CJ16/qJ2dGUvlcn7yYP yNBAlNEgZ+M5lmF/fJSxAlukBl7HPpHlFgOHTj7qt/gdbZWfUkCIb5gDF+4VFhmN7WG8 h2ogL7SlQSqweN+7bME5NqAtlSiALPe2x/DIhc4bk5JUdt9q26LHlOFFN8qJlJcDURK3 CRUMJ2rQ/BeOvSzaW0QwuzqllnYTysMC7gozGm0LUFtNuZ+mG2H/Z9EtRJvKQokQzEJQ CP4EqQYjn/fYpr3RO9wbHy1JCGFlT9cf+4i0KeaBAOBlLZIf3XtX1aBcnde0wEYXOQ3l OdEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766557681; x=1767162481; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=dmGzRYHDeCe94sK8XcLR661ULH1uWhl3sDxeRfzlGhw=; b=Z7xV+zCu9FUr0S6F6GMvjmqZ+G5DilRBhERL0nrUwp6moUgwUhlPBUYHOvLEqebRX/ SSjMli1cWwXZC36zQpoC1fR0cjCXC6+DlNri7+I3+yrmVFql+mvYtD/62rd9+/TDO5n3 tz/N7VL5SedkTJ8ShA14HoJiFsc1MRaC+YVbCm+JQW0owlanie6MtDmb9+l+T6ZZp5nT f3Or3exbiyByJRjRY2xe4sGY7M9lQHHEhVUg8RNL/6ozuWqVF2cJD2EbAcEc0jr9NKD6 7HsJ0LKjNrUpPbS2r0pjlHFrECQMtrX9m0pXXS3Xfpz1dSyItvqxh6W8zceDi3OJmw3S /d1A== X-Forwarded-Encrypted: i=1; AJvYcCVAORNwl0N1pDLkfStBwVVC/UWu2RBSLZ20XUoTKCTo9EyvWTfxIBngig8aTvkLZ5SXtztqKiX8tkxro+Y=@vger.kernel.org X-Gm-Message-State: AOJu0YxKbDHWDbM2rU3VmvOMq5AfnPy+iKpLzXWB9fwhNzoE0NCD8TE8 QldshT7xydGgryQWpOFESzcctz1EAq131GBprgKx+ngHRnM2+j5IBCE9siiueqp1uI42+gub5C/ H/eudZNu2sQYumodyXEXWXbJn0FtIMdFQ7MygNTybInMeFfEliGAxrIh7zUilXhawETg= X-Gm-Gg: AY/fxX4LVcFJ4Xo4d3WQxTuSEMxSh7m0zg5xhAZYrauYmTIkUi5TQCO1kCLUsEJBJTl Y4yoSlqPaTSr4nAm+4R0PH2Lf+rnu10xWHkhCT40wO0uV6n44n+91YH2WOvTQIebAK5Kizje1j9 zuj598/8v9yftwNQp1tE+h4xceDG9NENLMhHtKnJzu4GSOrB3cnzGcwcB4tSZhraB7m71MNcRiS Q1VMAvc/cNHevmhZan4q/p8Smeffx+ZgLLDy9yTsh4Df+tXLbZG8zNOAHiMG3oPZnW1QL9jCWXN awXC2M2HhueCP9/fc0LkabeEyropJ9K9RdbbkSq9NsIE92vMHTzOnjZJrah8W49iSU5V3/rw0Vh CSheFU3+9UoHWvgJd1BXmdjOdy0am19abxV1LkFHxNWTjP2A= X-Received: by 2002:a05:6a00:a882:b0:7f7:26fe:c92f with SMTP id d2e1a72fcca58-7ff64cd5fcbmr14134911b3a.29.1766557680986; Tue, 23 Dec 2025 22:28:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IEB13sITwFMzSekqucRZ1/QXtl9j1Db1CmzUObvaIsHVQrFZjz/0HNxVHV5k/BrretBQV1kIQ== X-Received: by 2002:a05:6a00:a882:b0:7f7:26fe:c92f with SMTP id d2e1a72fcca58-7ff64cd5fcbmr14134899b3a.29.1766557680530; Tue, 23 Dec 2025 22:28:00 -0800 (PST) Received: from hu-dikshita-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7ff7eb85f15sm15618908b3a.68.2025.12.23.22.27.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Dec 2025 22:28:00 -0800 (PST) From: Dikshita Agarwal Date: Wed, 24 Dec 2025 11:57:13 +0530 Subject: [PATCH 4/6] Revert "media: iris: Add sanity check for stop streaming" Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251224-iris-fixes-v1-4-5f79861700ec@oss.qualcomm.com> References: <20251224-iris-fixes-v1-0-5f79861700ec@oss.qualcomm.com> In-Reply-To: <20251224-iris-fixes-v1-0-5f79861700ec@oss.qualcomm.com> To: Vikash Garodia , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab , Hans Verkuil , Stefan Schmidt Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , Dikshita Agarwal X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1766557663; l=1712; i=dikshita.agarwal@oss.qualcomm.com; s=20240917; h=from:subject:message-id; bh=M+GIoy2gxHtpG8kWRg8hudwnpGiElTFNCgid9xEAMgo=; b=8c67QftGs92IAU6RcgkPwepVKMaii/B+MdWcHSCwE5j/30t29xsZ66bXN6RjJp8KH1Cdpaump XgK5lSWiG7VCl/KbHEQOzUl8CioeAQ46D41BU9luxdd8qnix3A+px6S X-Developer-Key: i=dikshita.agarwal@oss.qualcomm.com; a=ed25519; pk=EEvKY6Ar1OI5SWf44FJ1Ebo1KuQEVbbf5UNPO+UHVhM= X-Proofpoint-GUID: O2zpaZP0iAFDtxQbwpd9VYJkmwYJa0_v X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMjI0MDA1MyBTYWx0ZWRfXzFuJ7qcyFh5k osYAEMeBw369LyJpyzUPyi8rKWVxUyzv7hsl48ky7GHTlh0KHxVQtr3UAfwJ6obeY3w4cyKihC3 vrYExD/RyhIeF7QkKhDdSMh6MudzaNZNdsx699A0hCRhRl7HUXYYdShr4qBrK121BoeANMHnBht ICa0O6zVstTwP61XJE+nJh31l2zy/f3LdHARH62/h80+Czsp1z6LR+cs906QjOXhV8ozuN15fD5 zSaKrPZLg3R5zamevM53Jhn2ZilWKdf8TmAh7b34KPSjp7M5PBnBcfGtICfxSLJOLAZQy4tA+h/ pyUUc4F2O2pGV3xGsFmvnKex3T961m0Gyk2xnhQMJJeIEjxiVzw61Mkq3JLXRkk+ijTkABhFOhu 4yd8IC+/iJ9+swCiPGl9vVq3PBtCRgnkxxN2KSCtAI2BIopqsCHvtNT3emfARgk2q/ZZaxTr7K9 bFiUkGAF8ifYp5drgsA== X-Authority-Analysis: v=2.4 cv=HqV72kTS c=1 sm=1 tr=0 ts=694b87f1 cx=c_pps a=WW5sKcV1LcKqjgzy2JUPuA==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=wP3pNCr1ah4A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=miAyyWkRVIhBFoa6HtIA:9 a=QEXdDO2ut3YA:10 a=OpyuDcXvxspvyRM73sMx:22 X-Proofpoint-ORIG-GUID: O2zpaZP0iAFDtxQbwpd9VYJkmwYJa0_v X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-12-24_02,2025-12-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 phishscore=0 suspectscore=0 malwarescore=0 bulkscore=0 adultscore=0 lowpriorityscore=0 spamscore=0 clxscore=1015 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2512120000 definitions=main-2512240053 Revert the check that skipped stop_streaming when the instance was in IRIS_INST_ERROR, as it caused multiple regressions: 1. Buffers were not returned to vb2 when the instance was already in error state, triggering warnings in the vb2 core because buffer completion was skipped. 2. If a session failed early (e.g. unsupported configuration), the instance transitioned to IRIS_INST_ERROR. When userspace attempted to stop streaming for cleanup, stop_streaming was skipped due to the added check, preventing proper teardown and leaving the firmware in an inconsistent state. Signed-off-by: Dikshita Agarwal --- drivers/media/platform/qcom/iris/iris_vb2.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/media/platform/qcom/iris/iris_vb2.c b/drivers/media/platform/qcom/iris/iris_vb2.c index db8768d8a8f61c9ceb04e423d0a769d35114e20e..139b821f7952feb33b21a7045aef9e8a4782aa3c 100644 --- a/drivers/media/platform/qcom/iris/iris_vb2.c +++ b/drivers/media/platform/qcom/iris/iris_vb2.c @@ -231,8 +231,6 @@ void iris_vb2_stop_streaming(struct vb2_queue *q) return; mutex_lock(&inst->lock); - if (inst->state == IRIS_INST_ERROR) - goto exit; if (!V4L2_TYPE_IS_OUTPUT(q->type) && !V4L2_TYPE_IS_CAPTURE(q->type)) @@ -243,10 +241,10 @@ void iris_vb2_stop_streaming(struct vb2_queue *q) goto exit; exit: - if (ret) { - iris_helper_buffers_done(inst, q->type, VB2_BUF_STATE_ERROR); + iris_helper_buffers_done(inst, q->type, VB2_BUF_STATE_ERROR); + if (ret) iris_inst_change_state(inst, IRIS_INST_ERROR); - } + mutex_unlock(&inst->lock); } -- 2.34.1