From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 560193EC2C2 for ; Thu, 23 Apr 2026 12:00:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776945643; cv=none; b=uy6FHzs2A833cRTjTzW7Yxhb2L5+FgAB68mwzGuSnxTv7rYZEUI9tgP1vYSZiAguxL3swmX4LwhpFJNga/GKzLZQs2/UaJqIXgCnDGP6CjxmHqlCenLRoIdq322d7wuJR0nktNzvK4qqIn+3eH6+EkJQ62bdw5RilTVWAtNhUK0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776945643; c=relaxed/simple; bh=/4u0s68y0bWzXBNSs/02FvXVElc68mI24erTIfYoe/4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kNKATEsgW36I01Eu8YSB/2DRnjO5RoXgyiue206UJg0ZvOK16NNyytsNo/H6AgH7V95x3wZJi2aza4qNsgqmn0ZIa2RvUmUe4mtx1TFeznDDhohGe2o16pix38Cv3De+fNrn9yh/1n40FuJoWwYsrLDfPl9tJCmAY3cgW7NauB8= 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=FHG0VN0Y; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=gqGu6Zjl; arc=none smtp.client-ip=205.220.180.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="FHG0VN0Y"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="gqGu6Zjl" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 63N8uEwo3044048 for ; Thu, 23 Apr 2026 12:00:41 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= o5jbzVWWdj9OVgnOnF4MDpI7MkUgPzEgugSFsM8ZzIc=; b=FHG0VN0YYIyONPdl OQgyXaS5n0Jf8nCM4nFsvp3ucGFFMe9HWtEldvb2xOcG5HhviisgNSuWIXIczxw1 FqbgyB6XYsDiDhwt5KaMjIhFRgYnLbWcY3is1s4Z0ub2CtmS1lHBlrXpBkKW8Tqa 7dPRck2oFzQ2An0pYEtW3TzPH9400ioT7KRn9S/Pg5+H7mzTvmTpmDDLW/cRQjbI 3qFeETHYvedCR5bNGD9AAD4BuSpXbzqP4OiAIo3ZSOW3VVATM3SL+aeOTUiQJmzJ C9fWKOSEuTRwUYTbXxCE/RjRDFjOIbV786NG65fCmLUDQn6FiKoW5WzP+k2Y9j3a qmns/A== Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4dq1jh3rug-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 23 Apr 2026 12:00:41 +0000 (GMT) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2b24e9b4d82so68140345ad.1 for ; Thu, 23 Apr 2026 05:00:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1776945640; x=1777550440; 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=o5jbzVWWdj9OVgnOnF4MDpI7MkUgPzEgugSFsM8ZzIc=; b=gqGu6ZjlY1hRd/pMInJ8fX0opSVZqvEIe3IfugsZz+MzM7Ju1++VLFfL4A/4bmBabJ wmWJ6NvSlN5kkiniqarq51TYyU/u5Mpj76pD5RsAc68R/baXzIph0fnos4aWD9Sl4wYr A3ZiVtpHV2rJqvGvJesKM2gk8bGp5mqf83SMTh3BHeOexAlxw1rWec2KcT6HwvNcHcFD 8jzO08iG7wLgdF2Obf6pWgzZoQlRekRBduoBnJxs7ZKuUs3zSHGvVakJ6S0sEfA9ReiM RVdgUa9mFCiiAlJOcxwzFKxHrh/tiJM5aZdGi86R0uUXtoKZzpTN5xvg7GWX1yq3oPiQ Su3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776945640; x=1777550440; 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=o5jbzVWWdj9OVgnOnF4MDpI7MkUgPzEgugSFsM8ZzIc=; b=aOqsuGH7FdkoXkXBHJOKBeCZRwRGikdzqjcynpXo0gsKT3w+wLw/SNLHh22I0Jgsxv m9bEQsA+CqeUd/+1V0+6ph8nPCSb9qoS+ciVmrnFN75zYneRsknWDdnKUR8kyYo6Yb0Q ZFKIsklOrt+blSfrKU2c+va4/tqL0r/oszT6IrEjVpoPAZHg1CJuyZ1KEMIb1Xpc3HfG 3E/OhMk1hhgEP1zLSvewYXnBqfctpwpkKQIUVUzb695UFEz57U955JIgMoIPTWQ/KxJS PUS+MMyfbioY7RPLLbRyE9+NSLmFD2cGTgTarmzHqrZkIppvJgvbexOmHVmWCnPAttoF 2vxQ== X-Forwarded-Encrypted: i=1; AFNElJ+gW7HaCv4q2Va8VNK9f1i9o0WkAdMY6JjqNd46kch+GU/qW/nBUbmnPU6ZS3VptwsqAWcnOvksrcf20DU=@vger.kernel.org X-Gm-Message-State: AOJu0YwSayRDeHEUBbu/3ZuuW/0/G8sfN9HDRpSy3Q7Q9VUoH5Ipxlf5 7QGaqaEsgTedCVSWx0q+I9PoaaYU8O0RX2KJdUrp+5cHtZOhdqbE5gTDeTZUKLURI6672PD7OSP E+PfI7xFxmD4grofW5FB9FAaWeGVCgSuomg1FmH8eOIsYM6ZYsQOyJ3Fh+NFy0mDSxVE= X-Gm-Gg: AeBDiesPPtB0aDMgF2DamxqZ3AZQAnUu1rcn4ILxz+7ahUrw7Rx4zldFbGcf9mgarii /oEtWbvgcmEYMPfyzDHqonWmaw9LkYoPNTEYCDutVi5njm1VvlT2SlyL3GNmiRek31beWQjVZug iZ1U3Wg7eRiZqSIvXYS29Dl9RbyQaYdvZJX2qpD7ZbAia4Afx2bqREfoa/qSGm8IpcyMdWMXONX t9er1ocGfO3luiYVWYxd/tLeGfVkVpHnIZ7Yeh3mmVJTs1CPTAS5fu8p4G7u+nB22Lwenjzo7gE bKVtkynpDI7j4LiYcC8EhEMv5BIbgx8C6LUkCw/e9hy8rpHwIkTteLzuRq4dtQxOdlbzYGhcXrs kAGhwao76U+lwfYj59H12Hu2EU1tjLGKXI3kXLgJmNhfhbhJZEMRSBRioVz5M2O3S8QCxzQ== X-Received: by 2002:a17:903:3910:b0:2b7:88f9:9c28 with SMTP id d9443c01a7336-2b788f9a0c6mr98978095ad.5.1776945639813; Thu, 23 Apr 2026 05:00:39 -0700 (PDT) X-Received: by 2002:a17:903:3910:b0:2b7:88f9:9c28 with SMTP id d9443c01a7336-2b788f9a0c6mr98976455ad.5.1776945637034; Thu, 23 Apr 2026 05:00:37 -0700 (PDT) Received: from hu-dikshita-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b5faa4f092sm194790355ad.36.2026.04.23.05.00.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Apr 2026 05:00:36 -0700 (PDT) From: Dikshita Agarwal Date: Thu, 23 Apr 2026 17:30:05 +0530 Subject: [PATCH v2 1/7] media: qcom: iris: Centralize internal buffer table selection 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: 8bit Message-Id: <20260423-iris-code-improvement-v2-1-9e9cbf00f9c9@oss.qualcomm.com> References: <20260423-iris-code-improvement-v2-0-9e9cbf00f9c9@oss.qualcomm.com> In-Reply-To: <20260423-iris-code-improvement-v2-0-9e9cbf00f9c9@oss.qualcomm.com> To: Vikash Garodia , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab , Hans Verkuil , Stefan Schmidt , Hans Verkuil , Deepa Guthyappa Madivalara 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=1776945627; l=8089; i=dikshita.agarwal@oss.qualcomm.com; s=20240917; h=from:subject:message-id; bh=/4u0s68y0bWzXBNSs/02FvXVElc68mI24erTIfYoe/4=; b=uVLutiKCBlDPAHjHyZPNgKYlQUw3O79i35dizeLGIlZU5EuGoFp85LH87npx6bP+mK9iV7SPE fklTvPnX1VPB7+cH+K+pCWvbXg/WR25pu+z0Inb6M5DzMZMJ3fFZDnb X-Developer-Key: i=dikshita.agarwal@oss.qualcomm.com; a=ed25519; pk=EEvKY6Ar1OI5SWf44FJ1Ebo1KuQEVbbf5UNPO+UHVhM= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDIzMDExOSBTYWx0ZWRfX3ZvFn5azE5ZU nhawkTNBuO9qvRSxDKjp+7Lg9BH84Care9arM24uewqnGJ27b1o5iVtUAPFDP+qr2+WJgj3JFrn C0q3cJLMTdyQV31cMS+/hWscZj32KYQpo9A2zf4PlaHCpcxRnhBMM6faAaQ1wg7FNafevrmZznt cZwLh6mk0BFTW/UQtpbh23RFkUzWKZfJMSbbczXdwAvtAXWUf5VrUrdU4ua1Il2qer6cM3BFjdg mefOYr9FNfpaNMBo2MbwHE1btktlmJed+o0kQ02x6uqZweAhzQqu1CnwpOLpsPBRFzh6kd599Zd BMTfX+mIpZMVqKjG7n7czf225yFzGhQRCrIfrWv5fkNOEIqOVxdtxsupRYvQucpVjOSDzw359yD W+BKHWFuxVxxm//ki89CAC53rqnPa7HD3CKs1rcRWLM8ZeGhjZ+lruiiDiswbaquJJQehBI9gsY iIWBMIKfecNd3lZZnYg== X-Authority-Analysis: v=2.4 cv=OeyoyBTY c=1 sm=1 tr=0 ts=69ea09e9 cx=c_pps a=cmESyDAEBpBGqyK7t0alAg==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=A5OVakUREuEA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=YO4-hHwgDu7wuGDVLqgA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=1OuFwYUASf3TG4hYMiVC:22 X-Proofpoint-GUID: NWwTCEGq65YzZZpgyHuIdGiypDzk78ei X-Proofpoint-ORIG-GUID: NWwTCEGq65YzZZpgyHuIdGiypDzk78ei X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-23_03,2026-04-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 bulkscore=0 adultscore=0 suspectscore=0 phishscore=0 clxscore=1015 spamscore=0 lowpriorityscore=0 malwarescore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2604230119 Internal buffer table dispatch is duplicated across multiple Iris code paths, which is error‑prone and makes future changes harder to reason about. Consolidate the buffer dispatch logic into a single helper so that table selection is defined in exactly one place and keep call sites minimal. No functional change intended. Signed-off-by: Dikshita Agarwal --- drivers/media/platform/qcom/iris/iris_buffer.c | 107 ++++++------------------- 1 file changed, 26 insertions(+), 81 deletions(-) diff --git a/drivers/media/platform/qcom/iris/iris_buffer.c b/drivers/media/platform/qcom/iris/iris_buffer.c index 9151f43bc6b9c2c34c803de4231d1e6de0bec6c4..5b31c511da6e735943e2561683016cb9414d760c 100644 --- a/drivers/media/platform/qcom/iris/iris_buffer.c +++ b/drivers/media/platform/qcom/iris/iris_buffer.c @@ -299,39 +299,41 @@ static void iris_fill_internal_buf_info(struct iris_inst *inst, buffers->min_count = iris_vpu_buf_count(inst, buffer_type); } -void iris_get_internal_buffers(struct iris_inst *inst, u32 plane) +static void iris_get_int_buf_tbl(struct iris_inst *inst, u32 plane, + const u32 **internal_buf_type, u32 *internal_buffer_count) { const struct iris_platform_data *platform_data = inst->core->iris_platform_data; - const u32 *internal_buf_type; - u32 internal_buffer_count, i; if (inst->domain == DECODER) { 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; - for (i = 0; i < internal_buffer_count; i++) - iris_fill_internal_buf_info(inst, internal_buf_type[i]); + *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++) - iris_fill_internal_buf_info(inst, internal_buf_type[i]); + *internal_buf_type = platform_data->dec_op_int_buf_tbl; + *internal_buffer_count = platform_data->dec_op_int_buf_tbl_size; } } else { if (V4L2_TYPE_IS_OUTPUT(plane)) { - internal_buf_type = platform_data->enc_ip_int_buf_tbl; - internal_buffer_count = platform_data->enc_ip_int_buf_tbl_size; - for (i = 0; i < internal_buffer_count; i++) - iris_fill_internal_buf_info(inst, internal_buf_type[i]); + *internal_buf_type = platform_data->enc_ip_int_buf_tbl; + *internal_buffer_count = platform_data->enc_ip_int_buf_tbl_size; } else { - internal_buf_type = platform_data->enc_op_int_buf_tbl; - internal_buffer_count = platform_data->enc_op_int_buf_tbl_size; - for (i = 0; i < internal_buffer_count; i++) - iris_fill_internal_buf_info(inst, internal_buf_type[i]); + *internal_buf_type = platform_data->enc_op_int_buf_tbl; + *internal_buffer_count = platform_data->enc_op_int_buf_tbl_size; } } } +void iris_get_internal_buffers(struct iris_inst *inst, u32 plane) +{ + const u32 *internal_buf_type; + u32 internal_buffer_count, i; + + iris_get_int_buf_tbl(inst, plane, &internal_buf_type, &internal_buffer_count); + + for (i = 0; i < internal_buffer_count; i++) + iris_fill_internal_buf_info(inst, internal_buf_type[i]); +} + static int iris_create_internal_buffer(struct iris_inst *inst, enum iris_buffer_type buffer_type, u32 index) { @@ -366,29 +368,12 @@ static int iris_create_internal_buffer(struct iris_inst *inst, int iris_create_internal_buffers(struct iris_inst *inst, u32 plane) { - const struct iris_platform_data *platform_data = inst->core->iris_platform_data; u32 internal_buffer_count, i, j; struct iris_buffers *buffers; const u32 *internal_buf_type; int ret; - if (inst->domain == DECODER) { - 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; - } - } else { - if (V4L2_TYPE_IS_OUTPUT(plane)) { - internal_buf_type = platform_data->enc_ip_int_buf_tbl; - internal_buffer_count = platform_data->enc_ip_int_buf_tbl_size; - } else { - internal_buf_type = platform_data->enc_op_int_buf_tbl; - internal_buffer_count = platform_data->enc_op_int_buf_tbl_size; - } - } + iris_get_int_buf_tbl(inst, plane, &internal_buf_type, &internal_buffer_count); for (i = 0; i < internal_buffer_count; i++) { buffers = &inst->buffers[internal_buf_type[i]]; @@ -442,30 +427,13 @@ int iris_queue_internal_deferred_buffers(struct iris_inst *inst, enum iris_buffe int iris_queue_internal_buffers(struct iris_inst *inst, u32 plane) { - const struct iris_platform_data *platform_data = inst->core->iris_platform_data; struct iris_buffer *buffer, *next; struct iris_buffers *buffers; const u32 *internal_buf_type; u32 internal_buffer_count, i; int ret; - if (inst->domain == DECODER) { - 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; - } - } else { - if (V4L2_TYPE_IS_OUTPUT(plane)) { - internal_buf_type = platform_data->enc_ip_int_buf_tbl; - internal_buffer_count = platform_data->enc_ip_int_buf_tbl_size; - } else { - internal_buf_type = platform_data->enc_op_int_buf_tbl; - internal_buffer_count = platform_data->enc_op_int_buf_tbl_size; - } - } + iris_get_int_buf_tbl(inst, plane, &internal_buf_type, &internal_buffer_count); for (i = 0; i < internal_buffer_count; i++) { buffers = &inst->buffers[internal_buf_type[i]]; @@ -501,30 +469,13 @@ int iris_destroy_internal_buffer(struct iris_inst *inst, struct iris_buffer *buf static 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; struct iris_buffers *buffers; const u32 *internal_buf_type; u32 i, len; int ret; - if (inst->domain == DECODER) { - if (V4L2_TYPE_IS_OUTPUT(plane)) { - internal_buf_type = platform_data->dec_ip_int_buf_tbl; - len = platform_data->dec_ip_int_buf_tbl_size; - } else { - internal_buf_type = platform_data->dec_op_int_buf_tbl; - len = platform_data->dec_op_int_buf_tbl_size; - } - } else { - if (V4L2_TYPE_IS_OUTPUT(plane)) { - internal_buf_type = platform_data->enc_ip_int_buf_tbl; - len = platform_data->enc_ip_int_buf_tbl_size; - } else { - internal_buf_type = platform_data->enc_op_int_buf_tbl; - len = platform_data->enc_op_int_buf_tbl_size; - } - } + iris_get_int_buf_tbl(inst, plane, &internal_buf_type, &len); for (i = 0; i < len; i++) { buffers = &inst->buffers[internal_buf_type[i]]; @@ -593,18 +544,12 @@ static int iris_release_internal_buffers(struct iris_inst *inst, static int iris_release_input_internal_buffers(struct iris_inst *inst) { - const struct iris_platform_data *platform_data = inst->core->iris_platform_data; const u32 *internal_buf_type; u32 internal_buffer_count, i; int ret; - if (inst->domain == DECODER) { - 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->enc_ip_int_buf_tbl; - internal_buffer_count = platform_data->enc_ip_int_buf_tbl_size; - } + iris_get_int_buf_tbl(inst, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, + &internal_buf_type, &internal_buffer_count); for (i = 0; i < internal_buffer_count; i++) { ret = iris_release_internal_buffers(inst, internal_buf_type[i]); -- 2.34.1