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 BDA69306767 for ; Sun, 31 May 2026 05:55:33 +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=1780206935; cv=none; b=DOZE9UZ+c+FujH/L/ZcdoDIZUo0P6BYsF/u3QgwLt3VURI8SHi3vpzDcdPU8ooNAhMt8qnKGVyXbC4KXGt3P2NC+LT+RDpPDpG5ZihQupkcKbIKceArtBfWTM+NDkR813kBv2AtjLqMxIc9Q1imw4lznKdbdJjLmXvxeqc0oZ4U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780206935; c=relaxed/simple; bh=2wDUGwNJnnoaQiVEwY7nGl7/imywJz1LeFcyb3cZxEc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ORxoSi90K6MdWRptiiHfxpwpiR9tvIt9AUGMHKyWNyWWkGs08mBDutEJJ1iG+yg6rLQfdnGneS3pJJNKLogWuAvE1ZQOEEwtINFuYfamVj1p8KFiwILAoA4GnTp+QrbJBipPGsj1gzQ4IA8GAxVZ4RQz4OlUaGwLRHH9VIgGeQQ= 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=eLuF/427; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Omz2gJHL; 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="eLuF/427"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Omz2gJHL" 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 64V4X2fP581303 for ; Sun, 31 May 2026 05:55: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= BXM56e/y7AP/IChoOzUGo6IPhuY5BvOU0TGBXjBtMEM=; b=eLuF/427Mw84TC4r Z9WzOCmiWQZVcSDN1H98pOsKVWoaX7DZPz9kfC7x4NlGqhzodNklTolZzWHVhldz RBLnD57v7cIw9TnXGUwNHPjBM/JRqSvZOJ0Iui8DLjOY2VJ2Fwk6NZF391cLE4/0 2nUAlFTre/Q7u3XLNiIPlsxb1CxWZTOy2ca+FhbM0iyN8aaZGu5tJIZbF5a02sIt JnlWtY1KHRUBBB0IxAL2BrZzK+fZLiVBHzlSJK5Aha7Sc0rCBsnZbA8kgT+LM25s oB+4oHjMYinkdDs3WeiYWwMwDzeTaa0/4/DEastswHH1l0+j2xMyzY+Y4+LtFz7x BCHyXA== 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 4efn8pkf5b-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sun, 31 May 2026 05:55:32 +0000 (GMT) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2bd04e4fe3dso135997895ad.3 for ; Sat, 30 May 2026 22:55:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1780206931; x=1780811731; 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=BXM56e/y7AP/IChoOzUGo6IPhuY5BvOU0TGBXjBtMEM=; b=Omz2gJHLMV7OQm8OlvWjbmN2Te1VkH1opAPfMTX4pNqCtXNc155vvLsnBsGL3+0NfZ xtg1THGtDR1HD2bGRq6PvM3uYGwnahxGMudeB7CscCZC2AdfM1RmBgCcxuCEaYzgMBlT E6MgEQmJglsFg9obF/MhsYy8w4RqwBcCSCle9bx+tZtkj7MQbrUtIPfDmWt6NbP+6ve7 6fcE71ZZeGncHpQAaKDOUMIOEdb1sC74QoXe9DBCwBMWucTDEtlisje6z5U6Ic7Z1Afm NzvjpMxa44X6JkJVNUO5w6r5Q1hfvxx+x9YXlueAyKzVYlflwoyjrgk2+ekKWgmsOvEK BBpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780206931; x=1780811731; 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=BXM56e/y7AP/IChoOzUGo6IPhuY5BvOU0TGBXjBtMEM=; b=juTjmVrXByZvHb9NqbpPdKmiGC85VLYe6K1+Zqvn5OUITwy0aW9BvKECxjS9rxzDCp 051z9OTa7xX9HaNQrJbXaxz3Z4Ny19rfyzcdXh6YReyhdMh7bh58aTvd4Tdrb0QA6EI7 ABshNMlTTnE5M+U2sSk06VKZTK5wb6bbk5yq0RVet0Y/Ay91vkU/xVRYJGbDoCk00MjO QCxSl30Zlgn1TgrI9S2vYx19ymNFKHPEOj9GYMNKfIdG5wroi3D7L6fOHHTozZHV9UI5 EoKP37PTnLz+p1kLqeTC6bb00DLMXpR15Rae2jMLWmpagUsbyH3FU9rWUYu0ayD8feXz yg8Q== X-Forwarded-Encrypted: i=1; AFNElJ9/9ZzgC2fV9fS+y/V+HOE7JJDm1pmyGPeqJGa7xZ2Fmh5LdLjjTxApeUnKKosuNJoAqqTJNETxw2ZXNJA=@vger.kernel.org X-Gm-Message-State: AOJu0YwSGMTlddDG8tv9tHfgHUxH0rRxLpuwmPjkdmWwUDDN9XZYpg+5 HGp4d1KATcW8oPTIlok5JMJah57f878XXYTx7wpHvAew1uIRUG+Yvi5hEL4gPMTh9ynGDz4/4Ku lPVeHuCZkKs9ALzejq7WGYnqWNHLalitSgJr4mCHLbpqhukxCgp97kHJHNb5QYUhBtc0= X-Gm-Gg: Acq92OGM4ITMt1DLAMtNvpJ8fxOcvDSUUdmx2svjSP9/WSgJrmp5eA5laDc8HoWFNhf GJKmOVfJAoN7WErcJuqVqOJo/ABaKab0OZfwhdUFOAlRfK9nARfV4x+93IdKnlUldNOB2hLwLrq AkU3j70WSzaPlqvpW0b0ZZ4FY92FhirJVkTu+fr0zSCo5s+U6vIsetrOUP1+33N+D5hOFItBX5+ BzRFcefUF5sIPSdc6Ls+5cEuq7wM0q6iA+713nyfcUJ8ieRw9oate8AP3te9jA9whgFW6vL5We7 ubEHDo6fRFN54LkhzEeSv603PmrqBGnC98D3Nf7vYUZgBZqNkKROPYnZohcKVezInQo/Tpr/06+ 5u1bP5Qr3wBUXbnGj0Gdd0cPq+gBq2szLQBCjkTUIS+2Yp01UHVFdUJcdxmYQ4lT5xw== X-Received: by 2002:a17:903:1905:b0:2ba:924b:3948 with SMTP id d9443c01a7336-2bf367e4391mr77834255ad.15.1780206931499; Sat, 30 May 2026 22:55:31 -0700 (PDT) X-Received: by 2002:a17:903:1905:b0:2ba:924b:3948 with SMTP id d9443c01a7336-2bf367e4391mr77834065ad.15.1780206931035; Sat, 30 May 2026 22:55:31 -0700 (PDT) Received: from hu-bvisredd-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2bf239e702fsm67124375ad.4.2026.05.30.22.55.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 May 2026 22:55:30 -0700 (PDT) From: Vishnu Reddy Date: Sun, 31 May 2026 11:20:35 +0530 Subject: [PATCH v3 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: <20260531-iris-code-improvement-v3-1-4c699c3dd719@oss.qualcomm.com> References: <20260531-iris-code-improvement-v3-0-4c699c3dd719@oss.qualcomm.com> In-Reply-To: <20260531-iris-code-improvement-v3-0-4c699c3dd719@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: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , Vishnu Reddy X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1780206921; l=8143; i=busanna.reddy@oss.qualcomm.com; s=20260216; h=from:subject:message-id; bh=BZOdvz5iarQDnl8uGdnmlUoVqz3/4hTjx21nuSXgFvI=; b=03jCnFQheIXzUvky9qOzq4x7dQ6FDyu4wTNiebYH+IT83uTXII/QHXGW3d850PoMWl+Vl2dv4 g/sZ2OfV9pUCvX81x/TV69lArDXznK7qjtYbno6SRKncTfZlw3/Dj0L X-Developer-Key: i=busanna.reddy@oss.qualcomm.com; a=ed25519; pk=9vmy9HahBKVAa+GBFj1yHVbz0ey/ucIs1hrlfx+qtok= X-Proofpoint-GUID: VeNmGRZEiLXhRueXYTh68-TResVZKx0Z X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTMxMDA2MiBTYWx0ZWRfX9lPbzkMUtlcA mHisPV6JLJDGqCUYGiSs88ssacqzSH1UHiwfCjAmtSAA0MxoQI4HMDEddfjiNPobO3aFMWgMBxc EFYjk37aAWLQpkHMf+wvsxqL4IsH7aRHWZVgjVmQHk6lb1NQ4qvQ27UeYa2liDGJ9CTysKNTm9w KU9p4Yvv0vPL9dWPKJgvLiILdKERfMpuRU5gr3W0ZgY3yRuiF1T3DN1k2gv0DjChCleFXsaTJrQ c0tNlrsBEWd0IBmewS17l9Ja24kAxvFi4XcJOw3LQ2WuXkg9bYpLO0711yG1VNC1jADpwYpbAaa E8W0TTLYSD7QS/6tLGLbW1qV7CYIV/EMDqfh8n9Zu6c1SmhWcYlE+y0CO9CbMF664z+UmY/J5a8 QSJkKdCECK45lNd/WVa+dQx4ZhYDQKnLJ2IcaqSWQho+tb1ox3XWaYZICI6HqVRyKnKgd5daqq2 Db76seyad6fdV1NIiGw== X-Authority-Analysis: v=2.4 cv=NvvhtcdJ c=1 sm=1 tr=0 ts=6a1bcd54 cx=c_pps a=JL+w9abYAAE89/QcEU+0QA==:117 a=fChuTYTh2wq5r3m49p7fHw==:17 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA: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=324X-CrmTo6CU4MGRt3R:22 X-Proofpoint-ORIG-GUID: VeNmGRZEiLXhRueXYTh68-TResVZKx0Z X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-05-31_02,2026-05-28_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 lowpriorityscore=0 bulkscore=0 impostorscore=0 clxscore=1015 adultscore=0 malwarescore=0 priorityscore=1501 phishscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605210000 definitions=main-2605310062 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 ef7f6f931557..73b4d3381e47 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_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) { @@ -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_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]]; @@ -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_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]]; @@ -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_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]]; @@ -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_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