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 2124D3D413C for ; Tue, 21 Jul 2026 02:20:47 +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=1784600449; cv=none; b=XpHg93YXRR/huEosL9nNrG18vZ1S1zEhtxI/KanUgwVQ8kPSyt8cF3WaWaH1tbXgKjGQE3Dx1I0+OlajF5SoFv3yD0Vqac8QrJk9aZQKEd9JUSlfNRJg0kMkRYLAGJaHFIMUg52N/M1wyx9ZC3QqCsUf8MLCc1T6O768hcQ1TMc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784600449; c=relaxed/simple; bh=WdDHQBHuwkLWrlKd7BdIFCJ9Zvz/3V41vXnTS77goz0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fxjfKUs8+KfecTlUGF+TLpqGmDe5QusyjsrDFPVon9wUtm+8BIIj7ZRYBvZDrxrUbfsrChLdSMbArMcz1GDLvi5O7aBk8x8kP3W6wMy5rJdrctUtp9+eSFkkbuvKFQ8nekiRhXlNSXhVyHLA8hVz5l6vXGcfaIFgX1l+VpbGTYA= 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=GiqYmcQ7; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=bMqsIy0I; 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="GiqYmcQ7"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="bMqsIy0I" 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 66KNCwj83978850 for ; Tue, 21 Jul 2026 02:20:47 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= XRo02vRtcTIm7JokNSrJVFoyheWv3tJmPNHxvoGvNbE=; b=GiqYmcQ7Ngxq96h1 Jk4VZJnv0UqWGF+6NeywAd/gp/bFfUpRUsdYYpp4IruoqHdBVpSP/VZsY1xOOfYN DsWpBwE89KwWN/WJowNOs6GUgFdlH0a9rIMEqZ72CYISoMNbBWhgGHj6j47lbIuX JcOq50lkxRmtNuj7Th58yXD7hFz6yve77lelu7zrGyImnrRj1zVqriPnCqstYGin iVwzJhrLkMMBVZ2T70alztaJV1kO411t4S3DV2TcdSYRKWyKNE5ef/Z9sqiwJlIj ykNx4TIFkYRIVVJgKgCNz6A5KBveMbdfLyjpr8nNCFelQyfgXOfdQdQZuntTnYeR 3F0ESA== Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fhqv41vd3-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 21 Jul 2026 02:20:46 +0000 (GMT) Received: by mail-pg1-f200.google.com with SMTP id 41be03b00d2f7-cb4cdf95b5aso7938103a12.1 for ; Mon, 20 Jul 2026 19:20:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784600446; x=1785205246; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=XRo02vRtcTIm7JokNSrJVFoyheWv3tJmPNHxvoGvNbE=; b=bMqsIy0I7/kizkIPYKVEm8QHZrlZVjdhB3YkRx59dWiZDxNWJ51yX5AlESSQelrxaf PaNyqHvtVzfIE9+//t5ztmJ/CavY9qVTR9HwKtOyOYE5RXI1KeLSbM0tDwS9l/2eZikZ vNiqezB44/HiXuR5M5pcfdohhGt2K5u3msafqkl4N1TFgYItrRsliEwwj/cyu1qA6Lm2 1x+U0FUDB7N8qslDKiZl/J3oOloHnjso4nYK2uVD6lwdzHapYPCyymfZpVI2WlhkD0gs p8Xx0Wpbc7QDeHg0iQkkaas78TzbznRN4WT+YjN654z8OBFtO8trF60yIeM+JjYXxu6o 6MUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784600446; x=1785205246; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=XRo02vRtcTIm7JokNSrJVFoyheWv3tJmPNHxvoGvNbE=; b=odkxK9UhpsdBsLw6Z7XvNHWUgg3DVxwYD6+A+J9E3nuc2JcEUzAGLGzvwrxfXqFoVv Zp+BYXYkRELeItwQzd81WHfPmemvke6jVC/R+4ctG4LCwUF4YfzFxFsIap9kddQ+be43 zV37Kqq396za9xxuSM6XLoE8+9NQtDLaRZkw35uG9IQPhrJ/SVjWot8ShRgNlOnWJlOZ q0QgaG76OYJpQoTR1niom9rWHNoachJX3tjLUNSVwWePmygy84GUgQbz35Ci37AVf3ek VQgj9RXBif15j9uhEPmjZWxlQ13pQF2RhX0VQopD2Ztuum2lItnmQNGNxBsagN63wq6N QAwA== X-Forwarded-Encrypted: i=1; AHgh+RoDlJ12ccRutZCToNdKa2iBE7iZYy5S1Slox1EibDk8qvzIrKuDjwD676gjbsx8QO9aGujlXi9hq7s2mqEF@vger.kernel.org X-Gm-Message-State: AOJu0YyJ45aprGtYeTBn0pw2RjxQVpZpAbjEgqWurIJFHVAVNXOOWyTd hvHDB7aqJXpT/bP9tJ+VWpFm/cSjw4kJIfHMp9DeHUAP85dAoytLNCZk8xP7LK6Acu7BPJK2veN 1WzN5LaXUhxnao4qaBdmFuUdiz5fg9Hyy9y6mZcEWk3YgpFmnoy9LLftIguS4IU+PRaDz X-Gm-Gg: AfdE7cnXYPvPvHjSt2ZyVITULTiX4Im12Dp6NwAPRFYpGexI5gEkV2yzoV4nbVxklUr rJcnXbnVHBZWokgFw/LTxOL7mbhcmchyKkhJwDUb3G+0X++cYVJ0Pvl/Xc+K/ONLUWqEu6jN2Xw t39rP63S10ssN2mV12ZOelmToaW0JMOUL0L25ZOEo6icg7xLBfUUM14yXIKei+Y8OjqLq6OFs5l PZYZ7xoPDpg7L5QOAhr37E+JLY1p2YQpvQnpEP0OM8xHbX1/0a0aeU6Bu5EA+nuCCYWoLpx88Nq RgVG+Q9lf6I4WRG3R4MqmsoPOxcX3IZFcRCsjONnt2xhJ4A+rUns7FaVVwmIcmIL0tKxy21ZCJz Sp5yGOX+kapMXzSa/ubpcyQQMMFPcXzOwSQ== X-Received: by 2002:a05:6a21:a382:b0:3c3:89ce:b5bc with SMTP id adf61e73a8af0-3c3ad5f063bmr18226122637.15.1784600445950; Mon, 20 Jul 2026 19:20:45 -0700 (PDT) X-Received: by 2002:a05:6a21:a382:b0:3c3:89ce:b5bc with SMTP id adf61e73a8af0-3c3ad5f063bmr18226085637.15.1784600445453; Mon, 20 Jul 2026 19:20:45 -0700 (PDT) Received: from hu-bvisredd-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3142a1de301sm41001457eec.24.2026.07.20.19.20.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 19:20:44 -0700 (PDT) From: Vishnu Reddy Date: Tue, 21 Jul 2026 07:50:34 +0530 Subject: [PATCH v4 1/7] media: qcom: iris: Centralize internal buffer table selection 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: 8bit Message-Id: <20260721-iris-code-improvement-v4-1-4395bd8acfbb@oss.qualcomm.com> References: <20260721-iris-code-improvement-v4-0-4395bd8acfbb@oss.qualcomm.com> In-Reply-To: <20260721-iris-code-improvement-v4-0-4395bd8acfbb@oss.qualcomm.com> To: Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab , Hans Verkuil , Stefan Schmidt , Hans Verkuil , Deepa Guthyappa Madivalara Cc: Vishnu Reddy , linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784600434; l=8143; i=busanna.reddy@oss.qualcomm.com; s=20260216; h=from:subject:message-id; bh=iZ/+ncvk74wDUkoCuXp/2kLnY5XWoLUzy0kpESV6G+c=; b=laF+pI3Nipf/g4iQ0DNSazcXVlt4MWqECvgCSp/dCafAfzoeag5XLy0YniDqWVjDzOe0MJWHH yOBQvljVkKhBhicDTe1KcRPxZyUvKATrE06SkS+H2HA0+G3djyQ2wMR X-Developer-Key: i=busanna.reddy@oss.qualcomm.com; a=ed25519; pk=9vmy9HahBKVAa+GBFj1yHVbz0ey/ucIs1hrlfx+qtok= X-Proofpoint-ORIG-GUID: nblp3HgfVgBRaDFt5FkWi8uDxbLEbHKP X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzIxMDAyMCBTYWx0ZWRfX4MervRaCjVt5 9FAUJWGoIBrjS+EhkJHz/ScHzaikujY/Bb1dkTTnaefBD7vLCzSQTyt/QpbdeN/F1icAy5FGBSN xTOXAsoIDftHl8XWW9L9mJQEl0Mdb9C9p/4ETaimQY7E0xIhKm7sz6T5O1yGhTzopvrhoK2s5fa DlgOwovglTO01b72EhbqICN0BdZdopE1VrrSG9/zBiIpbszGVgSYNZ8Keor+wVYl/34Q/UrSEcb 9sXBfZiqew4x7ug0WG2FD1Cvkn8ucpCkmqjAiWpuZCG9S66fRBLISo2OQifnSfRjlqA9hNPtHuu SazpkaoL2kHGfWhrC5Gf5nF9+yFJwGGDKdvK4xkcdvbEQZpjwT6rJUEBEWZG9HXZlhypu8VVZI0 7q+8nl9I4jsRNLmE909RgCFm8Y5YdYMkULC2k2sRYVYNluta/p9U0bnvQ1bYQvmtS6WZtQck/XU /8f9yikdRixx5RugAmg== X-Proofpoint-Spam-Info: AW1haW4tMjYwNzIxMDAyMCBTYWx0ZWRfXyqfXpqaK2fth S8yo6SZW0HSmHyheZ2JeKijTwDTMc1N6XzkV4j40N2R3y+/d7qS9M7uLAaRpr6eP0/MvUYsGfUb z4e+Ggu0AXogw4RoWL9bljy58ypvS98= X-Authority-Analysis: v=2.4 cv=daawG3Xe c=1 sm=1 tr=0 ts=6a5ed77e cx=c_pps a=oF/VQ+ItUULfLr/lQ2/icg==:117 a=fChuTYTh2wq5r3m49p7fHw==:17 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=VwQbUJbxAAAA:8 a=22hBRqbxvLe5Obw_dBcA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=3WC7DwWrALyhR5TkjVHa:22 X-Proofpoint-GUID: nblp3HgfVgBRaDFt5FkWi8uDxbLEbHKP X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-20_06,2026-07-20_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 impostorscore=0 priorityscore=1501 suspectscore=0 malwarescore=0 clxscore=1015 adultscore=0 spamscore=0 lowpriorityscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607210020 From: Dikshita Agarwal 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. Reviewed-by: Bryan O'Donoghue Signed-off-by: Dikshita Agarwal Signed-off-by: Vishnu Reddy --- 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 246ad0abbac3..bd922a12045c 100644 --- a/drivers/media/platform/qcom/iris/iris_buffer.c +++ b/drivers/media/platform/qcom/iris/iris_buffer.c @@ -492,39 +492,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_firmware_data *firmware_data = inst->core->iris_firmware_data; - const u32 *internal_buf_type; - u32 internal_buffer_count, i; if (inst->domain == DECODER) { if (V4L2_TYPE_IS_OUTPUT(plane)) { - internal_buf_type = firmware_data->dec_ip_int_buf_tbl; - internal_buffer_count = firmware_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 = firmware_data->dec_ip_int_buf_tbl; + *internal_buffer_count = firmware_data->dec_ip_int_buf_tbl_size; } else { - internal_buf_type = firmware_data->dec_op_int_buf_tbl; - internal_buffer_count = firmware_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 = firmware_data->dec_op_int_buf_tbl; + *internal_buffer_count = firmware_data->dec_op_int_buf_tbl_size; } } else { if (V4L2_TYPE_IS_OUTPUT(plane)) { - internal_buf_type = firmware_data->enc_ip_int_buf_tbl; - internal_buffer_count = firmware_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 = firmware_data->enc_ip_int_buf_tbl; + *internal_buffer_count = firmware_data->enc_ip_int_buf_tbl_size; } else { - internal_buf_type = firmware_data->enc_op_int_buf_tbl; - internal_buffer_count = firmware_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 = firmware_data->enc_op_int_buf_tbl; + *internal_buffer_count = firmware_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) { @@ -559,29 +561,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_firmware_data *firmware_data = inst->core->iris_firmware_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 = firmware_data->dec_ip_int_buf_tbl; - internal_buffer_count = firmware_data->dec_ip_int_buf_tbl_size; - } else { - internal_buf_type = firmware_data->dec_op_int_buf_tbl; - internal_buffer_count = firmware_data->dec_op_int_buf_tbl_size; - } - } else { - if (V4L2_TYPE_IS_OUTPUT(plane)) { - internal_buf_type = firmware_data->enc_ip_int_buf_tbl; - internal_buffer_count = firmware_data->enc_ip_int_buf_tbl_size; - } else { - internal_buf_type = firmware_data->enc_op_int_buf_tbl; - internal_buffer_count = firmware_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]]; @@ -635,30 +620,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_firmware_data *firmware_data = inst->core->iris_firmware_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 = firmware_data->dec_ip_int_buf_tbl; - internal_buffer_count = firmware_data->dec_ip_int_buf_tbl_size; - } else { - internal_buf_type = firmware_data->dec_op_int_buf_tbl; - internal_buffer_count = firmware_data->dec_op_int_buf_tbl_size; - } - } else { - if (V4L2_TYPE_IS_OUTPUT(plane)) { - internal_buf_type = firmware_data->enc_ip_int_buf_tbl; - internal_buffer_count = firmware_data->enc_ip_int_buf_tbl_size; - } else { - internal_buf_type = firmware_data->enc_op_int_buf_tbl; - internal_buffer_count = firmware_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]]; @@ -694,30 +662,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_firmware_data *firmware_data = inst->core->iris_firmware_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 = firmware_data->dec_ip_int_buf_tbl; - len = firmware_data->dec_ip_int_buf_tbl_size; - } else { - internal_buf_type = firmware_data->dec_op_int_buf_tbl; - len = firmware_data->dec_op_int_buf_tbl_size; - } - } else { - if (V4L2_TYPE_IS_OUTPUT(plane)) { - internal_buf_type = firmware_data->enc_ip_int_buf_tbl; - len = firmware_data->enc_ip_int_buf_tbl_size; - } else { - internal_buf_type = firmware_data->enc_op_int_buf_tbl; - len = firmware_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]]; @@ -788,18 +739,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_firmware_data *firmware_data = inst->core->iris_firmware_data; const u32 *internal_buf_type; u32 internal_buffer_count, i; int ret; - if (inst->domain == DECODER) { - internal_buf_type = firmware_data->dec_ip_int_buf_tbl; - internal_buffer_count = firmware_data->dec_ip_int_buf_tbl_size; - } else { - internal_buf_type = firmware_data->enc_ip_int_buf_tbl; - internal_buffer_count = firmware_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