Re: [PATCH v2 12/23] media: iris: Remove deprecated property setting to firmware

[Vikash Garodia <quic_vgarodia@quicinc.com>]

On 4/28/2025 2:59 PM, Dikshita Agarwal wrote:
> HFI_PROPERTY_CONFIG_VDEC_POST_LOOP_DEBLOCKER is deprecated and no longer
> supported on current firmware, remove setting the same to firmware.
> 
> At the same time, remove the check for non-zero number of v4l2 controls
> as some SOC might not expose any capability which requires v4l2 control.
> 
> Cc: stable@vger.kernel.org
> Fixes: 79865252acb6 ("media: iris: enable video driver probe of SM8250 SoC")
> Signed-off-by: Dikshita Agarwal <quic_dikshita@quicinc.com>
> ---
>  drivers/media/platform/qcom/iris/iris_ctrls.c            | 6 ------
>  drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c | 8 --------
>  drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h | 1 -
>  drivers/media/platform/qcom/iris/iris_platform_common.h  | 2 +-
>  drivers/media/platform/qcom/iris/iris_platform_sm8250.c  | 9 ---------
>  5 files changed, 1 insertion(+), 25 deletions(-)
> 
> diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.c b/drivers/media/platform/qcom/iris/iris_ctrls.c
> index b690578256d5..915de101fcba 100644
> --- a/drivers/media/platform/qcom/iris/iris_ctrls.c
> +++ b/drivers/media/platform/qcom/iris/iris_ctrls.c
> @@ -17,8 +17,6 @@ static inline bool iris_valid_cap_id(enum platform_inst_fw_cap_type cap_id)
>  static enum platform_inst_fw_cap_type iris_get_cap_id(u32 id)
>  {
>  	switch (id) {
> -	case V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER:
> -		return DEBLOCK;
>  	case V4L2_CID_MPEG_VIDEO_H264_PROFILE:
>  		return PROFILE;
>  	case V4L2_CID_MPEG_VIDEO_H264_LEVEL:
> @@ -34,8 +32,6 @@ static u32 iris_get_v4l2_id(enum platform_inst_fw_cap_type cap_id)
>  		return 0;
>  
>  	switch (cap_id) {
> -	case DEBLOCK:
> -		return V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER;
>  	case PROFILE:
>  		return V4L2_CID_MPEG_VIDEO_H264_PROFILE;
>  	case LEVEL:
> @@ -84,8 +80,6 @@ int iris_ctrls_init(struct iris_inst *inst)
>  		if (iris_get_v4l2_id(cap[idx].cap_id))
>  			num_ctrls++;
>  	}
> -	if (!num_ctrls)
> -		return -EINVAL;
>  
>  	/* Adding 1 to num_ctrls to include V4L2_CID_MIN_BUFFERS_FOR_CAPTURE */
>  
> 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 2239708d2d7e..f9f3e2d2ce29 100644
> --- a/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c
> +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c
> @@ -490,14 +490,6 @@ iris_hfi_gen1_packet_session_set_property(struct hfi_session_set_property_pkt *p
>  		packet->shdr.hdr.size += sizeof(u32) + sizeof(*wm);
>  		break;
>  	}
> -	case HFI_PROPERTY_CONFIG_VDEC_POST_LOOP_DEBLOCKER: {
> -		struct hfi_enable *en = prop_data;
> -		u32 *in = pdata;
> -
> -		en->enable = *in;
> -		packet->shdr.hdr.size += sizeof(u32) + sizeof(*en);
> -		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 93b5f838c290..adffcead58ea 100644
> --- a/drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h
> +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h
> @@ -65,7 +65,6 @@
>  
>  #define HFI_PROPERTY_CONFIG_BUFFER_REQUIREMENTS		0x202001
>  
> -#define HFI_PROPERTY_CONFIG_VDEC_POST_LOOP_DEBLOCKER	0x1200001
>  #define HFI_PROPERTY_PARAM_VDEC_DPB_COUNTS		0x120300e
>  #define HFI_PROPERTY_CONFIG_VDEC_ENTROPY		0x1204004
>  
> diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h
> index ac76d9e1ef9c..1dab276431c7 100644
> --- a/drivers/media/platform/qcom/iris/iris_platform_common.h
> +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h
> @@ -89,7 +89,7 @@ enum platform_inst_fw_cap_type {
>  	CODED_FRAMES,
>  	BIT_DEPTH,
>  	RAP_FRAME,
> -	DEBLOCK,
> +	TIER,
>  	INST_FW_CAP_MAX,
>  };
>  
> diff --git a/drivers/media/platform/qcom/iris/iris_platform_sm8250.c b/drivers/media/platform/qcom/iris/iris_platform_sm8250.c
> index 5c86fd7b7b6f..543fa2661539 100644
> --- a/drivers/media/platform/qcom/iris/iris_platform_sm8250.c
> +++ b/drivers/media/platform/qcom/iris/iris_platform_sm8250.c
> @@ -30,15 +30,6 @@ static struct platform_inst_fw_cap inst_fw_cap_sm8250[] = {
>  		.hfi_id = HFI_PROPERTY_PARAM_WORK_MODE,
>  		.set = iris_set_stage,
>  	},
> -	{
> -		.cap_id = DEBLOCK,
> -		.min = 0,
> -		.max = 1,
> -		.step_or_mask = 1,
> -		.value = 0,
> -		.hfi_id = HFI_PROPERTY_CONFIG_VDEC_POST_LOOP_DEBLOCKER,
> -		.set = iris_set_u32,
> -	},
>  };
>  
>  static struct platform_inst_caps platform_inst_cap_sm8250 = {
> 
Acked-by: Vikash Garodia <quic_vgarodia@quicinc.com>