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 5606A30B50C 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=1766557683; cv=none; b=h1uW//u3/xKj05HUc+y7ILOB7TEjmleS31I67t2J5OgtvjBRgRR0GmR4F7IZforTMk9wRsnxw+YUGKNWBZO/bqchJs3/wsFg8T2/i5XGwkrNkI2NxBVDDdbMjMTsmpdJVofr1SuyQ1HLnNGe3fOsdlBN5tsNYgAN+Goufnm84IU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766557683; c=relaxed/simple; bh=M+GIoy2gxHtpG8kWRg8hudwnpGiElTFNCgid9xEAMgo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VOLj4iGIN6YJaezLiSFO00wo9syZTM8ESOsGLQbyvWfKou83WYWoGwJuYaAOnJoHr2Xxz+c+Gu2JHKIjqsGxJDuRaKLyOCYhDl6sL9Mihs5GrEXIPy9zB3P6pZl7YzU/D/sT4rQ0YS2aZHoOW0yfni8WiNs8e/ppMJnAZ2Hx8b4= 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 (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5BO337w4462173 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-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4b7w8ftaj8-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-f197.google.com with SMTP id d2e1a72fcca58-7bb2303fe94so6330779b3a.3 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=n4R96aaY2NI6T6nzNlql6Ck6gq2zOrQkE863Wp3VAQpmVmD+j99Y+zxhUeWmxUph7E 9bA/nfW0pDyVUTSitAJowkK3ZrVNHvV8f5F6R5tGJW1mh+mbGnW3Gcb7vxOZG1YQF1Nr zrF9lIjz+Ua92useJmF5EWBAtPWWbIlnHs7UDXACiPNBNoYUhsvoI/MjMs8ovfgiyCby Q2ZJ1CBS6XlTVVJE97W+qetgoZvKCm7VciolLmGV96SGXBaCUWWwKf4RNF3tyal4Fdkd V8Xjc8cRkYByagG0LT3ccMan9K0OojwkW5BXsG/0mxlwaQ+oVjrj6+T9cWBA6zWKqsHh uHvg== X-Forwarded-Encrypted: i=1; AJvYcCX0+k2SQqzdUrtG9cS79B0P4gqd5DnNNkuirxFwqVNQ9uhVlfU2/yZt5+5jpbAUgC5jaJ/eQ5ByvoM7fv2j@vger.kernel.org X-Gm-Message-State: AOJu0YxYrEU7XeDERi6ZgCvycSrz8Z6wtHSInsCHnZN2Vkt+viFwtjE9 hXUlzqKL75rofWG4Hvkz8h2fJvUZcOOQhTdSf9AQSODSMT1n3PCT271TipHgVcAwLWbijlEu99B DxNDCzXZA547IyO/BWMn4oG/q+zWT4UXkpEBMi078noOroTRHKxXKva8lf2gKwTf3fInS X-Gm-Gg: AY/fxX5q/VpknuaPe9+urwDUG45eXZdwjB0sznNANWq7vdGtjSxZe4imTOXXfZejiSP jniyIw/iHz6tmeW6Lr65rF/bBcrtaFdDQscJdO1+CgjG1OZ9tXRkg2aySSdvq1QpAFv/HDnxPFC Xn3D3CSJCs3beMlcrIYIOJGexOfqLOmk25zqCPLt6dKcGi9DNqrzrTBGeI6rDXZAapU3kXsrj7H 5F1aswaXUvyeVm3gnJJ8tr+vgEi9FiWXvtvxUoUcu647IajxuaLV8uxVnEP+pXa6ZCFZjOpylMU Z03AsjMWSYb0qACa3KT6KzB/JrKl2EaCC9jjGKoQHhFvHzo17Qi0kRetjuM+ZV6awEDs38GpQ6i gnegeRlBHTXvKF9lTsAlgHqq9uzQAHo5abBfos8W2l6lZucA= X-Received: by 2002:a05:6a00:a882:b0:7f7:26fe:c92f with SMTP id d2e1a72fcca58-7ff64cd5fcbmr14134910b3a.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-arm-msm@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: l6PUtwDaKseX4NNyM6pSBd_v2rOVN2de X-Proofpoint-ORIG-GUID: l6PUtwDaKseX4NNyM6pSBd_v2rOVN2de X-Authority-Analysis: v=2.4 cv=QutTHFyd c=1 sm=1 tr=0 ts=694b87f1 cx=c_pps a=rEQLjTOiSrHUhVqRoksmgQ==: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=2VI0MkxyNR6bbpdq8BZq:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMjI0MDA1MyBTYWx0ZWRfX/4n6N3gUeVJa WaLDiQVU66QHDanNpIqxyWT8YdclCXbXEULKB2UrcyA1WbRipNlTv/2ERyKQN/lHVLxhilZU7mg PCbpyoQ9VwLQa9TwNnenLTG2V9w9A/wfRZ2et15NimDIrs2mltGLCVLilfyZaYQuavp6nNUWpuG GXlc9bEj5UhLKnWT/Yw6j/3WMyzx+OxU+8U7kkb+ghHMKO1CmMLlmojNWxqD+cs16VBQ8wDj3A/ ByvcrwdR9sN8C0tYOPAndkN/YWQydGDd7j6wPNwE9F7ekdZVeG+AdKTqKmfc9OLNVcUIH3Apc6j 2yGEG7M5KVd6Gc3GJrWKSbxwTUsFw0kGdjxn3FAvlIMrWw7fc0h1vCw/Uc7Da2JomO9/QfmaWC0 Cjr/7cFlKglp+ItzDWQQlQowtoIM11FlMgsYu28GoNh2bomRUzM3+CBk3+245SA7CJpaWzmxHnI 1tfn7KAnClB9Au2pVmw== 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 suspectscore=0 phishscore=0 bulkscore=0 impostorscore=0 spamscore=0 malwarescore=0 clxscore=1015 lowpriorityscore=0 priorityscore=1501 adultscore=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