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 53D03DF76 for ; Tue, 6 Jan 2026 05:47:34 +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=1767678455; cv=none; b=RTrXnzvk9grznGFQQehd+Dp77VwDsgraew5rsJJqGIY/hqOssdkS5LE4uzReTT9LEQN/swJ5KC8DaaMt4Gq+kLmt7obyhNygrcr0Gf2XFuIxugxZfXA/ajPgXf6Ght0sOk7eUcitSRMf+XhuQYuf9+MGxUx6XJkOF3MJER838CU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767678455; c=relaxed/simple; bh=i5vu8yGtk0HellFqwFion2Ak+BLdrYOZ3p+b7cA7O2s=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=Tv9NKuYJkpwupcZ81F0nJIhQWLn6UZHnko5YVVxUJkBuwD5/gjTEEwzu+C8gbsJhj0XeFvIxJmwUDZXtfoOsE3AADhVEoryXGBCN7o1uno/yuh2fb3S6Ujuj/J/b5gs/9YfH5jZvt5HIpQY3pjneBjd93PE7nQ2KANOLopXmYzY= 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=XAP7eVlD; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=MKKIQDJ2; 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="XAP7eVlD"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="MKKIQDJ2" 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 6063QYZ22923095 for ; Tue, 6 Jan 2026 05:47:33 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= Q/dwh0Ekn+897m4si2f6RlzqzuqYPVhIepPME2TiFas=; b=XAP7eVlDEBf3HO5X Z5kLltiIdRQEI4G+aYhLKrtj5JSS0y2LWx4TPeAsYGr82aTuAi+TLgdLxfCmfYyt doeMwIja2ciD1pe5eDMfMMWAwmP7SWkHEoenGCsIsr7MA9od+n/Iwosn5itj4FYL yyWTk5JwBsYGEtsjQ2NO8/GddyhmfImNX4m7DIX0KhH4vtb/7OZGPan+pr2scpxm g0a8rNmSLupsDy3MZfVMyWFCDbWiCWeoo+Y+Ac13RgcLThFZe/iXrJ33Z/99FcdF yYXDHNpflLLAgz4ClHDrbH7bxNShkXGqT/8bnnYtJsIIr5sq4+Hlw8kFJ49FLOL2 yZRJWw== Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4bgscy8gkr-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 06 Jan 2026 05:47:33 +0000 (GMT) Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-8088be744afso1541460b3a.0 for ; Mon, 05 Jan 2026 21:47:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1767678453; x=1768283253; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=Q/dwh0Ekn+897m4si2f6RlzqzuqYPVhIepPME2TiFas=; b=MKKIQDJ2ZxHG8XVcJEM0uyrsE5dycbYVJ8QrgwE0HyoiwManfOe6eqn5uamFkAtrwA AIQF4ptF168OWZNpv4FMbXGoOWx/nx7JJeYutEnX6vNEbb0fer+qeR0141Aj+X4DLkn1 m+k7NZraOaWP2IjZN+tDF458+r2xNk/MpA1kntEm2mdFdofmS2mBq8UZPYBNOY07/nuC 6K0RuObNc6w1UkXlXYIOLaZMHlbQmPb3m6/oWzTloxHei0BPQa0NtZbC0qa8ct6fkjjw khYZxJVPcNtE1WCqJQmJ4Xl634LeLHW/49T+gthZ9QjjyfQSPYrieJsf4Fv3f5oGFSOY YeMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767678453; x=1768283253; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language: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=Q/dwh0Ekn+897m4si2f6RlzqzuqYPVhIepPME2TiFas=; b=UNpqhCm5yt8bw6+EBCYjX02lYjGMc5Cj7vdHJWyUN3JYsHB/8OboxMd9WFAIZ8RkTf rX855JTR4QhL4Y+5ls2yDGL0pz6+Lk8R8x4Yo/fX/Ooa+5peu/UnEoBzpZSIbS8g5FXg puZNkICyQ76OUU9I7CMe9x3qY1Ozimces/jFrjx1YXE8iGQNSd/R4ajZChMtJ/fQZ4eP S3uZ6x56QA5YtVehBtoo6TbQ9mNwubXXNkAOpwdR49kHfVBqamHb7W/IxA2IqUzLBreW slv5/7quPuqF5//TWRd03W9y0PB+pEjyCkxGfgOhuxnqNlu1n6K8WaUcNWjwyoadyudW 6r5w== X-Forwarded-Encrypted: i=1; AJvYcCURJPeXv8Hh6LpMg2kF2mCTIXR4A56RloSi5+SvbHO7IHNzwZHTGSW4qrkzFM8fUhEOMjnlLmlLx1+pSgc=@vger.kernel.org X-Gm-Message-State: AOJu0YymG5xSa0RgOA2Wyr7b4bkVZNgsXVr81n5hwN37SrJkq++telvT 8pib3a6//9KvIvx5dNuTbK/5Ta8UpUDTn91sRSqLuS052hSK4U9dV78DVaBiIMHXg7qZH0VSzCI RBMQ8BcLByUJEd5Ip1XeugJhK/rHOtOGQZeZy76eotGl4vaO1Shtls2IhxOmGR9aX6e4= X-Gm-Gg: AY/fxX6tCrNBSnvLdTjkRSsTjvgluOk0dYkqzVQpvgofzKZzkRvBatcqL/cKDOOj2q2 crBwPlLeZ4MMikduTpQSshGljrAlUyEJhfuV5seZV4XrqI2H4epwSOQaUVm/tHFY0S/EmN2clpG 2I0FWcJ5zN06JktoLo6rNc1ECCWUGlcNsic5ZTmVvGQ2XFD9ZB/wWYldZYFhcSmPSemn+CYIUfi +eycsCYE7hyub7yEDNgiLqFKY2ylyowZil6/ie4Q/97CDyp3mzV3cQZlbUVQXLl+zhlfgpQCoSG /d3JFh6fHLG08gwCf3LP8WZG33Kcttm1jar9/gYo1rWhMTuHFR0/4wVyDgWyR+6URDv7wx6ytX1 /ozyCCKlx3JD/aGhyyGisnrp5RMlB//cq3CDOHZfh X-Received: by 2002:a05:6a00:1ca4:b0:77d:c625:f5d3 with SMTP id d2e1a72fcca58-81943604d69mr1437584b3a.1.1767678452190; Mon, 05 Jan 2026 21:47:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IEue9Lvf8RRacycC5QXHlj4IZU+nH15hS6qZlJLf84LJckOP3lo8PGfHYG0pdCX00cFZmVHlA== X-Received: by 2002:a05:6a00:1ca4:b0:77d:c625:f5d3 with SMTP id d2e1a72fcca58-81943604d69mr1437562b3a.1.1767678451654; Mon, 05 Jan 2026 21:47:31 -0800 (PST) Received: from [10.0.0.3] ([106.222.235.29]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-819c5edd921sm846505b3a.69.2026.01.05.21.47.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 05 Jan 2026 21:47:31 -0800 (PST) Message-ID: <4a3b5af0-b9d0-c874-b788-92f406bd6eb9@oss.qualcomm.com> Date: Tue, 6 Jan 2026 11:17:26 +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" Content-Language: en-US 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> <69aaa79f-27ce-4308-aecb-260b50bcd0d6@linaro.org> From: Dikshita Agarwal In-Reply-To: <69aaa79f-27ce-4308-aecb-260b50bcd0d6@linaro.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Proofpoint-GUID: afNAmYAxZM_7qnwcGINmlqYdAnOYD5nu X-Authority-Analysis: v=2.4 cv=fOw0HJae c=1 sm=1 tr=0 ts=695ca1f5 cx=c_pps a=mDZGXZTwRPZaeRUbqKGCBw==:117 a=uEWbcFbpE8I7qiizULz5VQ==:17 a=IkcTkHD0fZMA:10 a=vUbySO9Y5rIA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=VwQbUJbxAAAA:8 a=kpyLQs8HHTFAnI9_2BMA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=zc0IvFSfCIW2DFIPzwfm:22 X-Proofpoint-ORIG-GUID: afNAmYAxZM_7qnwcGINmlqYdAnOYD5nu X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTA2MDA0NyBTYWx0ZWRfX2/tDsgTNqLY4 t59NCPXc5QNurntU0x9L9LRNkCJXiQkf+vGHR2OQzhYDM9SCBLMZ5uJ6cPNkD9VBPqKciQADHUr FAsa0iHIfrikwLzXCN1aFFfKlABeVdloHqbH0CM8nUuduBatahw6RfibKB+6UmGnr+bkbN3yYwV 2Yc4qs5J35qxdTg/eul9Q8wtvA3xkRKfCv0WDKvSe6Q1RGinx5NigWiueJWaC9PtJCNn9xO1e/5 W9mGiQgbyTysDbvhTOHAhj2tQuhAXS37axPcz3ADtj/kSEPAC+eR8jUi7W10YVXW1F1i2/k9cIg sETWqm5syq14MeBKLq+OdglBQXSScNZVK++hyFFgsDOVKIHlsZv4xqr6lEEaYHigbE1+8VgMgtE KBzGed/MxsuyhGMM4vwC3lX1kENE2Fg8II6LvOKoCU7BvNgWEypTJ8kIN77zayO1jY5cP2ho5fM TFzCRQAutTl9UclL4nA== 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_02,2026-01-05_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 suspectscore=0 bulkscore=0 malwarescore=0 lowpriorityscore=0 adultscore=0 phishscore=0 spamscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2512120000 definitions=main-2601060047 On 1/5/2026 6:20 PM, Bryan O'Donoghue wrote: > On 05/01/2026 09:51, Dikshita Agarwal wrote: >> >> >> 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? > > Take this example, I believe the "This reverts commit xxx" is added by the > revert command and its best practice to include it. > > commit afb9917d9b374ecb77d478c2a052e20875c6e232 > Author: Christian Brauner > Date:   Fri Dec 5 13:50:31 2025 +0100 > >     Revert "net/socket: convert sock_map_fd() to FD_ADD()" > >     This reverts commit 245f0d1c622b0183ce4f44b3e39aeacf78fae594. > > I can just add it back in with the PR though its NBD. Ah ok, got it. Thanks! > > --- > bod