Re: [PATCH v3 1/2] media: qcom: iris: improve gop size support for gen1 encoder

[Bryan O'Donoghue <bod@kernel.org>]

On 24/06/2026 09:51, Wangao Wang wrote:
> The GOP_SIZE cap was missing an hfi_id, so it would not interact with the
> firmware but could still save the parameter passed by the client.
> INTRA_PERIOD was acting as GOP_SIZE here. The code was redundant, so the
> two caps have been merged.

Hmm, this really feels like a bug fix. Your first sentence describes a 
software flaw, which you then remediate.

I'd like to see a better description of that - you appear to be saying 
"but it doesn't matter anyway" - which is perhaps true but still to me 
feels like you need to actively justify why this _shouldn't_ go back to 
stable.

> Signed-off-by: Wangao Wang <wangao.wang@oss.qualcomm.com>
> ---
>   drivers/media/platform/qcom/iris/iris_ctrls.c           |  2 +-
>   drivers/media/platform/qcom/iris/iris_hfi_gen1.c        | 16 ++++------------
>   drivers/media/platform/qcom/iris/iris_platform_common.h |  1 -
>   3 files changed, 5 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.c b/drivers/media/platform/qcom/iris/iris_ctrls.c
> index 10e33b8a73f60759c4f1cb17b5c95897f0e1468f..391e1fc5f6e2ec8e9cf5ba4e0f76b2d1da3e2a35 100644
> --- a/drivers/media/platform/qcom/iris/iris_ctrls.c
> +++ b/drivers/media/platform/qcom/iris/iris_ctrls.c
> @@ -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;
> diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen1.c b/drivers/media/platform/qcom/iris/iris_hfi_gen1.c
> index ca1545d28b5310d8c45a905287dcb69f6184d9cc..eff9216bb50143c0d752051a6400605bbaf3803e 100644
> --- a/drivers/media/platform/qcom/iris/iris_hfi_gen1.c
> +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1.c
> @@ -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,
> diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h
> index c9256f2323dc4521f9eacaeffb0fc08a180de3ff..ff48333ad089894c3393e8ad45903c2603288eb9 100644
> --- a/drivers/media/platform/qcom/iris/iris_platform_common.h
> +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h
> @@ -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,
> 
> --
> 2.43.0
> 
>