From nobody Sun Apr 5 13:14:46 2026 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 8D03E1B4223 for ; Wed, 1 Apr 2026 03:15:14 +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=1775013316; cv=none; b=iylAjVzOn4wcPmlaNWhV2x01lSIFCdRpPG1PEastX+vZxmxV/rdKJfyQIERh2OWiK8FozC2cHciVeP7EoMKp83IH7VmISSyht0BSo+YD6ST0DC/7Y+IcIb+BrAzyiPyDeKv4kbrp2BIOQ9DVFFhcViOrdp+0mcpFiCH/mbuSI0g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775013316; c=relaxed/simple; bh=qeXUWt81Od/1BBCsl32Yit+xmcukfpf/JR+jMfwrXnA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IU/vi9pS/0tJeHSTZRHgu/gOATZSb8UhqRiVB1a3QqP4olBEORuDx2nIq+GLK7VAqk0i+6ZhRJQXuflnFup5rMp99p62psQhoxYuiTnX5NMrc8QbzQJfbhi8aPr6Ofyo/yzs3Tc0sWrugp8XSuiHRprTdGOCopruNKXQJ430jDg= 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=losKve+O; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=KHiF/ayD; arc=none smtp.client-ip=205.220.168.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="losKve+O"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="KHiF/ayD" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62VNWd9R3927210 for ; Wed, 1 Apr 2026 03:15:13 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= TDXM//vcr2Es8afO4ZpYnLOTtuH4I/1jSWkpN4LSW+Y=; b=losKve+OarB6rCbr 4RaQgzsVGg+DgwOsw1ZFSJMPk5vM5NpgOuAhjjSzGqGE1JYDrLSYKP17IeoTQjCf xqiMuxE6yfG4oulDlVwG33EKQmrcKgTriXr8LgREz8ilKFKK3WoysQ9E8dclKZgn /eOiZEoR7kKzaXKBw7QYMtfXYLjAPgVh4vkYRpeTphPmxUAR+QTjfPHZSb+gC4T0 x+AJwskLYcS3/8oqiBG8JO/gLK97qawlEVU0AHqgRE9441sxZIXKeM01GBrfAp8Q MhKE7AU4PfBuTqqeZa+tVjLMVslowCKtIL2jAYbzvr1RUL2XFhKsKzspbgApu5Ml h7roTA== Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4d8b934f5s-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 01 Apr 2026 03:15:13 +0000 (GMT) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2b23c909256so55957285ad.0 for ; Tue, 31 Mar 2026 20:15:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1775013312; x=1775618112; 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=TDXM//vcr2Es8afO4ZpYnLOTtuH4I/1jSWkpN4LSW+Y=; b=KHiF/ayDij4Khn88/6TftFETHQ97Jwq8ylNIVYnsG8xBe/sbXtD+QRe41QlGssyxA4 3VobO6XVQVP8j2KZ/bizBDnPYdMu20C2C3vd/1ocTE6TXCSz+Yeq0GJ1/d9YCDSo2JC5 C1KfjRyeyEwrbRz4TBCT37srCp8YWssA4OK9ncoifE1U4Qv4d246PpkQJIcyXwAjT+jX biOQSh1w/CvjQZhWiOzs0+CaA/ILTw3NAD4/O+ZqEqQMCQCbqtH1kjQZRssf3Bq+N5Pi qTIU5/MK8o7Yl5xk4pJQvEU9OItT7M8EylJas44tjSLZ8tLQRQ9hr/sVTDZIyJ3g0FIV RUTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775013312; x=1775618112; 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=TDXM//vcr2Es8afO4ZpYnLOTtuH4I/1jSWkpN4LSW+Y=; b=M9rJ36B6u8FnqApihECruH6gvBPiQ0psPqsz0yMu3gQXfeMSwdEm4A9UwBk0aE1ioq wOjGC7iSv3uf/RdzBfWPzHmHLcgwiyZHMrIWENZuZutRyh2AAfndfofpExqFhekDKRl/ ezJ+TTFtmeeUMAFzOsLTiJ3nYlUAmKSVs3Gv8+9wBLNfnWMwwVgu89mTpdBH0gq4Xj9h jE5OAn5pAQCdwzpV+VRXtIKC6rPKkbrJMxy5U3q0iP+hBxvYhBYn7Ib3H8qQureIAFZv x1XaaR/1o+uDGsccdsbFsW/m/NLlcQRfJiyPY1SORtrlVI0Cy5fJUvtKM/t4yyfocC/b 32lA== X-Forwarded-Encrypted: i=1; AJvYcCWyr3SgbdxbOU9GvX1EoyOwpglqqmFHXhdcHh/jg+ir3ijRMnWjR26HPakjaPBVe70qDzgOSEzXIBkMjSA=@vger.kernel.org X-Gm-Message-State: AOJu0YzMrRNXaxKR0jeS2YOVY2UAvxJWEbAiDvXlheY3lpFjmRN8KHoi 3DzgzWpsYO5uuYrkpZxubAnGbNqKPHs2aCEYoSFE0PT2daLnAHNHeT/L1xSseCk/AHBO7OP5QsU xbrQlawOEnJLcW7+LDtNBYE1qi+VeG3njInDqlARD5EZ9eqnSbInS+QdVbLlLkH51OsU= X-Gm-Gg: ATEYQzzVziqwVyz561Vkfhrvh2ihnFABNjKo32TcinBGYa8Xp6zBKJNp2z2Q0Mcj/kI ly0bhxGaF4OLdL03G4351g5QoYvHWKr+EgQX9ITdGi8t6duuAeEKL+daYDOsERB8G95n7BR9xCi v+52kmzhncRqGfgcEq5Ii0bX0fpdjUYJzSJprpLBp96Tsp9kIaedaMD0bhbrq0Sv5GP4lb7D7KW ChXdC5VkiLQPmodEn1lC2lgegKoWW/2BBcXA22S/5kmgAyN67ctThTLvPFIUk9f+TeTkOaxLJzE 62aGkk4+U626mDSMJPczGxmSYoJFG2aAlzKD2+zCOUbrzDqKHpc0DoxNKpOSKG57AILOURctoUY yKSPfdd/14/c2TF9/udF6hLna/R4Sxyyny5QVmoDZVPBWJb/ot7n4bexOwAWk2PhRQQSQKXckI+ loD+WjpVv7/vqP91ZoP4fM X-Received: by 2002:a05:6a20:a127:b0:398:ac0d:9a06 with SMTP id adf61e73a8af0-39ef7762cfamr1762675637.55.1775013311962; Tue, 31 Mar 2026 20:15:11 -0700 (PDT) X-Received: by 2002:a05:6a20:a127:b0:398:ac0d:9a06 with SMTP id adf61e73a8af0-39ef7762cfamr1762614637.55.1775013311426; Tue, 31 Mar 2026 20:15:11 -0700 (PDT) Received: from WANGAOW-LAB01.ap.qualcomm.com (tpe-colo-wan-fw-bordernet.qualcomm.com. [103.229.16.4]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c76ad00a246sm3246584a12.16.2026.03.31.20.15.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2026 20:15:10 -0700 (PDT) From: Wangao Wang Date: Wed, 01 Apr 2026 11:13:45 +0800 Subject: [PATCH v6 3/6] media: qcom: iris: Add B frames support for encoder 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: quoted-printable Message-Id: <20260401-batch2_iris_encoder_enhancements-v6-3-7022af3401ff@oss.qualcomm.com> References: <20260401-batch2_iris_encoder_enhancements-v6-0-7022af3401ff@oss.qualcomm.com> In-Reply-To: <20260401-batch2_iris_encoder_enhancements-v6-0-7022af3401ff@oss.qualcomm.com> To: Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab Cc: quic_qiweil@quicinc.com, Renjiang Han , Wangao Wang , linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1775013294; l=8836; i=wangao.wang@oss.qualcomm.com; s=20251021; h=from:subject:message-id; bh=qeXUWt81Od/1BBCsl32Yit+xmcukfpf/JR+jMfwrXnA=; b=90DcLKeXbPm5kkZ59QcpcrEZ+IZkbktTPySx12HxbkC1yDp2R/hbhUBZPwUXckK2t4CQV5hXs mdbftkOR+hZDkbHmfkKGLAFigRKS7T/h9CpemqTux+tZd9Rn5neYe4z X-Developer-Key: i=wangao.wang@oss.qualcomm.com; a=ed25519; pk=bUPgYblBUAsoPyGfssbNR7ZXUSGF8v1VF4FJzSO6/aA= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDAxMDAyMyBTYWx0ZWRfXwVbRIKZ+2/gu I7Nqtt6gkGZZr61xsX45qoOCH6I9NppYLWqQMByYpfhaY1M9EaNQHd6QNSYhtr87OhXkmU52O8+ 3FYjn/V9XxeHgMDQ2+JJ8yvlAw30GzEwCdG5RMwa9K9LlsiXYbImgBKfRFLwjPEetkynfzCDSbz MS1ohOSO4/SJ4vaRMIk7FcP75aHSkpEGe6RCZlcysoLSP+RXU9vxIfpMjRdm5qAzlltLe3lV4bF Mhzos/CQbjowfve5/VaC/iEoFg8k9+R3dcCIBZyY+wMYNTElhyz513KaYRcMJfdO5AUofQo6p4B 01vWUoJUDXPJIrkbCh+q7J7n80aCAEQ6qAfykgWIsmZnfb80KbpozpZ+bIXYAGzbrgABLXo39he H5AZtbog1L248E9DlN6gUm5Ut7hQNXYehytCtK4EylL+86TItS+eKyuNIb/zKYHK/PfXKYZ3Vn1 ksHsiof4zUMYdP3p7Fg== X-Proofpoint-ORIG-GUID: bYE2kcAuGf0b4fbi0uTaCQVdr9UhZiN2 X-Proofpoint-GUID: bYE2kcAuGf0b4fbi0uTaCQVdr9UhZiN2 X-Authority-Analysis: v=2.4 cv=NLjYOk6g c=1 sm=1 tr=0 ts=69cc8dc1 cx=c_pps a=IZJwPbhc+fLeJZngyXXI0A==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=IkcTkHD0fZMA:10 a=A5OVakUREuEA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=KKAkSRfTAAAA:8 a=WyURVOTWNNIHYkgbVKgA:9 a=QEXdDO2ut3YA:10 a=uG9DUKGECoFWVXl0Dc02:22 a=cvBusfyB2V15izCimMoJ: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-04-01_01,2026-03-31_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 suspectscore=0 impostorscore=0 spamscore=0 phishscore=0 priorityscore=1501 malwarescore=0 clxscore=1015 lowpriorityscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2604010023 Add support for B-frame configuration on both gen1 and gen2 encoders by enabling V4L2_CID_MPEG_VIDEO_B_FRAMES control. Reviewed-by: Dikshita Agarwal Tested-by: Neil Armstrong # on SM8650-HDK Signed-off-by: Wangao Wang --- drivers/media/platform/qcom/iris/iris_ctrls.c | 30 ++++++++++++++++++= ++++ drivers/media/platform/qcom/iris/iris_ctrls.h | 1 + .../platform/qcom/iris/iris_hfi_gen1_command.c | 8 ++++++ .../platform/qcom/iris/iris_hfi_gen1_defines.h | 10 ++++++++ .../platform/qcom/iris/iris_platform_common.h | 2 ++ .../media/platform/qcom/iris/iris_platform_gen1.c | 18 +++++++++++++ .../media/platform/qcom/iris/iris_platform_gen2.c | 10 ++++++++ drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 6 ++++- 8 files changed, 84 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.c b/drivers/media/= platform/qcom/iris/iris_ctrls.c index 87d10ce1a9a572c5242d425b5a02abba01f911b5..a6bd2eada52b68afd91032315c2= 701d8c74a9763 100644 --- a/drivers/media/platform/qcom/iris/iris_ctrls.c +++ b/drivers/media/platform/qcom/iris/iris_ctrls.c @@ -118,6 +118,8 @@ static enum platform_inst_fw_cap_type iris_get_cap_id(u= 32 id) return USE_LTR; case V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX: return MARK_LTR; + case V4L2_CID_MPEG_VIDEO_B_FRAMES: + return B_FRAME; default: return INST_FW_CAP_MAX; } @@ -225,6 +227,8 @@ static u32 iris_get_v4l2_id(enum platform_inst_fw_cap_t= ype cap_id) return V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES; case MARK_LTR: return V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX; + case B_FRAME: + return V4L2_CID_MPEG_VIDEO_B_FRAMES; default: return 0; } @@ -1161,6 +1165,32 @@ int iris_set_use_and_mark_ltr(struct iris_inst *inst= , enum platform_inst_fw_cap_ &hfi_val, sizeof(u32)); } =20 +int iris_set_intra_period(struct iris_inst *inst, enum platform_inst_fw_ca= p_type cap_id) +{ + const struct iris_hfi_session_ops *hfi_ops =3D inst->hfi_session_ops; + u32 gop_size =3D inst->fw_caps[GOP_SIZE].value; + u32 b_frame =3D inst->fw_caps[B_FRAME].value; + u32 hfi_id =3D inst->fw_caps[cap_id].hfi_id; + struct hfi_intra_period intra_period; + + if (!gop_size || b_frame >=3D gop_size) + return -EINVAL; + + /* + * intra_period represents the length of a GOP, which includes both P-fra= mes + * and B-frames. The counts of P-frames and B-frames within a GOP must be + * communicated to the firmware. + */ + intra_period.pframes =3D (gop_size - 1) / (b_frame + 1); + intra_period.bframes =3D b_frame; + + return hfi_ops->session_set_property(inst, hfi_id, + HFI_HOST_FLAGS_NONE, + iris_get_port_info(inst, cap_id), + HFI_PAYLOAD_STRUCTURE, + &intra_period, sizeof(intra_period)); +} + int iris_set_properties(struct iris_inst *inst, u32 plane) { const struct iris_hfi_session_ops *hfi_ops =3D inst->hfi_session_ops; diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.h b/drivers/media/= platform/qcom/iris/iris_ctrls.h index 996c83fdc6f492dc252771129fc1d62e8b7a7e07..609258c81517b71523b682ca994= 786cdd020b07f 100644 --- a/drivers/media/platform/qcom/iris/iris_ctrls.h +++ b/drivers/media/platform/qcom/iris/iris_ctrls.h @@ -41,6 +41,7 @@ int iris_set_ltr_count_gen2(struct iris_inst *inst, enum = platform_inst_fw_cap_ty int iris_set_use_ltr(struct iris_inst *inst, enum platform_inst_fw_cap_typ= e cap_id); int iris_set_mark_ltr(struct iris_inst *inst, enum platform_inst_fw_cap_ty= pe cap_id); int iris_set_use_and_mark_ltr(struct iris_inst *inst, enum platform_inst_f= w_cap_type cap_id); +int iris_set_intra_period(struct iris_inst *inst, enum platform_inst_fw_ca= p_type cap_id); int iris_set_properties(struct iris_inst *inst, u32 plane); =20 #endif diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c b/dri= vers/media/platform/qcom/iris/iris_hfi_gen1_command.c index 63377886b2fbe373a09492793b7638a75d443544..4d1b78c819a7cc11c0cec281217= 0d926b5f83c11 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c @@ -720,6 +720,14 @@ iris_hfi_gen1_packet_session_set_property(struct hfi_s= ession_set_property_pkt *p packet->shdr.hdr.size +=3D sizeof(u32) + sizeof(*ltr_mark); break; } + case HFI_PROPERTY_CONFIG_VENC_INTRA_PERIOD: { + struct hfi_intra_period *in =3D pdata, *intra_period =3D prop_data; + + intra_period->pframes =3D in->pframes; + intra_period->bframes =3D in->bframes; + packet->shdr.hdr.size +=3D sizeof(u32) + sizeof(*intra_period); + break; + } default: return -EINVAL; } diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h b/dri= vers/media/platform/qcom/iris/iris_hfi_gen1_defines.h index 34249fc0d047918c2463517b8303e30df3666b97..4343661e86065f5623b2c02c7ee= 808a3c47a8c41 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h @@ -155,6 +155,7 @@ #define HFI_PROPERTY_PARAM_VENC_LTRMODE 0x200501c #define HFI_PROPERTY_PARAM_VENC_MAX_NUM_B_FRAMES 0x2005020 #define HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE 0x2006001 +#define HFI_PROPERTY_CONFIG_VENC_INTRA_PERIOD 0x2006003 #define HFI_PROPERTY_CONFIG_VENC_MARKLTRFRAME 0x2006009 #define HFI_PROPERTY_CONFIG_VENC_USELTRFRAME 0x200600a #define HFI_PROPERTY_CONFIG_VENC_SYNC_FRAME_SEQUENCE_HEADER 0x2006008 @@ -484,6 +485,15 @@ struct hfi_ltr_mark { u32 mark_frame; }; =20 +struct hfi_max_num_b_frames { + u32 max_num_b_frames; +}; + +struct hfi_intra_period { + u32 pframes; + u32 bframes; +}; + struct hfi_event_data { u32 error; u32 height; diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/driv= ers/media/platform/qcom/iris/iris_platform_common.h index de9ab929aedfeba7aa2d9ee34a345811266b2ab5..0236f81fb47902c215a84814089= 50b3a329d872f 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_common.h +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h @@ -154,6 +154,8 @@ enum platform_inst_fw_cap_type { LTR_COUNT, USE_LTR, MARK_LTR, + B_FRAME, + INTRA_PERIOD, INST_FW_CAP_MAX, }; =20 diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen1.c b/driver= s/media/platform/qcom/iris/iris_platform_gen1.c index 45b4aeb7a84592983511890bd7fd499c1dd22df4..e01389bfb0ee1e6be72230bcd64= 97c00d87afaae 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_gen1.c +++ b/drivers/media/platform/qcom/iris/iris_platform_gen1.c @@ -295,6 +295,24 @@ static const struct platform_inst_fw_cap inst_fw_cap_s= m8250_enc[] =3D { .flags =3D CAP_FLAG_INPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, .set =3D iris_set_mark_ltr, }, + { + .cap_id =3D B_FRAME, + .min =3D 0, + .max =3D 3, + .step_or_mask =3D 1, + .value =3D 0, + .flags =3D CAP_FLAG_OUTPUT_PORT, + }, + { + .cap_id =3D INTRA_PERIOD, + .min =3D 0, + .max =3D 1, + .step_or_mask =3D 1, + .value =3D 0, + .hfi_id =3D HFI_PROPERTY_CONFIG_VENC_INTRA_PERIOD, + .flags =3D CAP_FLAG_OUTPUT_PORT, + .set =3D iris_set_intra_period, + }, }; =20 static struct platform_inst_caps platform_inst_cap_sm8250 =3D { diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen2.c b/driver= s/media/platform/qcom/iris/iris_platform_gen2.c index 176bf2141954a74c59dda99ac3af37befbf6a572..0713742e019479d81028c4df821= fef3af913eea5 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_gen2.c +++ b/drivers/media/platform/qcom/iris/iris_platform_gen2.c @@ -770,6 +770,16 @@ static const struct platform_inst_fw_cap inst_fw_cap_s= m8550_enc[] =3D { .flags =3D CAP_FLAG_INPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, .set =3D iris_set_use_and_mark_ltr, }, + { + .cap_id =3D B_FRAME, + .min =3D 0, + .max =3D 1, + .step_or_mask =3D 1, + .value =3D 0, + .hfi_id =3D HFI_PROP_MAX_B_FRAMES, + .flags =3D CAP_FLAG_OUTPUT_PORT, + .set =3D iris_set_u32, + }, }; =20 static struct platform_inst_caps platform_inst_cap_sm8550 =3D { diff --git a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c b/drivers/m= edia/platform/qcom/iris/iris_vpu_buffer.c index 891aed5091c7a0fd0bf1f1a3a7737d49e6d8cea2..0ed82dc2b8af8c789df1b8c10c1= a5afc51ef39d8 100644 --- a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c +++ b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c @@ -936,11 +936,15 @@ static u32 iris_vpu_enc_bin_size(struct iris_inst *in= st) =20 static inline u32 hfi_buffer_get_recon_count(struct iris_inst *inst) { + u32 bframe_count, ltr_count; u32 num_ref =3D 1; - u32 ltr_count; =20 + bframe_count =3D inst->fw_caps[B_FRAME].value; ltr_count =3D inst->fw_caps[LTR_COUNT].value; =20 + if (bframe_count) + num_ref =3D 2; + if (ltr_count) num_ref =3D num_ref + ltr_count; =20 --=20 2.43.0