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 653A42F25EF for ; Mon, 5 Jan 2026 09:52:06 +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=1767606728; cv=none; b=EmDWakBs35Tgu//2SSTOGzCSSvs6dXPgK21vXet3/UiJ5RFkCo1ZbUtUKtx+KkzwbxdqzGn7cO9Mm7mTjcjn6+BeQHaPv7aTgIMo/DHdCsM3BLKf4nAIFmmTXzOlB938wnqZXoP6xSGUpb36nbFbMKtVpuczjHFZV+4ccNe0dR4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767606728; c=relaxed/simple; bh=PY/vWrwkmC3rE8an8wbxBfu+JdIgIZc28Y/3rJMRg10=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=SXxBZs0wtoBJmrwfXyoqKNJueDtXMLDp83icLJOV0pepSmm+XzOJzzY+PY4WEqJcIGZbeb356twBW8XlZWMLJRIl/wxyJ901nLcAzFMhJjDIk7uH9pDJRxxoZ4C6XxAME6FKZ7jeBcjN+Y1PlQqvuY4hNO1IzK4L37ly9l8F3+w= 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=gGHdH/6O; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=K46E8ve4; 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="gGHdH/6O"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="K46E8ve4" 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 6058Khtc3562891 for ; Mon, 5 Jan 2026 09:52:05 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= ZFj/d3x1hw4BjQeGbLCpbgmb7YLWZWo6j8+s+Btri9M=; b=gGHdH/6O/7EfnN4H Dhh4cPXdMFa6tc3Kr/FiQ4NwvlUQ0DiLR7NhnUiE0DqPAqlQ+EQwGy8tu1THiVq0 0BI4VhenJZn8+rUEuY2SVtxMYsCwOCeWMF5w/v1W2H1pOrqmYbqKkRbd5qaSH904 gm4odX6aE2LSMerWByJjVLvAIF5GjtTbMWxpgDh1uEjAXakb3jweqm2py8xSw2CC D509SCJ3QmPec3eWVNBKs6UEovRFVveWEfTunVTChSq0bUtp+UjrnIDA+8nyrOcp ygqD0y1Hn5MC8zRD0dVUWgf207BxYbJk+XEKQ27lGjvTWysF1P9WTINaRniDlRwJ R3OGQw== Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4bet2qv829-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 05 Jan 2026 09:52:05 +0000 (GMT) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2a0dabc192eso324371395ad.0 for ; Mon, 05 Jan 2026 01:52:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1767606725; x=1768211525; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=ZFj/d3x1hw4BjQeGbLCpbgmb7YLWZWo6j8+s+Btri9M=; b=K46E8ve40AMnWBlbsyB8gKO5hEKUmPGwqRBJ1LQ5w175Gh237MxexsbsmgQOjznBmr +bon8odxBRCI/AHPMY9LVJ7QPDxKNDN4rjRbHMrpKoq23P4N6hQQp6EoyoPr3lXEdphb AmdLi3mrIqWupItIH5X3a3h3XiUjOW4b8++rSjnTI0rcG77rB2nsjvieaVYsB5UAYhu0 NI3YCGmTDNfxExU4fPiz2+3Nj7fT+tORoawyqga+XxCLxRv7ZWg/ASgbo9k/wjcfLVVF rrN98VGqrC0LoJtfK2oxGWYTwkxEETXOIre+GTtHwEiMq3lIZBwX6T2k65qbpek+yhgl lJig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767606725; x=1768211525; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ZFj/d3x1hw4BjQeGbLCpbgmb7YLWZWo6j8+s+Btri9M=; b=vn/kUyw0gRXw0Ng3l29+ntUjKx7nFTathfs4DQ0B0dPWIFROA5OllobRmIhGw8+7A8 hz385SpZsZmwqt78DDo6xNtTYzMFrjsBSWsVfrHakf/0TQhj5OJEZ0KV4ZAZIXg08NMu CosoxVGi49bBXLrKOK4zH/OH9P/UQQV4scTuADn2mJoaRh7okHPDJpZE9Q9aM5wvLZli zLoaVEn6pZ/fCFFnQf4KG1D8dRLSbi20nS00XoOTt+oP2xNHVAHismso4obkjdFSKPEq 7jhW9AXdXgqbbzI8y4M4VJtoitu/oy+ydJ+LDuNJtQi6fAR5Sunx5W2AexocmW1my/ne Hbyw== X-Forwarded-Encrypted: i=1; AJvYcCWHdmL6qic14eZvIOZaE/pJ1CDhMR4hJ5VkgEvW7Tkqfe9N0peks9VJJ/J+099tdgB7xmnzSWtMB10lhzQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwYpXVUvaFOVFUIx1OZrTEtuQ0JKhDcO5Va1D9rr8Itzf+T/Urp +BHvM6PQVQuM4iNerSpke/u8u91//DQC8/bZ86eQZPnyjMvfR0yzcWnacWqqLJkObiRDpOZCTBS /eee7YwdKj28XDBx9QFh9jdVfWtYIhM6prRJQaVPH0Khchf47QSdsUI7T3KDxCrXT5U8= X-Gm-Gg: AY/fxX6caBB3sPs7wfJAosXGbJK7b+7iDvpGvFUwdRRM95hFCvR2/SaGFIS3PHbhpJP 096wPSUBiQD5IGgxo9l6ZqL+cl/QEcLCv5eXY84M8tu3pqxFCke/G/Rjv5IsKoRobqdqmglw3ZE KeBPq4EOKw0TIhp6C035Czp0KoGh33yJyu7q2bAM8LIPaLrd3L2DWnwM6L645oSziXeIBdiNdhx xnmWlAkk3AB/d39KdczTW96y05l3LM+hfnXhNdiNzwdjaQ3td/QrL43x2Z2PB+m9RbKfpZIXPwn 1+cc54m5VNXH17QXy4PTgM2wc6iSBJo8Mq/2hKXsiMd0+eVPSASj1cU6fQht+ysf0IU5CYC2Y5l FElCgUV9p0+jeG4ODizy+iK3aWmB9WQPHFCV2CcLoNAQH X-Received: by 2002:a17:902:d584:b0:29e:9c82:a91e with SMTP id d9443c01a7336-2a2f21fc506mr527919355ad.7.1767606724659; Mon, 05 Jan 2026 01:52:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IHQjZNT26R3hug1VetovPBZshR48geoV8oj08OmGFIuvl1nrIlFHq0cRbx3/mJ/zcumVZnUAA== X-Received: by 2002:a17:902:d584:b0:29e:9c82:a91e with SMTP id d9443c01a7336-2a2f21fc506mr527919105ad.7.1767606724130; Mon, 05 Jan 2026 01:52:04 -0800 (PST) Received: from [10.206.109.90] ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a2f3c8286esm448829815ad.33.2026.01.05.01.52.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 05 Jan 2026 01:52:03 -0800 (PST) Message-ID: Date: Mon, 5 Jan 2026 15:21:58 +0530 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH v2 4/6] Revert "media: iris: Add sanity check for stop streaming" To: Bryan O'Donoghue , Vikash Garodia , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab , Hans Verkuil , Stefan Schmidt , Hans Verkuil , Wangao Wang Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org References: <20251229-iris-fixes-v2-0-6dce2063d782@oss.qualcomm.com> <20251229-iris-fixes-v2-4-6dce2063d782@oss.qualcomm.com> <859778df-4f46-4a32-93ff-dcdae7dacb0f@linaro.org> Content-Language: en-US From: Dikshita Agarwal In-Reply-To: <859778df-4f46-4a32-93ff-dcdae7dacb0f@linaro.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Proofpoint-GUID: jo8OTDbdXVFlyD8dFvUVyb5QHQS6-z_5 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTA1MDA4NyBTYWx0ZWRfX5beKsqEEZ6Og uN85IH5L73zzv41bQq9ekDuXqcYwfx+Ixn5/BJkokzssr1VnJyWSSaC/PL7fa+xIkairWCqNzl5 cugb7bv5E3Au+fZ+tS0XBMbptxy8oLlnzA2H2Z4yEnRkwlmvQwZEYi75pToMgWpio/5VS1F6ndB 26cORNf9cBhfaJFMAJmyPvzK8zqF0zluqVbrbQ/fpy1VyWp7M9Z9LvY59dEs+GphCJxalwxtDy0 Lkaj7HfnJkgV7vZzFHw5nOH2/amTshdy+q8XN9o7m5dZXuUVKCjSCWXGmCyO3NYEKf91VG+afFu EJJ+5yM0DvOKz5iDVF4ejVUPpCQdNkrwinUfYOS+wfxVph5/J7eE2JguN0EKGGFMzoQoJfjA0+q /YKNh4DlF1ZyWX8093mcqn6H2PIJy6VjPnMNoNqfgi5gPNsvTuX4oOMdBm4o+8liKCp30PLoe8D 9+fpbUyOcy59iTS5dgg== X-Authority-Analysis: v=2.4 cv=RKK+3oi+ c=1 sm=1 tr=0 ts=695b89c5 cx=c_pps a=JL+w9abYAAE89/QcEU+0QA==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=vUbySO9Y5rIA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=VwQbUJbxAAAA:8 a=qBENiv7BgfysxtCeYdIA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=324X-CrmTo6CU4MGRt3R:22 X-Proofpoint-ORIG-GUID: jo8OTDbdXVFlyD8dFvUVyb5QHQS6-z_5 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=2026-01-05_01,2025-12-31_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 priorityscore=1501 suspectscore=0 bulkscore=0 adultscore=0 clxscore=1015 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2512120000 definitions=main-2601050087 On 12/30/2025 3:55 PM, Bryan O'Donoghue wrote: > On 29/12/2025 06:31, Dikshita Agarwal wrote: >> 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. >> >> Fixes: ad699fa78b59 ("media: iris: Add sanity check for stop streaming") >> 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); >>   } >>   > > This revert looks strange, should be something like: > > commit 9b6b11d31918722b4522b8982141d7b9646c0e48 (HEAD -> next-6.19-camss-v2) > Author: Bryan O'Donoghue > Date:   Tue Dec 30 10:20:01 2025 +0000 > >     Revert "media: iris: Add sanity check for stop streaming" > >     This reverts commit ad699fa78b59241c9d71a8cafb51525f3dab04d4. > >     Everything is broken I give up. > >     Signed-off-by: Bryan O'Donoghue > > diff --git a/drivers/media/platform/qcom/iris/iris_vb2.c > b/drivers/media/platform/qcom/iris/iris_vb2.c > index db8768d8a8f61..139b821f7952f 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); >  } > > Just `git revert ad699fa78b59241c9d71a8cafb51525f3dab04d4` and add your > commit log ?! Yeah I did the same, revert and changed the commit message. BTW, I don't see any difference in my change and your commit, anything I am missing here? Thanks, Dikshita > > --- > bod