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 D187639768C for ; Fri, 13 Mar 2026 13: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=1773408049; cv=none; b=Cz8E9Zx0bopLhcLQoiHBGDVUol9uQWGEVC3DKECfTp0CGScDV8L3vaJOuB72H1xFxQz7quE7DSeG1/rf+5sv5ZXtPeOndJ/aQZffoUSXkyKt9jcHqukc2BEuttmP9b8Ypj10/N80b1NHXSauoI71wpqft3Ep8ApiPxEeVHfI77E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773408049; c=relaxed/simple; bh=4cpK+rYSKMeDiyBq3UdtWW7Lob7DBlHMDZuSeWAVS50=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YSvB4CPpR51RFuC9p4x4fEMnrfiDIr1tjj9caqJSkhb90YV7PAvtOjqrZtr22oeTgG4qUVK/XZoa+GctvxWdD5z1fxheVHAIT/vB6Zxn2xyLEvLQPWVBUH//L2fgqh0v7/bOdR60qcvmrfLOh6+pt9QPWqDJ4dEufHdk34uIHgE= 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=f5tjYT0i; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=drYOrDxc; 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="f5tjYT0i"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="drYOrDxc" 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 62D9B73C3906326 for ; Fri, 13 Mar 2026 13: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= +XJtZ8JERmoHl90VOho+Ves1mxqLVsGuyUf8eQ5EWEA=; b=f5tjYT0i8mmhD4cZ +ctPemXVYi12YEPcf163V3xtBrgo4Dl/5tlIpNn21Q31Vu8OJyHX0uy1Sy8dg+VH CIYw/K3/zqfA5nCGpgX3aZBu+0ofHVOZRkFh+8CYRmz8YmUmtYMAFOtjgV836CBw /5u1Kf6kOGUgtf5TrtzDb0rYVMZilaqv44fmq/q8ziyBhwUpVJxqUM0GZX031cO1 aEMrid8jmItvCep/FAp6JfkYN7dyMdUox9BMm8SkqbJTAxW1JEi7HMGC6g33SSy3 AzX0PSlTkSI81RTwLRNtqEuBK81ifQ1dtQhR9BQzbM8s2PRB8Xki0w2CHz0rrUSH Mqhq/Q== 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 4cvfqs8sd8-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 13 Mar 2026 13:20:46 +0000 (GMT) Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-8297d261a67so1031755b3a.0 for ; Fri, 13 Mar 2026 06:20:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773408046; x=1774012846; 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=+XJtZ8JERmoHl90VOho+Ves1mxqLVsGuyUf8eQ5EWEA=; b=drYOrDxcBmK/OZfpfTcAmGdvrC6Bmn2ThGBRCqlmo+mlPLDr52PhBSWZvZ9CEOHE4h JIGgDLcMsEHunJteU+Ob92kgd+ERXkmnOepnBG+23ZMCA2KxRpBJhcs117JWtFcEtW57 NWFFEGrd+yN8BQfr5i4QkTpYfgL/w2Nh+5FYu+hgZGLIF4o3c2pn1pj43wZseWey/Dox LQ1igDnhOsZnIpvIE3Zo3zP6gANC4IJeVbTCKB9geryRANbHxThrNcmG8tyhw+NhdkSW ndNQJshcWuaSBokl+DWJsxxHE6WUZDe0IqQn7pdbMWIQgn/Dg44x8WKzqzD9gxYsAY7C VDEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773408046; x=1774012846; 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=+XJtZ8JERmoHl90VOho+Ves1mxqLVsGuyUf8eQ5EWEA=; b=GXgFAgNP5GCmYkVSDo8/Da9Rvat2nWONXjuNymux0CDB7wGmcfnlg7qF+MhNC834mw Skolpa94Cj/Kwr7bsyXtxSmprC+Tnm9Si26/a1USTOt0X/v9kPKkI72Un1gcLrM4IqF1 m1d7icONmg4L0jrDXKtv+U289sbRtL75olQ3eIXgTGvjAoVZ6YfmUirqt/U30yzUA68i axissmWi7UjgKu5NdRt/bdcdWZuQnPIkvRYWPEPGt66bwqXZUGy5Z0+LRPrRzE+nUP3U SsPHoQRwfTnfqrWSWNzstzPelFnpnpmq43wvklW7iz/D+GQ0m8ADDuP5Xm3/tPwF9miO Ar9A== X-Forwarded-Encrypted: i=1; AJvYcCUZjZh5nXGrdopnKbp+otNHZS1najJcfS1NvCOhoL0kjeH7nLnP+JmU4K6siFBBaaucnn1ASRaos/mCOw==@vger.kernel.org X-Gm-Message-State: AOJu0YzN2504qzMIhA2n2tqViA5EeSrplGBxuElziC88rbREIA6ryVsu dfTQform2b/eNrTeDM+Gz4G5DDuQkQbhxDtHGjUItt3+iW9MJSP5ypswPjvzJkEA94OQbJ0hKL/ Y2ujNoMwrlFc8vtmYtHuWKrV2Cki6FUIV1OBzsMQ2A4qjH1MUYe8+F3X1VDP5uYGmMw== X-Gm-Gg: ATEYQzyy6oNBgrhOlOPZK2fZQH1F1NaIgsWSZQEegiAKxZ3w6FCH3RUEORY4Amo0A6K 1HVnOHZ2B8q9TzZB2A1/cwBewOt9soLpcRYy9f/Sj9U0qqVl5bYm2plfzm5jqfmiCy99qO5tHg+ stSMJGhHmm4OLruBlvyo/6lWSfcok5Bz+p+lhN0J0XTHqrgm0gVZl2mVUL5P85RlP667AgfX9+H NwkA6Pu50ReA9kgmIzjKDuStTVmV+xwwtUeZf5icm6YZBt1Os7D3iRnF/XNHzsJmpRs5m28QKuX eL7d2kjQm6vD3aH8TM5IPDfNFWtp0CcXKns5v3se2IkziKWaN4UhuROQ7hAnl3c+HrXvHn2JCwK 7DxQwfBUfMs8HVzZGkPnCB1GM0pU5DyPS3j/dWbKmwYud+/3F1BCr/oK9 X-Received: by 2002:a05:6a00:94e8:b0:829:6f7d:3093 with SMTP id d2e1a72fcca58-82a1990bcb8mr2879864b3a.48.1773408045707; Fri, 13 Mar 2026 06:20:45 -0700 (PDT) X-Received: by 2002:a05:6a00:94e8:b0:829:6f7d:3093 with SMTP id d2e1a72fcca58-82a1990bcb8mr2879816b3a.48.1773408045070; Fri, 13 Mar 2026 06:20:45 -0700 (PDT) Received: from hu-vgarodia-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82a0724407csm5775254b3a.8.2026.03.13.06.20.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2026 06:20:44 -0700 (PDT) From: Vikash Garodia Date: Fri, 13 Mar 2026 18:49:40 +0530 Subject: [PATCH v3 6/7] media: iris: add iris4 specific H265 line buffer calculation Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260313-kaanapali-iris-v3-6-9c0d1a67af4b@oss.qualcomm.com> References: <20260313-kaanapali-iris-v3-0-9c0d1a67af4b@oss.qualcomm.com> In-Reply-To: <20260313-kaanapali-iris-v3-0-9c0d1a67af4b@oss.qualcomm.com> To: Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Dmitry Baryshkov , Conor Dooley , Saravana Kannan , Joerg Roedel , Will Deacon , Robin Murphy , Stefan Schmidt , Hans Verkuil , Krzysztof Kozlowski , Vishnu Reddy , Hans Verkuil Cc: linux-arm-msm@vger.kernel.org, linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, iommu@lists.linux.dev, Bryan O'Donoghue , Vikash Garodia X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1773407994; l=4313; i=vikash.garodia@oss.qualcomm.com; s=20241104; h=from:subject:message-id; bh=4cpK+rYSKMeDiyBq3UdtWW7Lob7DBlHMDZuSeWAVS50=; b=kPpvlinusoZu/UwTxqT8WAUNw2mdn3r4dPJcxzKn143eGjy/VdW0j3HptWkRtMAdt0E6ZUBRG WlBPThAYLuzCMORnp/lP/eEOyPDgscnD6qn8TOS/vgzo+ZufJj1jORT X-Developer-Key: i=vikash.garodia@oss.qualcomm.com; a=ed25519; pk=LY9Eqp4KiHWxzGNKGHbwRFEJOfRCSzG/rxQNmvZvaKE= X-Proofpoint-ORIG-GUID: hkByb4DiE9_tg_nJhT2RZnOnXYcg00DR X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzEzMDEwNiBTYWx0ZWRfX1wpXEnc94d5Z c60KLAkX1zXQr8C4RT9NGt594MfZ60qaLYLOwI1llnpO1MXHDfh3oA4lj4WxjCHzsS0wG6SpeIM Oi1KPL3WyxVGGUhZmcLefN2TykhaPF7vBHzY7Ti9PZYAbGU/EJkS3R91ETVPsIA1qphHOl+8/YW a6pV2uy4DCCV745RUEbFhbvyYWsTlPKO4xm9jZNkhWZfRNb234t3sB0SvMNAOPnPOe+oIuSrrE9 Fi3wz/e68RQ3t6mmqkUyJj0D/5vqS5XLmyogDCu5Bt/NBUh4KJ1Y4JqzmNewd57s5YeiIBQdyF1 v4tzmspE2cjoPVsADcVALv+/shuddBnoMZMnhZ47ONBMyNiDvY0vdbU23PMBn/EiSA6ErSvwsjD afbm7ppnModbN4PfXwE1BZeAnwuVVod7n9MTlzMPseRmxxZJB0eh5Ndv7GCKTLmiqUSkNaz8Gmd 6xS/8eR5ftchNeVI06g== X-Proofpoint-GUID: hkByb4DiE9_tg_nJhT2RZnOnXYcg00DR X-Authority-Analysis: v=2.4 cv=GoNPO01C c=1 sm=1 tr=0 ts=69b40f2e cx=c_pps a=mDZGXZTwRPZaeRUbqKGCBw==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=MVHsPVnmqsIq8L41Ef0A:9 a=QEXdDO2ut3YA:10 a=zc0IvFSfCIW2DFIPzwfm:22 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-03-13_02,2026-03-13_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 malwarescore=0 lowpriorityscore=0 spamscore=0 impostorscore=0 bulkscore=0 priorityscore=1501 phishscore=0 clxscore=1015 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603130106 The H265 decoder line buffer size calculation for iris4 (VPU4) was previously reusing the iris3 formula. While this works for most resolutions, certain configurations require a larger buffer size on iris4, causing firmware errors during decode. This resolves firmware failures seen with specific test vectors on kaanapali (iris4), and fixes the following failing fluster tests - PICSIZE_C_Bossen_1 - WPP_E_ericsson_MAIN_2 Co-developed-by: Vishnu Reddy Signed-off-by: Vishnu Reddy Signed-off-by: Vikash Garodia --- drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 51 +++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c index 9270422c16019ba658ee8813940cb9110ad030a1..a4d599c49ce9052b609b9cedf65f669ba78b5407 100644 --- a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c +++ b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c @@ -1755,6 +1755,55 @@ static u32 hfi_vpu4x_buffer_line_vp9d(u32 frame_width, u32 frame_height, u32 _yu return lb_size + dpb_obp_size; } +static u32 hfi_vpu4x_buffer_line_h265d(u32 frame_width, u32 frame_height, bool is_opb, + u32 num_vpp_pipes) +{ + u32 num_lcu_per_pipe, fe_left_lb, se_left_lb, vsp_left_lb, top_lb, qp_size, + dpb_obp = 0, lcu_size = 16; + + num_lcu_per_pipe = (DIV_ROUND_UP(frame_height, lcu_size) / num_vpp_pipes) + + (DIV_ROUND_UP(frame_height, lcu_size) % num_vpp_pipes); + + fe_left_lb = ALIGN((DMA_ALIGNMENT * num_lcu_per_pipe), DMA_ALIGNMENT) * + FE_LFT_CTRL_LINE_NUMBERS; + fe_left_lb += ALIGN((DMA_ALIGNMENT * 2 * num_lcu_per_pipe), DMA_ALIGNMENT) * + FE_LFT_DB_DATA_LINE_NUMBERS; + fe_left_lb += ALIGN((DMA_ALIGNMENT * num_lcu_per_pipe), DMA_ALIGNMENT); + fe_left_lb += ALIGN((DMA_ALIGNMENT * 2 * num_lcu_per_pipe), DMA_ALIGNMENT); + fe_left_lb += ALIGN((DMA_ALIGNMENT * 8 * num_lcu_per_pipe), DMA_ALIGNMENT) * + FE_LFT_LR_DATA_LINE_NUMBERS; + + if (is_opb) + dpb_obp = size_dpb_opb(frame_height, lcu_size) * num_vpp_pipes; + + se_left_lb = max_t(u32, (ALIGN(frame_height, BUFFER_ALIGNMENT_16_BYTES) >> 3) * + MAX_SE_NBR_CTRL_LCU16_LINE_BUFFER_SIZE, + max_t(u32, (ALIGN(frame_height, BUFFER_ALIGNMENT_32_BYTES) >> 3) * + MAX_SE_NBR_CTRL_LCU32_LINE_BUFFER_SIZE, + (ALIGN(frame_height, BUFFER_ALIGNMENT_64_BYTES) >> 3) * + MAX_SE_NBR_CTRL_LCU64_LINE_BUFFER_SIZE)); + + vsp_left_lb = ALIGN(DIV_ROUND_UP(frame_height, BUFFER_ALIGNMENT_64_BYTES) * + H265_NUM_TILE_ROW, DMA_ALIGNMENT); + + top_lb = ALIGN((DMA_ALIGNMENT * DIV_ROUND_UP(frame_width, lcu_size)), DMA_ALIGNMENT) * + FE_TOP_CTRL_LINE_NUMBERS; + top_lb += ALIGN(DMA_ALIGNMENT * 2 * DIV_ROUND_UP(frame_width, lcu_size), DMA_ALIGNMENT) * + FE_TOP_DATA_LUMA_LINE_NUMBERS; + top_lb += ALIGN(DMA_ALIGNMENT * 2 * (DIV_ROUND_UP(frame_width, lcu_size) + 1), + DMA_ALIGNMENT) * FE_TOP_DATA_CHROMA_LINE_NUMBERS; + top_lb += ALIGN(ALIGN(frame_width, BUFFER_ALIGNMENT_64_BYTES) * 2, DMA_ALIGNMENT); + top_lb += ALIGN(ALIGN(frame_width, BUFFER_ALIGNMENT_64_BYTES) * 6, DMA_ALIGNMENT); + top_lb += size_h265d_lb_vsp_top(frame_width, frame_height); + + qp_size = size_h265d_qp(frame_width, frame_height); + + return ((ALIGN(dpb_obp, DMA_ALIGNMENT) + ALIGN(se_left_lb, DMA_ALIGNMENT) + + ALIGN(vsp_left_lb, DMA_ALIGNMENT)) * num_vpp_pipes) + + ALIGN(fe_left_lb, DMA_ALIGNMENT) + ALIGN(top_lb, DMA_ALIGNMENT) + + ALIGN(qp_size, DMA_ALIGNMENT); +} + static u32 iris_vpu4x_dec_line_size(struct iris_inst *inst) { u32 num_vpp_pipes = inst->core->iris_platform_data->num_vpp_pipe; @@ -1770,7 +1819,7 @@ static u32 iris_vpu4x_dec_line_size(struct iris_inst *inst) if (inst->codec == V4L2_PIX_FMT_H264) return hfi_buffer_line_h264d(width, height, is_opb, num_vpp_pipes); else if (inst->codec == V4L2_PIX_FMT_HEVC) - return hfi_buffer_line_h265d(width, height, is_opb, num_vpp_pipes); + return hfi_vpu4x_buffer_line_h265d(width, height, is_opb, num_vpp_pipes); else if (inst->codec == V4L2_PIX_FMT_VP9) return hfi_vpu4x_buffer_line_vp9d(width, height, out_min_count, is_opb, num_vpp_pipes); -- 2.34.1