From nobody Mon Feb 9 14:38:01 2026 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 5303437C0E3 for ; Thu, 29 Jan 2026 07:48:54 +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=1769672937; cv=none; b=ItfT2/N7h5Vl1b1v0tOcSn0ERflZt+7PFGeZbjEJxxq05XzJcjY8DVLxlyhXpIAlz5pYD3r6o/MediK9mkY2McguqJE2PTD15CoV+sNV1zO1fxGbdIbJ8Czp3My1FQbOQU8RJ8VLagAEGIV0LAA/7ALWCFQrabltT/Xvx+mPjH4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769672937; c=relaxed/simple; bh=iFs45nynpZOghqFuo9jLK6SG17R7NMwuI2dqh5glhlc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Wvsq8Lj8nYfH4MZKYvqu9miKCo7+U4KmxDol8yqVdSAz9bSwgRPsqSOsk13C6OWsTORfZnJ/naGzb7Kl5pXfcHbV3Qf5XaGooWW0SZiLZxvPnpb2fy2Mu39BS4eH5V/A3NsJ0s3nMN7caJzMYL9QEtz9elMXpXGYZU6js1oEfGg= 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=hi4HyKh6; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=iTtHPeq9; 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="hi4HyKh6"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="iTtHPeq9" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60T2pB6A2664778 for ; Thu, 29 Jan 2026 07:48:53 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= SV7QnoYFt0OYeGaxtyyD1/N76oSB4w/4ECLI7E5XX9s=; b=hi4HyKh6cZN8xO97 jJQutublGqcaKoFVURvPHq6oahM65PltEGfyJxNIehRXvZHLlgHafrDOMwR+OmgS fAHDVw5IpIlhpGhaiG2wep6802HEYw4OtrupZCAxl3kZsg697IkJMAGZOTQ1DgG2 3XDshr9GuNFoZLS1JkqEzJRlt1r5ObTFtxPK9VlqFbaA6+zjuMH6IsN9TPALww4C uFYJ+PF2gLGSz3smryKDQCIAwHBbMD0ZPdnILDXjzmStOSRJus3LKSdexxImFGWD nzWEGLlouf2PeJs8MqA4r/w1FkDLi6WaGMq8aWttcBeiHP65JFS1A1yejPTLCYg8 ud6IjQ== Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4byphgjb5d-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 29 Jan 2026 07:48:52 +0000 (GMT) Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-81f48cec0ccso681709b3a.0 for ; Wed, 28 Jan 2026 23:48:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1769672932; x=1770277732; 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=SV7QnoYFt0OYeGaxtyyD1/N76oSB4w/4ECLI7E5XX9s=; b=iTtHPeq9S5CULHtVQ2jPVtBtUB7LYLYedRPmdaWFsWEe/Skn4WnT8V608UYf28hUMF cE0FkEW7iLA65FpsNRUURwxQfPBpphd4+CCJbRLAS8iMBssJmkES1/X6ENhXyu32Uci8 XYkQQfjJx6pfopOrNH4hbgztBqx0SaGNcO0FF1KPE9LKmRXPJ50/JPz6SYt83ZiguQaf 2wwHwe4xQyTHk6HL7yzGqPFbOzL8uvnrmfJINdgTCh+vsHnNog8g8rj/6L7BtXscxI8H PUslgYvpkumBPiCWnvnZv0MbOgf1z5DzipY6SCUt7yTcKjCHlbZQ8g7LnWMDsExzk+A0 oDog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769672932; x=1770277732; 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=SV7QnoYFt0OYeGaxtyyD1/N76oSB4w/4ECLI7E5XX9s=; b=DHUQNCiMVP9f58Sy0jiZG3iQQHnUCPsLeUA73lLuBqZFEtEb8oV0B4ymqTu818VI8H 4Mjtx7zYwWT/DioFJCzxXcPP0Dy/X2kSbJc3G/gCf4CI+4QAfMHNFko3yEiMXzqED17V KXh2fvONOnnmKEvCmep+NeOWOYYQkvVHEhltkicZz2Bdn6OMK0BE+lJgsl5PrIn+gmMV 07lFU2T+/R+4cBaClbzb832I7R5OEckrxxlNwBV7pIfbkO7JHs3Fa0JpCPArUWaonYR7 TS7srO3tgWKvBeCPqxahsy6sVlMEjXlyn7rknAgSmvu4k+8lxISH8uwWY88/2f+UA6qN 7WmQ== X-Forwarded-Encrypted: i=1; AJvYcCXB6th1ugiqMcfFJ+JGZs+JE6/sMyFbgESCQ9vH6tGlKuz+rEbuSt78NEXnrdfHOOQlakhYhwyRTqaFqHw=@vger.kernel.org X-Gm-Message-State: AOJu0Yzrg0/JT+w2LdT6FrTuDQSXg7OGg4Mr9bswKgDKZYQmy0Gva2q/ bsfEdEMnHKOH89bSUMmGoDBuxTfx2bPzh4CfR11jJQP8hDjX06tttyyRpfjX7E5ihtb+TyW+DCT Dlf3Y6B6nPPintLD9LNUtGP60qKIYrfZ+e0D5lLM3bCpTyI7cJFPXjGWi3iRZnfNwV2s= X-Gm-Gg: AZuq6aKNQzRhmwDlqITlf8C6ZRP2vDNI6gUWOli1QNPUqCkY1I1xWSHk6+028uyO/i+ D/KgWS9xHGR6Ep6vhqxbpZNPxi0WSvsRxRwDTAYfqq07nc58ePhUMqEWhbNmbiHuEjlZTjTzoNQ YNVAZOKLLCMUBvuFURQXXzk7IAK+LLXQedLe9Sj3MrgHP8S25ItbySHHcx3iG0aVaPjnJPfYYJd +rD/jQtjzYvnYanFzVxe0P7g8ZvXlUp6mKVuQtHv2ZAPpN6VvaGoPfip/E0LQDavZ6d/lC5NjXk gy3xINC+OrNHrVZCErNjSbCHuhoIkv8WC+qBByayJPOxzEvSPs3T1Cpa84MOKub8CG17jxUlA0X Jo0r0BwA6Um+8L5s3LQtUnO2UxoSp1zvTsqYJkOKL+tcMc8mgwUmwnC/4M9EzE1ioXPvL4aLBwC kvPpj3936X2P4= X-Received: by 2002:a05:6a00:1482:b0:823:b1f:892e with SMTP id d2e1a72fcca58-82369291d8fmr7020253b3a.43.1769672931530; Wed, 28 Jan 2026 23:48:51 -0800 (PST) X-Received: by 2002:a05:6a00:1482:b0:823:b1f:892e with SMTP id d2e1a72fcca58-82369291d8fmr7020227b3a.43.1769672931008; Wed, 28 Jan 2026 23:48:51 -0800 (PST) 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 d2e1a72fcca58-82379b49fecsm4534634b3a.15.2026.01.28.23.48.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jan 2026 23:48:50 -0800 (PST) From: Wangao Wang Date: Thu, 29 Jan 2026 15:48:24 +0800 Subject: [PATCH v4 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: <20260129-batch2_iris_encoder_enhancements-v4-3-efaac131a5f7@oss.qualcomm.com> References: <20260129-batch2_iris_encoder_enhancements-v4-0-efaac131a5f7@oss.qualcomm.com> In-Reply-To: <20260129-batch2_iris_encoder_enhancements-v4-0-efaac131a5f7@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=1769672917; l=8832; i=wangao.wang@oss.qualcomm.com; s=20251021; h=from:subject:message-id; bh=iFs45nynpZOghqFuo9jLK6SG17R7NMwuI2dqh5glhlc=; b=aSIKszaG+xqAAa9KuRVopsCgQ2ojY2fQ0WahZxBjROYq4KvmDCOkCyDxQFa6m8mLEB6OcIQzk 2ay8VsHoQJ2DAawNbZsUjEOKq05VGybTvT6NtGRZdNyEUPUUL/ptF83 X-Developer-Key: i=wangao.wang@oss.qualcomm.com; a=ed25519; pk=bUPgYblBUAsoPyGfssbNR7ZXUSGF8v1VF4FJzSO6/aA= X-Proofpoint-ORIG-GUID: yJKGTRlsMlaVKRKcjap9w6nwHB_MNIJP X-Proofpoint-GUID: yJKGTRlsMlaVKRKcjap9w6nwHB_MNIJP X-Authority-Analysis: v=2.4 cv=J/inLQnS c=1 sm=1 tr=0 ts=697b10e5 cx=c_pps a=rEQLjTOiSrHUhVqRoksmgQ==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=IkcTkHD0fZMA:10 a=vUbySO9Y5rIA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=KKAkSRfTAAAA:8 a=2_V6wWdUOSEACiTAc7sA:9 a=QEXdDO2ut3YA:10 a=2VI0MkxyNR6bbpdq8BZq:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTI5MDA0NiBTYWx0ZWRfX4Q3nc/cj5636 WifCZfxVM9b5ftQ4uEd0SaWJI4D3kMAyjMquxnzsrdNiG1e/ImFriHxFufCkxETi4YId0JwrmTs Fh1pAR8BouALAPsXOk3MEHZoEPvwangBa1RnZaPV/KEmaSrsJCPJAye+OkNfQ/FOCFkCBvVKpe/ 4LrrHWOasso2g6k3dp94INutG9nzn5QMzA2v5NyL8e4aRrYFKbM0rgrIJbW5a83mp+b/7X0k2gf R8+pzORV7YKkTslaQKvVftiuXqHlqvKdPhtoFQivqZ6AISuDdJNdhwWZXMsalQV2l9dZBhZnkdo VDbWG93ru2CrY+n0SRG482O/f2g9enzscHp3fRp7GVIJhU78O+uAkC+fYacf196fBnn8jjUeHvc dvdl26FXqgleqqtbraov1x9Ess0Zvzc4dKFs1ot/pa4fB/jbncywHyP7TL4OwaPIu5oOCrqCRmS czitNQMfS3BG2bqb0jg== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-01-29_01,2026-01-28_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 adultscore=0 malwarescore=0 impostorscore=0 spamscore=0 clxscore=1015 bulkscore=0 lowpriorityscore=0 priorityscore=1501 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2601290046 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 9a9dec022b35e94c800fc13ec35bdbba520e7168..e049c28db1d8395736ae6970b5e= fbb351ce427dd 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_command_ops *hfi_ops =3D inst->core->hfi_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_command_ops *hfi_ops =3D inst->core->hfi_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 74f9feacfe3562d44a8415de83fb7a6c058a3d8c..87871fed09ed753760b6057ad4a= fa87be5f91b69 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 544c65dea922ae693adeeba972f1418002fe3f92..67acd98e467df037d49d2ea1830= 038c0c8fecbaf 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_common.h +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h @@ -165,6 +165,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 42addeeda47a849dbab2758b11e948606479f25b..e9016609127b83b933a18e44250= fd43d25f05959 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 617879ec0fba39c0f8529d69ccf0bc7612445110..a7ee63e5cbd8b476d765f29ecb3= a7d5d52fae269 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