mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-30 16:53:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

media: qcom: iris: fix missing hfi_id in gen1 GOP_SIZE cap

Browse Source 
Add hfi_id to gen1 encoder GOP_SIZE cap and replace the set function,
remove the redundant INTRA_PERIOD cap.

Fixes: d22037f3fd ("media: iris: Set platform capabilities to firmware for encoder video device")

Reviewed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
Signed-off-by: Wangao Wang <wangao.wang@oss.qualcomm.com>
Reviewed-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
Cc: stable@vger.kernel.org
Signed-off-by: Bryan O'Donoghue <bod@kernel.org>
This commit is contained in:
Wangao Wang
2026-07-23 10:55:54 +08:00
committed by Bryan O'Donoghue
parent f87d7eda07
commit 5eebacbc9a
3 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/platform/qcom/iris/iris_ctrls.c
View File

@@ -1293,7 +1293,7 @@ int iris_set_use_and_mark_ltr(struct iris_inst *inst, enum platform_inst_fw_cap_
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 gop_size = inst->fw_caps[cap_id].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;

16
drivers/media/platform/qcom/iris/iris_hfi_gen1.c
View File

@@ -171,7 +171,9 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = {
.max = (1 << 16) - 1,
.step_or_mask = 1,
.value = 30,
.set = iris_set_u32
.hfi_id = HFI_PROPERTY_CONFIG_VENC_INTRA_PERIOD,
.flags = CAP_FLAG_OUTPUT_PORT,
.set = iris_set_intra_period,
},
{
.cap_id = ENTROPY_MODE,
@@ -240,7 +242,7 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = {
.step_or_mask = 1,
.value = 0,
.hfi_id = HFI_PROPERTY_PARAM_VENC_INTRA_REFRESH,
.flags = CAP_FLAG_OUTPUT_PORT,
.flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED,
.set = iris_set_ir_period_gen1,
},
{
@@ -281,16 +283,6 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = {
.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,
},
{
.cap_id = LAYER_ENABLE,
.min = 0,

1
drivers/media/platform/qcom/iris/iris_platform_common.h
View File

@@ -165,7 +165,6 @@ enum platform_inst_fw_cap_type {
USE_LTR,
MARK_LTR,
B_FRAME,
INTRA_PERIOD,
LAYER_ENABLE,
LAYER_TYPE_H264,
LAYER_TYPE_HEVC,