From nobody Mon Dec 1 22:37:13 2025 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 C34063218B2 for ; Thu, 27 Nov 2025 07:45:12 +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=1764229514; cv=none; b=NFVkm2enW6GLgknc3QycUIg4WiiVkKt7IBA1re7V11R3P0CcdUAcmUSfl1nF2iLEzIjePFrHJFHVwY1SkNwuGRM+jnHiDviaqevUK1TFODgjY3c8pq1K3JmAjqvG9AytDMAqhm69GYualuVPsXGRBydpAcAV48KrRzknhXHP6ss= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764229514; c=relaxed/simple; bh=9PlAnVbnB0FRVWymm3NRer0xZIhQsVSzh7o3970J+kY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MV+XzE9gbZozoJTF+XCdf8abTgmtE+BH0NRgUQ4cHLF/bEKvDdlO/77wEUorZGcc58jWBfWW6+XQkiX9jUpSgMKkrIg15y6NldEL5Novgc9fPw4Qd3/HTn2ovanwVkA+WUAFXwMJMIpK02M3BFjoa0gxyHFpnfIfGO5Sn8GY/Cw= 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=Zk/hDTYY; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=KWiff5i9; 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="Zk/hDTYY"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="KWiff5i9" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5AR6Qo3I2855086 for ; Thu, 27 Nov 2025 07:45:11 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= kXWXhGufk2riZfRA8YuYnxjvaww7lkwIvZNf/BooBxA=; b=Zk/hDTYYLKW4SZGC nE6BR5o2np4l6tijV9A0ydNUsk8WIID9rF0wKu1FN2cnT38sFObM3AsVdF6ow2Nh KceMVcmR/3Dik++BVaFzthISjlc/I3GBL63/vb+lFiWkRrt5933tGcuVj7HTY+9F WHFxR3Yo5koa5bE90Mx5jwd4lf7cXrkIDe/eEEQWHFbrIKjNlJaKllMnVddtGA/1 4Xg7xSuROK3Wct4FRBz7glrA0lDAJTB+WyK4YwOhwFrEnbQTlIYGPbUM4r0SnNPF RcuvXqGOyUa6Bg7WPHX+8bDFAmYsRctGuC08EQOvnn3c5+PlOaJx6F/ip645Dmd/ PAMm2g== Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ap4vha2th-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 27 Nov 2025 07:45:11 +0000 (GMT) Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-343823be748so596958a91.0 for ; Wed, 26 Nov 2025 23:45:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1764229510; x=1764834310; 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=kXWXhGufk2riZfRA8YuYnxjvaww7lkwIvZNf/BooBxA=; b=KWiff5i9+1LGyyUsnARfSX2AOVhEFgZ30Cp3i7vKInrileXr4RQyD3q0f0s2imqaXp MRo/q5cJQD0lb3kUCnEaaO9QqFJee0RXrEz0tw1VLeBMtWu8bD4fAjH7vnn/6QuBGXEI TaiS5Pn/b0saqMVZbHod8oubx9NgsaPCqX/f8ZVNxocjtLezA+N0g23ah9O2+79GHbLg gL+0g1IW+/Fxa6qQJpIZk90rrafPL7CRT5MdVdFuL/0LDGXmRUM8uMc24bvz7n1jZIBs NgcbqJARYMdMoYaBfAFe4ONlDh4lrGvUOynJIgWWAxzLxZLah2gDbyJdbjiWuHgmJD6g YV6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764229510; x=1764834310; 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=kXWXhGufk2riZfRA8YuYnxjvaww7lkwIvZNf/BooBxA=; b=iG5hNCuk0luRtBUfY2soK15g9kmpEKbiYrZryAR4+bhV4TWL90jmu2Jt4Gf28YYlu8 VFclUWaQnfGAxih02VLORB+TzyOz/cUNC4sYUnc6dqgi9ezR/jkUu3/g1TXltFIZcD5f L6wMqSO9fNOyn/PALieLcrwXSDhN5IeSNlndVKaqOdzh+3ivD1J38XTE3xMGv8Od0Z5r tM503ty8kKPD7ycVY6W7rjnpi3ael7vDmcU7+cA1+A7MJlyZiO6q8usQMRnak8AKI24w LzMyTvKHWpZ17WwAOB4scqO+mP9QI6ACcA9IWwqAHtr9YzoIN0l5cnAgNjIe1rIsjF55 wLTg== X-Forwarded-Encrypted: i=1; AJvYcCWrWtnNNMRGvp5agxzaBg39dx7RSB2PLrg+iYhq3xFjqO+cEaGVi7WGcxDyVaXeCGwmc9EXzvZB6Xj4SDc=@vger.kernel.org X-Gm-Message-State: AOJu0YwatcKzSAKNW9CBVWtp/dd76TzZcQwt8DRzXBQxye2KguvYHt2M AfHJ185wgoZQgz1LMic/AnRtcSFCP7p8U+XgDahpRYr0w0nkRLHedq58EWdUA/V7ZNtXQekhGGF XXiixLYT8qjNr/2FrKkALmnHIqPMyzARW1zzZpC2W8pItuMjZ+pfnTS9rTVukPr3ZUeHlPI6K3K LeRQ== X-Gm-Gg: ASbGncuR9ENb3aJn/k3weCYjxEElMQdRZgB+nsak3TEmcOyGKNBHdw1hbg31+tytX5b DadH7dG6awJkwco3It7IeJNz6fQWf7GKYlVSgP2nYdr8t4pluJZi03EmweMK72HjojRgX5XBs+S bP89/ceBzuYaf1hNZHDjgcZ1FWX4Xqb0K3ANX20CdGgV0dBUJ5yA9KrwzARC2KhgQV1pNHBiVCN 7n5EnlPtx7EkyBgxi5oysUGscYRezX700n2ZbRLVymVB5Aw/VeJPfKSC75EfBWEDf8qcwIZwM8R /iynfkz+oJh8Xee5mbrbVAyKrQLklqelug3XfTa0l63jQAQyFngGfCkEGfo9uxz4Qd5DTJ/gchH 883rzvo8wzyoz+lBB7P8Assfh8bvzEX60wVg16aheOpC2UzjVHur76vDRWvm6vXBiHA5WSzL5FR hRKDFe73WYxZrk X-Received: by 2002:a17:90b:4c4f:b0:343:edb0:1012 with SMTP id 98e67ed59e1d1-3475ed508e8mr8974359a91.21.1764229510249; Wed, 26 Nov 2025 23:45:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IE+Gs+fCJrQ0EAcFD+xI5uV5xHix7BzP9/Rih7w4y+eA6/M+NU0phq8Xw/jhFftAyNdVP2OfA== X-Received: by 2002:a17:90b:4c4f:b0:343:edb0:1012 with SMTP id 98e67ed59e1d1-3475ed508e8mr8974326a91.21.1764229509692; Wed, 26 Nov 2025 23:45:09 -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-7d15f080beasm908717b3a.47.2025.11.26.23.45.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Nov 2025 23:45:09 -0800 (PST) From: Wangao Wang Date: Thu, 27 Nov 2025 15:44:34 +0800 Subject: [PATCH 3/4] 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: <20251127-batch2_iris_encoder_enhancements-v1-3-5ea78e2de2ae@oss.qualcomm.com> References: <20251127-batch2_iris_encoder_enhancements-v1-0-5ea78e2de2ae@oss.qualcomm.com> In-Reply-To: <20251127-batch2_iris_encoder_enhancements-v1-0-5ea78e2de2ae@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 X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1764229495; l=8868; i=wangao.wang@oss.qualcomm.com; s=20251021; h=from:subject:message-id; bh=9PlAnVbnB0FRVWymm3NRer0xZIhQsVSzh7o3970J+kY=; b=D9kZuB7k8xk+s+NhDwZGIsA8aWK9mC9a+Jy0MNuC9A2ZQxL3q7pcJCr/CUQJdiT5sL4ylhOVQ ZGRuhpHO4OwA9sqWmkF3ltCnUuZoSLGxqx10QWss/rddW79CAFM6XG0 X-Developer-Key: i=wangao.wang@oss.qualcomm.com; a=ed25519; pk=bUPgYblBUAsoPyGfssbNR7ZXUSGF8v1VF4FJzSO6/aA= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTI3MDA1NCBTYWx0ZWRfX7IcpFfCiI7lE 7bOxeiWUqdbZHL5/AbVNE6cKE70Loy+oy3dRt0PXsk8l+ZH0Kltbrih7vNZN5BmDnyt6xX+RETL wcPGOgdgZiXw074Ky0N80o5BGy/h9VW7rBWXSx7c9i8DrVUL/17ElpcgOsfR9EkfSavPea2hNPQ lehhVeDufKKNgfyjTl4kYvAZvEiLjE7mGXd/ghL7dp8sfU/sJW/YURTY5n8OMKN1H0NujDyFdeZ LK35PGKf6h3fPx3Gb71uoCn1am6piHX1gMtby/9LACcUMK9sIRs38LH7+uM1/fazkELsfnjwWhq kXpjeGR9e3tHzZXrH1TYGwKHNtnozs/Qf2qJb825rGfHBtEUMRh67DfPRgktnB3SqxUQ/CSsvU3 UgDZDk8w1f8gpW92fSrSjkKfTgipNg== X-Proofpoint-ORIG-GUID: TUW1REQJg0BkYHTED6j3o2fh2VFVt9Td X-Proofpoint-GUID: TUW1REQJg0BkYHTED6j3o2fh2VFVt9Td X-Authority-Analysis: v=2.4 cv=Lt6fC3dc c=1 sm=1 tr=0 ts=69280187 cx=c_pps a=RP+M6JBNLl+fLTcSJhASfg==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=IkcTkHD0fZMA:10 a=6UeiqGixMTsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=l7a9cip_DlGZr9eDmkIA:9 a=QEXdDO2ut3YA:10 a=iS9zxrgQBfv6-_F4QbHw:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-11-25_02,2025-11-26_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 malwarescore=0 lowpriorityscore=0 impostorscore=0 phishscore=0 priorityscore=1501 suspectscore=0 adultscore=0 spamscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2511270054 Add support for B-frame configuration on both gen1 and gen2 encoders by enabling V4L2_CID_MPEG_VIDEO_B_FRAMES control. Key changes: Added capability IDs for B-frame and intra period. Implemented handler for GOP structure with B-frames. Defined HFI property and structure for gen1. Updated platform tables and buffer logic for gen2. Signed-off-by: Wangao Wang --- drivers/media/platform/qcom/iris/iris_ctrls.c | 25 ++++++++++++++++++= ++++ 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 | 6 ++++++ .../platform/qcom/iris/iris_platform_common.h | 2 ++ .../media/platform/qcom/iris/iris_platform_gen1.c | 19 +++++++++++++++- .../media/platform/qcom/iris/iris_platform_gen2.c | 10 +++++++++ drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 6 +++++- 8 files changed, 75 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.c b/drivers/media/= platform/qcom/iris/iris_ctrls.c index 33e104142a5bb51c952550fa45e81b3bdc723ac2..9aec8a2006e9f8e545d05e40cb6= 8ef0ae8502f79 100644 --- a/drivers/media/platform/qcom/iris/iris_ctrls.c +++ b/drivers/media/platform/qcom/iris/iris_ctrls.c @@ -114,6 +114,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; } @@ -217,6 +219,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; } @@ -1148,6 +1152,27 @@ 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.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 139e7a9321d30d3e348671f99b0fa81afed4827e..fe51eccb903be146e83a4fb2faf= 4b4092875dea4 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c @@ -718,6 +718,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..476177add1ec860d46d85960dd0= 9617ad347f60a 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,11 @@ struct hfi_ltr_mark { u32 mark_frame; }; =20 +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 c48dfb6d47734fadd4f2e4123c93560f55355b86..34deb32eb5be0899fee779ff99b= 3f4b8bd91529f 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 13cee5f72a443b85136d30b41b589aeb0db8eb9a..b76f0ecaa721f3469bc63b7ff4c= e5fc6ea19a8e1 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_gen1.c +++ b/drivers/media/platform/qcom/iris/iris_platform_gen1.c @@ -177,7 +177,6 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm= 8250_enc[] =3D { .max =3D (1 << 16) - 1, .step_or_mask =3D 1, .value =3D 30, - .set =3D iris_set_u32 }, { .cap_id =3D ENTROPY_MODE, @@ -279,6 +278,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 6ae34312f50d4a3709ca20b3aadcfee12338a2f7..7c9a71755685d195a7adc806452= 3e1c33a572089 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_gen2.c +++ b/drivers/media/platform/qcom/iris/iris_platform_gen2.c @@ -667,6 +667,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 8139fefe40fe179ff7862bbca879ce94c71c1f89..4a854a4dab322eabb16a52b1cf8= 16c18d78acc81 100644 --- a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c +++ b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c @@ -670,11 +670,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