From mboxrd@z Thu Jan 1 00:00:00 1970 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 4A4FC37D10D 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=Ig6io4R1dY04I0w5OD1CthM9bkD2j+VGrIjrPrrrIidZ39Ro4FWn4W36UR+wLCBGamfCCer17/UYnQlRtSWWTIxUAicEwhJbdimYyul1K7JZ8IlgpGHvTb9jxQbfHhJ1r1qJovU8J70ZuIWo02sivnXq+GRhwULU3FIW+iZRXag= 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=KPJ9Glrk; 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="KPJ9Glrk" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6310BU5Q639076 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 4d8g2au0e4-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-2b0c96f5d9aso70269915ad.3 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=1775013313; x=1775618113; 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=KPJ9GlrksfFmFZhYFQrB2rVLrHqz6thFHWCCHzvC6PTBffW9WCNML4RuZmQXw1W+34 GE1kU7TUK5RKiDFfcerup7gAbU+incFl+hVH1JmEx7qSn4F9QQfVJR9WBtFwkdGrCTkf ab4V61Jadlx9zpZZWv5LCBx4UdbMWihSNv7rwePOT5OC7/vkujFQpzKXDsS1GlKk28QF yUHbdWOxmGWW7tLu1gE5snz95sSS9tSVWwqImWihJMBwyNizIVgiH2DCDfVHSCpCyB3/ Bt1Bj/FZWRP8T4FnNVLTZ6vYKb4m5kQJ+d08dnpGx4nK5ot38SFOp5tmlE7AdUFfk/AQ bRSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775013313; x=1775618113; 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=c/lQjWjcX0P+nkp0W7ybD/8ULEU7a0RtMLcON10X+C7IjdQu8WGuhFGAk1DQdJaXiC TFIMSDAIRzcoay5//L2lfL4lzXtpt8lHBhY3lNamEuE67TaUQvYtDkusmV7HpQvo7goV 56a+BSsQx3eF5hoq2VOXDgOp+IBBtNYjHUr0qn700QtigdNy5QnfSrKtVcD/8IzldF/7 JZbFi6xG54D4aqemeXM+0BDs/FcNp7sOb62Fatzary2ztc9S1qQouVBR6FRCfEBP7zMY QwxVFTaRjm2nucSf9lxouODDew+KW3SLK/XDn+4o1Z5Y96+v4neRvEr+g9LxaR9tu1mG eNLw== X-Forwarded-Encrypted: i=1; AJvYcCVGHQIcKUr0/OZzsglYQi89A7Gb18erNxgjZPIXyawHmRQfu9jK2XlS1c6BalNSJlb7LXc02ptKLWmerA==@vger.kernel.org X-Gm-Message-State: AOJu0YzHJV5BM+D0Np/M3fGnu0woub7oXOXsmqxFC048ShnSHzjB1sbK E/AU11TXS1NBQ1/0JUYzd/S9wflafC1He6q3LLDpI+fg42zUF3wjQ3xMPobuBcjf8Hbeo6Nwihr Ix5oOUDldJPwnpUOmW8SjP3v2P8IKHXkhWQFnUS32qG02AMKbhuLpQr2e+IYdjRLflw== X-Gm-Gg: ATEYQzwUn5SW3bCHMxZN5+HjV7ykkZZs5b/p53vKdwW1NNm40sBII8D7zZ2e8h/c4ha e4pMCRhrjzKIIGsXCPrFzRSI2KuLYxIFphP8GXgRFTtpFqkNSPjjjW5W7gU8O8V1MsnJzN5GgSj bdspeMHc6AyS81hoK+xG1qkc+X3dB/nPqWaVrB4RvuZuPoUUhVAVE+/8LpbaMQnBeGTfAkSIflq Z9WKQyHn9MBRzSO7SO1pGtD2rVUYEF9CONmZYwyTLSFCKS4R+MMO3DLDmY46iVilqOwIOUukD6q tTof9jfhV7S/yahCQTLC9bpwJdvVTkOTNypkpv+GAXt8IggsKrh589zIYEg9Hx/2Bk0K86NZrre IlT00vLlLUqZhPLdVA39Y/NBa6BvJbpHetEoNQ/eKcVzfAIgScrMyDBcVkjvdbI9SKOc6FsHnRv 3ttGFamChFsweKd14jWuol X-Received: by 2002:a05:6a20:a127:b0:398:ac0d:9a06 with SMTP id adf61e73a8af0-39ef7762cfamr1762671637.55.1775013311959; 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-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: <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: AW1haW4tMjYwNDAxMDAyMyBTYWx0ZWRfX6jM9L10xUL+z JhnjspsasK5uZjmZcYydMcYaTk56qAt4vKHB+7OWSch/+BqrkIjUZumyhVJGCFlppC/Em5bZxz4 jbNYVpejkdX1osHOt/J+hoR3xQpz31IBt+WSFQaq2Uy1hBp8ZbxiC3RCIJhbzZwZ0r+XbsDodoV UaDobY+iKR46unLhNWmLEgPLBHh3JoMFitR4Qo+NdODas7+DbmIDwYsujMERbcMcbEBZx4lKZei 5+bnRGEBfJfxeIS2H7WkHwSTcvkEWjD31jCA8kEsu0jUqsIOguvOd1VRk4awtfY8Y/8VNBP9zX3 IU0YQYngLnzPzuwaruqGwgf2mS3ULpwLbvFHsb5iqRXFdUP7A8WvOOT9xxXN9f7nbEtn9+Hs1XO WtUktU7OtiPn7/yDgpYS1V/LuT0rDE/HUyS8A0Ln/XbEcdPhsP2ELBmHvwRdhN1iO/IWMJm6FVx vYbRHPQO3eg37iglCTg== X-Authority-Analysis: v=2.4 cv=G4ER0tk5 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=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=KKAkSRfTAAAA:8 a=WyURVOTWNNIHYkgbVKgA:9 a=QEXdDO2ut3YA:10 a=uG9DUKGECoFWVXl0Dc02:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: Vl_r47X3JZfIDafqFgqB9UuzAZFlhgku X-Proofpoint-ORIG-GUID: Vl_r47X3JZfIDafqFgqB9UuzAZFlhgku 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 lowpriorityscore=0 bulkscore=0 clxscore=1015 priorityscore=1501 malwarescore=0 adultscore=0 impostorscore=0 spamscore=0 phishscore=0 suspectscore=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..a6bd2eada52b68afd91032315c2701d8c74a9763 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(u32 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_type 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)); } +int iris_set_intra_period(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id) +{ + const struct iris_hfi_session_ops *hfi_ops = inst->hfi_session_ops; + u32 gop_size = inst->fw_caps[GOP_SIZE].value; + u32 b_frame = inst->fw_caps[B_FRAME].value; + u32 hfi_id = inst->fw_caps[cap_id].hfi_id; + struct hfi_intra_period intra_period; + + if (!gop_size || b_frame >= gop_size) + return -EINVAL; + + /* + * intra_period represents the length of a GOP, which includes both P-frames + * and B-frames. The counts of P-frames and B-frames within a GOP must be + * communicated to the firmware. + */ + intra_period.pframes = (gop_size - 1) / (b_frame + 1); + intra_period.bframes = 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 = 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..609258c81517b71523b682ca994786cdd020b07f 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_type cap_id); int iris_set_mark_ltr(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id); int iris_set_use_and_mark_ltr(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id); +int iris_set_intra_period(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id); int iris_set_properties(struct iris_inst *inst, u32 plane); #endif diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c b/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c index 63377886b2fbe373a09492793b7638a75d443544..4d1b78c819a7cc11c0cec2812170d926b5f83c11 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_session_set_property_pkt *p packet->shdr.hdr.size += sizeof(u32) + sizeof(*ltr_mark); break; } + case HFI_PROPERTY_CONFIG_VENC_INTRA_PERIOD: { + struct hfi_intra_period *in = pdata, *intra_period = prop_data; + + intra_period->pframes = in->pframes; + intra_period->bframes = in->bframes; + packet->shdr.hdr.size += sizeof(u32) + sizeof(*intra_period); + break; + } default: return -EINVAL; } diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h b/drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h index 34249fc0d047918c2463517b8303e30df3666b97..4343661e86065f5623b2c02c7ee808a3c47a8c41 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; }; +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/drivers/media/platform/qcom/iris/iris_platform_common.h index de9ab929aedfeba7aa2d9ee34a345811266b2ab5..0236f81fb47902c215a8481408950b3a329d872f 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, }; diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen1.c b/drivers/media/platform/qcom/iris/iris_platform_gen1.c index 45b4aeb7a84592983511890bd7fd499c1dd22df4..e01389bfb0ee1e6be72230bcd6497c00d87afaae 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_sm8250_enc[] = { .flags = CAP_FLAG_INPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, .set = iris_set_mark_ltr, }, + { + .cap_id = B_FRAME, + .min = 0, + .max = 3, + .step_or_mask = 1, + .value = 0, + .flags = CAP_FLAG_OUTPUT_PORT, + }, + { + .cap_id = INTRA_PERIOD, + .min = 0, + .max = 1, + .step_or_mask = 1, + .value = 0, + .hfi_id = HFI_PROPERTY_CONFIG_VENC_INTRA_PERIOD, + .flags = CAP_FLAG_OUTPUT_PORT, + .set = iris_set_intra_period, + }, }; static struct platform_inst_caps platform_inst_cap_sm8250 = { diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen2.c b/drivers/media/platform/qcom/iris/iris_platform_gen2.c index 176bf2141954a74c59dda99ac3af37befbf6a572..0713742e019479d81028c4df821fef3af913eea5 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_sm8550_enc[] = { .flags = CAP_FLAG_INPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, .set = iris_set_use_and_mark_ltr, }, + { + .cap_id = B_FRAME, + .min = 0, + .max = 1, + .step_or_mask = 1, + .value = 0, + .hfi_id = HFI_PROP_MAX_B_FRAMES, + .flags = CAP_FLAG_OUTPUT_PORT, + .set = iris_set_u32, + }, }; static struct platform_inst_caps platform_inst_cap_sm8550 = { diff --git a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c index 891aed5091c7a0fd0bf1f1a3a7737d49e6d8cea2..0ed82dc2b8af8c789df1b8c10c1a5afc51ef39d8 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 *inst) static inline u32 hfi_buffer_get_recon_count(struct iris_inst *inst) { + u32 bframe_count, ltr_count; u32 num_ref = 1; - u32 ltr_count; + bframe_count = inst->fw_caps[B_FRAME].value; ltr_count = inst->fw_caps[LTR_COUNT].value; + if (bframe_count) + num_ref = 2; + if (ltr_count) num_ref = num_ref + ltr_count; -- 2.43.0