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 69D9C39F172 for ; Tue, 12 May 2026 08:55:34 +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=1778576146; cv=none; b=Fftz1v06e+WSt/rNuDOWd7itOIhtNg/xqDqi3ckFj98XFDYO1lCsQpDJ+Kl3BzR9JLzCAWhMnGg/Tf/MA6KBpzT9RWzAe1HuBjAINnBg2IldWIaScYIrZi7MMvBudNDPuVlK9EX7m4d1S/R/ykBkCPNdQqCU/OWdPZGmdZ2uOns= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778576146; c=relaxed/simple; bh=+7NxkDI2Wh2+EYMc/jv7ryzxTAD6z+OSvF6pX5Ho7E4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hY+SeeR8zpkxkN+8LNjQmPP6WCGHvPgYhmHfFyEL/U0AUfSIuD83iH8gRyRo8tGNDwZAof4MJH7h/sju+x3gxpRoeTxYeB1KPqkyM6HUSo8wjT2YqpRVbssnprsax90NebbNi9mp+8xxtq2sDso4XT7c6IFaun7TujuOc3EgcXc= 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=UHlAJrpL; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=e38z64Xb; 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="UHlAJrpL"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="e38z64Xb" 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 64C57LoC3384933 for ; Tue, 12 May 2026 08:55:32 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= HX4c23/7ZwwNO0ZK16Oy/pJUBGqNwomA2SAB8l6pqCo=; b=UHlAJrpLvsvIMCD7 o9/ZkKiGetlidzFhHbm96WKl+23ovsSZ2RfrBw9i3hwAu4RHQPa1v0zFBTYZQCA5 9O0lGzyy/rYHzOegYY/9WoZVRLRs+lQMCQ7zNfOABdq2Bus+280Ht1Tc1gyArxEf oy1GWuZFQkceHPLwxbBLxBA4A7OfWAyEY6mn1oXWBvsJfOklVN4naIbOkYNmBq91 f1dTfsW7OHD5S872z0FJPDlZT+p0pdYoSvDBWxYr+Qy5leUZM5UZp60wmMtUCkWs /pViBoy5XIxIRn/OZqifZcrqhfglg+j6PBBtNLZK6BUsEKmU3gGAt02RjPJ3e260 pt65yg== Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e3nv4j9gg-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 12 May 2026 08:55:31 +0000 (GMT) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2b4678c6171so55523175ad.1 for ; Tue, 12 May 2026 01:55:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1778576131; x=1779180931; 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=HX4c23/7ZwwNO0ZK16Oy/pJUBGqNwomA2SAB8l6pqCo=; b=e38z64XbzveTi0l/hNwh3oXJUCVAsPnPUqyXHSs2AgDYKv/BDC0xoPLenBs3LT4XzL ZRnW6KUw3+PfrvZ2E87aBQdDJUAJ3gP7uLSYKAfMqfHHUGCc+6Ak2SXAPqvtuGmMqCzG ikVhcqsEYCrq9buE5avYM68ODFzowDR3VWEHCW/v6pLOMTGoUlLd8mNV2EueKaAvL7H6 w/H2VcSODyf/I1CxX+gEdEpZ/Vjb+ZvLy//sZRK6FWvO2ot7XDls3FW/Co2LBMugg1jt +huupqKUl8eYZqQdfVGbkmka8Qe6mKcx/p7ETotviaZlHEugfjfRIl+A0NMhAYcKX12l L3HA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778576131; x=1779180931; 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=HX4c23/7ZwwNO0ZK16Oy/pJUBGqNwomA2SAB8l6pqCo=; b=AsX3WIPbRIojnMSmJOjDrqWiE3t4NCdaSEvANW8Y2K1xEUG16/lAoqf4gKU02jhmCC DFkBhom4Z30/p0jyHCaF9LnvY41YQqZDlDyzCGx+bICxmAt4OY7XcKf2uTQJhe6/W8AM BcvIrEMPsCZDTsL5GWNYyUvTwrA3XS5pym4ryODq4XnQB4ZiBn2wRRZJPjzZsqskvyxb DbHTnugeYIaouvcwt6MMD+nmkRBDLs/JAgFKemjyss+UOqTfuZ8bCat0k3HMgKWQ6H/S GuOeTnYB9xyAh3sAsLJHouuWt9nDvEPx0oYRcgCs2m8f36RQ8NejLT2Ve6otDIKTUNU7 tEJQ== X-Forwarded-Encrypted: i=1; AFNElJ9B8L9LTksGYdEbdcZ5I4RTEDVODCGuGKe0uHLkcpFeWAphJsXqGZxTASV8DH2HI+AFBNeIy2wx0aqbbC8Y@vger.kernel.org X-Gm-Message-State: AOJu0Yy1kndmQxVPom0Azj3jqxtuvXL+RdNV4zolau6ni4FXk8oncOVH 2j6rdCFivxahBatt9FrXFM+UF7JT6e061mQDZ4n7I/Aa8zuKtjd3ewnXAPDP97Wa+ZT5FbVbN9o gzJ3Oon8f+VJredIgFSMh+SWUznOE1QMx+YgxDDAod3SIQ0cQCw7QGGp5GFFpJYYoGpyzc7+7gq TePSo= X-Gm-Gg: Acq92OGBiYLVPp5MApLyd1vVD4H3U+41xUTq4vqOYmM62DriMcELOwo93L/9uEjLVc+ gZ5bd2k8vuNqub1BgZjo48hQVXhuwlva2ISz1Wuu0EFHL3UX03oNK/OSQTUgf10iuI+akdqXIMq Uc6z5XIPJo3ZYVT6QQHrEt5/e5MmnD+2oUcFklXtv4zrSxxyKS9aqX7QcsLiDkj2iT2aGEjda0m nbOUs6S/qyrlXcnoQiggc6M/ojX6AxDz88+kxFkquoXZ68DgC+f8iQNwz7RG1ex0zuO2RWmjQkY FaHc7cQNIdog40mV4eEex6T43P0m8vV3twH/N0dFAunMO49BL9DXpif/Sz+Ozbeg8ZTfa339SQX rNPhlUupaQmcMwrDUhbQJY853KFYZpMWnrgFLdJjnSPN5WvwuzW49RHySaCR/9n6q8ailtGUief mWxZIRNgIUUoJjFJAWcd/H X-Received: by 2002:a17:902:c401:b0:2bc:ffe1:c397 with SMTP id d9443c01a7336-2bcffe1c5eemr29304555ad.23.1778576130607; Tue, 12 May 2026 01:55:30 -0700 (PDT) X-Received: by 2002:a17:902:c401:b0:2bc:ffe1:c397 with SMTP id d9443c01a7336-2bcffe1c5eemr29304165ad.23.1778576129966; Tue, 12 May 2026 01:55:29 -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 d9443c01a7336-2baf1e90854sm127641405ad.66.2026.05.12.01.55.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 May 2026 01:55:29 -0700 (PDT) From: Wangao Wang Date: Tue, 12 May 2026 16:55:12 +0800 Subject: [PATCH v7 3/6] media: qcom: iris: Add B frames support for encoder Precedence: bulk X-Mailing-List: linux-arm-msm@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: <20260512-batch2_features-v7-3-4954e3b4df84@oss.qualcomm.com> References: <20260512-batch2_features-v7-0-4954e3b4df84@oss.qualcomm.com> In-Reply-To: <20260512-batch2_features-v7-0-4954e3b4df84@oss.qualcomm.com> To: Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Wangao Wang , Neil Armstrong X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1778576115; l=8797; i=wangao.wang@oss.qualcomm.com; s=20251021; h=from:subject:message-id; bh=+7NxkDI2Wh2+EYMc/jv7ryzxTAD6z+OSvF6pX5Ho7E4=; b=VtQhII1q2xKZOpwcdORQZTimCLeP6SCLCSRkfwMTYoUx+4PHpT2rawYk6zpapMdRe0nVOUbbv OGeS4GJUF+RAGoq3HaCR7bZeQrVD+uNj0pIhzZbod+m9eBRlhae/dS0 X-Developer-Key: i=wangao.wang@oss.qualcomm.com; a=ed25519; pk=bUPgYblBUAsoPyGfssbNR7ZXUSGF8v1VF4FJzSO6/aA= X-Authority-Analysis: v=2.4 cv=ZrTd7d7G c=1 sm=1 tr=0 ts=6a02eb03 cx=c_pps a=cmESyDAEBpBGqyK7t0alAg==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=KKAkSRfTAAAA:8 a=2_V6wWdUOSEACiTAc7sA:9 a=QEXdDO2ut3YA:10 a=1OuFwYUASf3TG4hYMiVC:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTEyMDA5MCBTYWx0ZWRfX+Xc1IDAUIylx GnG/YyUkcV4xAS8/UYx66iN2QlUeNf5RStWi/ZykMTBAFurb6j8vE/D/b1haLjbUVaB/LHfu/ex cA9wi+2/lpYKbxsY1/8X92gBCCoie8a7lPiIV/fsUsQ9XUWhbKPvYpA9nx0qyJ+6GOMyZhLTSgu Hh7JIYYIclLtvt5RhIYlD7ZGYMdbAjiwVVF38fLlGGFzuIZXFYm/Tag2xmcE65/mHy9UkUsRSJr ue7M8+tjrxehuVCYCgaxGqDrMO1mUcjBUuhDvNfD78y2IMow0KTw9VnV0KF5F4aL2G9NdL7aEtn nq8vscEQcrDXQccVO2kG8yPnhQhs9aEPPnS/TgZvIRvTqNuW7+Mp+yW7WGZmVS0gwyRBdNzskIn 41w7f0kzB3ByjatDex8vKRBE2udJ7KI35Pjljo2dq7QCXP9oyLbM8jotpnLxrehASnnWcsCZzX+ fqC2XUGjk6pf+sJf3tA== X-Proofpoint-ORIG-GUID: BkgBaBW7ZkCVvZQmWoVYYEXN9VBCzAQg X-Proofpoint-GUID: BkgBaBW7ZkCVvZQmWoVYYEXN9VBCzAQg 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-05-11_05,2026-05-08_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 malwarescore=0 spamscore=0 suspectscore=0 clxscore=1015 priorityscore=1501 lowpriorityscore=0 bulkscore=0 adultscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605050000 definitions=main-2605120090 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 + drivers/media/platform/qcom/iris/iris_hfi_gen1.c | 18 +++++++++++++ .../platform/qcom/iris/iris_hfi_gen1_command.c | 8 ++++++ .../platform/qcom/iris/iris_hfi_gen1_defines.h | 10 ++++++++ drivers/media/platform/qcom/iris/iris_hfi_gen2.c | 10 ++++++++ .../platform/qcom/iris/iris_platform_common.h | 2 ++ 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.c b/drivers/media/platform/qcom/iris/iris_hfi_gen1.c index 6db693a602aca296f032dfc31987071f8e15bd1c..792441463b4bad19da5a45b46c4dafcf2caa75c3 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen1.c +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1.c @@ -273,6 +273,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 const u32 sm8250_vdec_input_config_param_default[] = { 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 a441c897aaabdf1ecae37d34032cd22d4f987233..05e7b5ff2b9224b201cf87858c0375ac6866e9bb 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_hfi_gen2.c b/drivers/media/platform/qcom/iris/iris_hfi_gen2.c index 495327160ec292f5fdc8f9532054c58046a10250..27878b70e516bec0eefbb094b58ecba882332bf5 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2.c +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2.c @@ -745,6 +745,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 const u32 sm8550_vdec_input_config_params_default[] = { diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h index 2f4392e6a42ea9280d48ae46791277394b2f3be8..422e83ae07884ce72d6e9aba8c176f474384b0f0 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_common.h +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h @@ -157,6 +157,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_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