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 E347529DB7B; Tue, 29 Apr 2025 09:24:42 +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=1745918684; cv=none; b=oRT1eIVX0aVE7Ifo1YS4o1uQt1IQeIhOAD9duj3OYbQ2wTwkYWPdptq41kpQVRmE5M9xNC08Lr9CaUF7f8F7YjSIHyDK7OH3E+TSlKD++0tKcaiSV5mm7LhWtGLTcCOQKLLFfEB22Lbv9sLES3S7I9AYPt/IOOLDVvgvDUM4D5I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745918684; c=relaxed/simple; bh=Oz57ghYrtkOPD6FBXSq5vXK4+BkELHYLUpmH/sPSU3U=; h=Message-ID:Date:MIME-Version:Subject:To:CC:References:From: In-Reply-To:Content-Type; b=K6VI9oPJ3OXyMspUlNP6obYgq/32Dn9GqGB5ouxRRJKi8H5IUQr4r/08sUCd/Fr0qg8bg7Dftf7okM+7cIjS18ULAmAq7bu2cKQeDIba+s/B/87hkjV9KJ7Kofr0rYNeh6tbfyciX3TE7Rm9nRbFWLVOa1uWG0HmruXkLQDDC6o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=IjYUxK7S; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="IjYUxK7S" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53SNqQsR001925; Tue, 29 Apr 2025 09:24:38 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= lbmm9aYUKpgrFcCSuJnU7WHwn8FeqFUlG2SUByX1AY8=; b=IjYUxK7SVw/mcDxj V+ABuP34GIpRctmspd3z+VQhma7HQLq9K8ZkOHG438zjuqFn6Hdhkinafi6ByOA6 Hhik9JdNN83nDYUUi/bjN71P/XbYwFweKncNuQ4ukDl4KjNH8KokTI8kzyXhbLGS 4+N7Fw0IUAUacmnxLvuHHHRLs7ZEmnPnWeX0+VwjH9Os+8PFQGi3HliRd+VUEF7o u2WER3ekSKZtBgcEm0ZhAKc0OV/iDxwAwVzsizVR1vvXz6I889K2NpTOwaWgu81Q 5a7rqYDAnswDXbinpN6u+QfLMtVzYLy/m8NvAsCiWZcmqFelXnjf+Bj1wpa6yEm4 oOtufw== Received: from nasanppmta01.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 468qq5k583-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 29 Apr 2025 09:24:37 +0000 (GMT) Received: from nasanex01a.na.qualcomm.com (nasanex01a.na.qualcomm.com [10.52.223.231]) by NASANPPMTA01.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 53T9Obah009551 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 29 Apr 2025 09:24:37 GMT Received: from [10.50.27.172] (10.80.80.8) by nasanex01a.na.qualcomm.com (10.52.223.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Tue, 29 Apr 2025 02:24:30 -0700 Message-ID: Date: Tue, 29 Apr 2025 14:54:28 +0530 Precedence: bulk X-Mailing-List: devicetree@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.15.1 Subject: Re: [PATCH v2 01/23] media: iris: Skip destroying internal buffer if not dequeued Content-Language: en-US To: Dikshita Agarwal , Abhinav Kumar , Mauro Carvalho Chehab , Stefan Schmidt , Hans Verkuil , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley CC: Bryan O'Donoghue , Dmitry Baryshkov , Neil Armstrong , Nicolas Dufresne , , , , , <20250417-topic-sm8x50-iris-v10-v7-0-f020cb1d0e98@linaro.org>, <20250424-qcs8300_iris-v5-0-f118f505c300@quicinc.com>, References: <20250428-qcom-iris-hevc-vp9-v2-0-3a6013ecb8a5@quicinc.com> <20250428-qcom-iris-hevc-vp9-v2-1-3a6013ecb8a5@quicinc.com> From: Vikash Garodia In-Reply-To: <20250428-qcom-iris-hevc-vp9-v2-1-3a6013ecb8a5@quicinc.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nasanex01a.na.qualcomm.com (10.52.223.231) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: gj3X-0VptbE-_q4T8ZIEdev-JlSHsiNf X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI5MDA2OSBTYWx0ZWRfX6X2OK5OwQMv7 98h6U81oxKjB0ArFlQ9i+IiLh9WuMSFAVft9WPSUvyRGCfg140dsFZ2RhaEK9Q/eTeflYMIYKnm TAEZM+3GgJj167LVdg4oBlcWQ0HTAohCNTvheiHZl8EOkF0UNZQfqVCYym/qADRp0vERrZDknrM vkqr5bsLEhoDZMlaFFl+Zb0rTJ6kXZMQ3UzmatDSiQOqS+RgnCNVeNryP8+uYqO9dxylNuwnIgj iFHNJ2/v0REd9RBsAeyJERLWclrG16tyRubYtqdF3D95aifM9Tb0lbpo9HgqZfoXX1faCk77exZ PJGx77NPA/6x/mnKh1mFs4o8ahh26qaSOotU8aQzgdfhTPuCr5A2YQ5/ak/F7oqJ58+51d13FMi 4NFtA5miwv8QGP+digwEfdih9HVVcCLBbDO+e0jnYgqKsl5eDW0xfnpvh0Sckz5CJ0tPs7LP X-Authority-Analysis: v=2.4 cv=QP1oRhLL c=1 sm=1 tr=0 ts=68109ad5 cx=c_pps a=JYp8KDb2vCoCEuGobkYCKw==:117 a=JYp8KDb2vCoCEuGobkYCKw==:17 a=GEpy-HfZoHoA:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=VwQbUJbxAAAA:8 a=COk6AnOGAAAA:8 a=coh382I2HbmauKP32H0A:9 a=QEXdDO2ut3YA:10 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-GUID: gj3X-0VptbE-_q4T8ZIEdev-JlSHsiNf X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-04-29_03,2025-04-24_02,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 spamscore=0 clxscore=1011 mlxlogscore=999 lowpriorityscore=0 adultscore=0 mlxscore=0 bulkscore=0 phishscore=0 impostorscore=0 priorityscore=1501 malwarescore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504290069 On 4/28/2025 2:58 PM, Dikshita Agarwal wrote: > Firmware might hold the DPB buffers for reference in case of sequence > change, so skip destroying buffers for which QUEUED flag is not removed. > Also, make sure that all buffers are released during streamoff. > > Cc: stable@vger.kernel.org > Fixes: 73702f45db81 ("media: iris: allocate, initialize and queue internal buffers") > Signed-off-by: Dikshita Agarwal > --- > drivers/media/platform/qcom/iris/iris_buffer.c | 37 +++++++++++++++++++++++++- > drivers/media/platform/qcom/iris/iris_buffer.h | 3 ++- > drivers/media/platform/qcom/iris/iris_vdec.c | 4 +-- > drivers/media/platform/qcom/iris/iris_vidc.c | 6 +++-- > 4 files changed, 44 insertions(+), 6 deletions(-) > > diff --git a/drivers/media/platform/qcom/iris/iris_buffer.c b/drivers/media/platform/qcom/iris/iris_buffer.c > index e5c5a564fcb8..606d76b10be2 100644 > --- a/drivers/media/platform/qcom/iris/iris_buffer.c > +++ b/drivers/media/platform/qcom/iris/iris_buffer.c > @@ -376,7 +376,7 @@ int iris_destroy_internal_buffer(struct iris_inst *inst, struct iris_buffer *buf > return 0; > } > > -int iris_destroy_internal_buffers(struct iris_inst *inst, u32 plane) > +int iris_destroy_internal_buffers(struct iris_inst *inst, u32 plane, bool force) > { > const struct iris_platform_data *platform_data = inst->core->iris_platform_data; > struct iris_buffer *buf, *next; > @@ -396,6 +396,14 @@ int iris_destroy_internal_buffers(struct iris_inst *inst, u32 plane) > for (i = 0; i < len; i++) { > buffers = &inst->buffers[internal_buf_type[i]]; > list_for_each_entry_safe(buf, next, &buffers->list, list) { > + /* > + * during stream on, skip destroying internal(DPB) buffer > + * if firmware did not return it. > + * during close, destroy all buffers irrespectively. > + */ > + if (!force && buf->attr & BUF_ATTR_QUEUED) > + continue; > + > ret = iris_destroy_internal_buffer(inst, buf); > if (ret) > return ret; > @@ -446,6 +454,33 @@ static int iris_release_input_internal_buffers(struct iris_inst *inst) > return 0; > } > > +void iris_get_num_queued_internal_buffers(struct iris_inst *inst, u32 plane) name this iris_check_num_queued_internal_buffers.. > +{ > + const struct iris_platform_data *platform_data = inst->core->iris_platform_data; > + struct iris_buffer *buf, *next; > + struct iris_buffers *buffers; > + const u32 *internal_buf_type; > + u32 internal_buffer_count, i; > + u32 count = 0; > + > + if (V4L2_TYPE_IS_OUTPUT(plane)) { > + internal_buf_type = platform_data->dec_ip_int_buf_tbl; > + internal_buffer_count = platform_data->dec_ip_int_buf_tbl_size; > + } else { > + internal_buf_type = platform_data->dec_op_int_buf_tbl; > + internal_buffer_count = platform_data->dec_op_int_buf_tbl_size; > + } > + > + for (i = 0; i < internal_buffer_count; i++) { > + buffers = &inst->buffers[internal_buf_type[i]]; > + list_for_each_entry_safe(buf, next, &buffers->list, list) > + count++; > + if (count) > + dev_err(inst->core->dev, "%d buffer of type %d not released", > + count, internal_buf_type[i]); > + } > +} > + > int iris_alloc_and_queue_persist_bufs(struct iris_inst *inst) > { > struct iris_buffers *buffers = &inst->buffers[BUF_PERSIST]; > diff --git a/drivers/media/platform/qcom/iris/iris_buffer.h b/drivers/media/platform/qcom/iris/iris_buffer.h > index c36b6347b077..03a32b91cf21 100644 > --- a/drivers/media/platform/qcom/iris/iris_buffer.h > +++ b/drivers/media/platform/qcom/iris/iris_buffer.h > @@ -106,7 +106,8 @@ void iris_get_internal_buffers(struct iris_inst *inst, u32 plane); > int iris_create_internal_buffers(struct iris_inst *inst, u32 plane); > int iris_queue_internal_buffers(struct iris_inst *inst, u32 plane); > int iris_destroy_internal_buffer(struct iris_inst *inst, struct iris_buffer *buffer); > -int iris_destroy_internal_buffers(struct iris_inst *inst, u32 plane); > +int iris_destroy_internal_buffers(struct iris_inst *inst, u32 plane, bool force); > +void iris_get_num_queued_internal_buffers(struct iris_inst *inst, u32 plane); make this static Regards, Vikash > int iris_alloc_and_queue_persist_bufs(struct iris_inst *inst); > int iris_alloc_and_queue_input_int_bufs(struct iris_inst *inst); > int iris_queue_buffer(struct iris_inst *inst, struct iris_buffer *buf); > diff --git a/drivers/media/platform/qcom/iris/iris_vdec.c b/drivers/media/platform/qcom/iris/iris_vdec.c > index 4143acedfc57..2c1a7162d2da 100644 > --- a/drivers/media/platform/qcom/iris/iris_vdec.c > +++ b/drivers/media/platform/qcom/iris/iris_vdec.c > @@ -408,7 +408,7 @@ int iris_vdec_streamon_input(struct iris_inst *inst) > > iris_get_internal_buffers(inst, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE); > > - ret = iris_destroy_internal_buffers(inst, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE); > + ret = iris_destroy_internal_buffers(inst, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, false); > if (ret) > return ret; > > @@ -496,7 +496,7 @@ int iris_vdec_streamon_output(struct iris_inst *inst) > > iris_get_internal_buffers(inst, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE); > > - ret = iris_destroy_internal_buffers(inst, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE); > + ret = iris_destroy_internal_buffers(inst, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, false); > if (ret) > return ret; > > diff --git a/drivers/media/platform/qcom/iris/iris_vidc.c b/drivers/media/platform/qcom/iris/iris_vidc.c > index ca0f4e310f77..56531a7f0dfe 100644 > --- a/drivers/media/platform/qcom/iris/iris_vidc.c > +++ b/drivers/media/platform/qcom/iris/iris_vidc.c > @@ -233,8 +233,10 @@ int iris_close(struct file *filp) > iris_session_close(inst); > iris_inst_change_state(inst, IRIS_INST_DEINIT); > iris_v4l2_fh_deinit(inst); > - iris_destroy_internal_buffers(inst, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE); > - iris_destroy_internal_buffers(inst, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE); > + iris_destroy_internal_buffers(inst, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, true); > + iris_destroy_internal_buffers(inst, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, true); > + iris_get_num_queued_internal_buffers(inst, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE); > + iris_get_num_queued_internal_buffers(inst, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE); > iris_remove_session(inst); > mutex_unlock(&inst->lock); > mutex_destroy(&inst->ctx_q_lock); >