Re: [PATCH] media: iris: drop struct iris_fmt

[Dikshita Agarwal]

On 3/11/2026 5:40 AM, Dmitry Baryshkov wrote:
> The struct iris_fmt unites pixfmt with the plane type, however the type
> from the struct is not actually used. Drop the struct completely and use
> u32 pixfmt in all the callsites.
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxxxxxxxx>
> ---
>  drivers/media/platform/qcom/iris/iris_instance.h   |  5 --
>  .../platform/qcom/iris/iris_platform_common.h      |  2 +-
>  .../media/platform/qcom/iris/iris_platform_gen1.c  | 17 +---
>  .../media/platform/qcom/iris/iris_platform_gen2.c  | 22 ++---
>  drivers/media/platform/qcom/iris/iris_vdec.c       | 78 ++++++++----------
>  drivers/media/platform/qcom/iris/iris_venc.c       | 96 +++++++++-------------
>  6 files changed, 80 insertions(+), 140 deletions(-)
> 
> diff --git a/drivers/media/platform/qcom/iris/iris_instance.h b/drivers/media/platform/qcom/iris/iris_instance.h
> index 16965150f427..0eb256b0e82e 100644
> --- a/drivers/media/platform/qcom/iris/iris_instance.h
> +++ b/drivers/media/platform/qcom/iris/iris_instance.h
> @@ -27,11 +27,6 @@ enum iris_fmt_type_cap {
>  	IRIS_FMT_QC08C,
>  };
>  
> -struct iris_fmt {
> -	u32 pixfmt;
> -	u32 type;
> -};
> -
>  /**
>   * struct iris_inst - holds per video instance parameters
>   *
> diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h
> index 5a489917580e..737ca4b1fe5c 100644
> --- a/drivers/media/platform/qcom/iris/iris_platform_common.h
> +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h
> @@ -237,7 +237,7 @@ struct iris_platform_data {
>  	u64 dma_mask;
>  	const char *fwname;
>  	u32 pas_id;
> -	struct iris_fmt *inst_iris_fmts;
> +	const u32 *inst_iris_fmts;
>  	u32 inst_iris_fmts_size;
>  	struct platform_inst_caps *inst_caps;
>  	const struct platform_inst_fw_cap *inst_fw_caps_dec;
> diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen1.c b/drivers/media/platform/qcom/iris/iris_platform_gen1.c
> index aa71f7f53ee3..c1e91e18d07f 100644
> --- a/drivers/media/platform/qcom/iris/iris_platform_gen1.c
> +++ b/drivers/media/platform/qcom/iris/iris_platform_gen1.c
> @@ -20,19 +20,10 @@
>  #define BITRATE_PEAK_DEFAULT	(BITRATE_DEFAULT * 2)
>  #define BITRATE_STEP		100
>  
> -static struct iris_fmt platform_fmts_sm8250_dec[] = {
> -	[IRIS_FMT_H264] = {
> -		.pixfmt = V4L2_PIX_FMT_H264,
> -		.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
> -	},
> -	[IRIS_FMT_HEVC] = {
> -		.pixfmt = V4L2_PIX_FMT_HEVC,
> -		.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
> -	},
> -	[IRIS_FMT_VP9] = {
> -		.pixfmt = V4L2_PIX_FMT_VP9,
> -		.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
> -	},
> +static u32 platform_fmts_sm8250_dec[] = {

static const u32 platform_fmts_sm8250_dec ?

> +	[IRIS_FMT_H264] = V4L2_PIX_FMT_H264,
> +	[IRIS_FMT_HEVC] = V4L2_PIX_FMT_HEVC,
> +	[IRIS_FMT_VP9] = V4L2_PIX_FMT_VP9,
>  };
>  
>  static struct platform_inst_fw_cap inst_fw_cap_sm8250_dec[] = {
> diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen2.c b/drivers/media/platform/qcom/iris/iris_platform_gen2.c
> index 5da90d47f9c6..cd2725d3ff16 100644
> --- a/drivers/media/platform/qcom/iris/iris_platform_gen2.c
> +++ b/drivers/media/platform/qcom/iris/iris_platform_gen2.c
> @@ -19,23 +19,11 @@
>  #define VIDEO_ARCH_LX 1
>  #define BITRATE_MAX				245000000
>  
> -static struct iris_fmt platform_fmts_sm8550_dec[] = {
> -	[IRIS_FMT_H264] = {
> -		.pixfmt = V4L2_PIX_FMT_H264,
> -		.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
> -	},
> -	[IRIS_FMT_HEVC] = {
> -		.pixfmt = V4L2_PIX_FMT_HEVC,
> -		.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
> -	},
> -	[IRIS_FMT_VP9] = {
> -		.pixfmt = V4L2_PIX_FMT_VP9,
> -		.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
> -	},
> -	[IRIS_FMT_AV1] = {
> -		.pixfmt = V4L2_PIX_FMT_AV1,
> -		.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
> -	},
> +static const u32 platform_fmts_sm8550_dec[] = {
> +	[IRIS_FMT_H264] = V4L2_PIX_FMT_H264,
> +	[IRIS_FMT_HEVC] = V4L2_PIX_FMT_HEVC,
> +	[IRIS_FMT_VP9] = V4L2_PIX_FMT_VP9,
> +	[IRIS_FMT_AV1] = V4L2_PIX_FMT_AV1,
>  };
>  
>  static const struct platform_inst_fw_cap inst_fw_cap_sm8550_dec[] = {
> diff --git a/drivers/media/platform/qcom/iris/iris_vdec.c b/drivers/media/platform/qcom/iris/iris_vdec.c
> index 719217399a30..2d3e2d72f221 100644
> --- a/drivers/media/platform/qcom/iris/iris_vdec.c
> +++ b/drivers/media/platform/qcom/iris/iris_vdec.c
> @@ -67,23 +67,16 @@ void iris_vdec_inst_deinit(struct iris_inst *inst)
>  	kfree(inst->fmt_src);
>  }
>  
> -static const struct iris_fmt iris_vdec_formats_cap[] = {
> -	[IRIS_FMT_NV12] = {
> -		.pixfmt = V4L2_PIX_FMT_NV12,
> -		.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE,
> -	},
> -	[IRIS_FMT_QC08C] = {
> -		.pixfmt = V4L2_PIX_FMT_QC08C,
> -		.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE,
> -	},
> +static const u32 iris_vdec_formats_cap[] = {
> +	[IRIS_FMT_NV12] = V4L2_PIX_FMT_NV12,
> +	[IRIS_FMT_QC08C] = V4L2_PIX_FMT_QC08C,
>  };
>  
> -static const struct iris_fmt *
> -find_format(struct iris_inst *inst, u32 pixfmt, u32 type)
> +static bool check_format(struct iris_inst *inst, u32 pixfmt, u32 type)
>  {
> -	const struct iris_fmt *fmt = NULL;
> -	unsigned int size = 0;
> -	unsigned int i;
> +	unsigned int size, i;
> +	const u32 *fmt;
> +
>  	switch (type) {
>  	case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
>  		fmt = inst->core->iris_platform_data->inst_iris_fmts;
> @@ -94,25 +87,21 @@ find_format(struct iris_inst *inst, u32 pixfmt, u32 type)
>  		size = ARRAY_SIZE(iris_vdec_formats_cap);
>  		break;
>  	default:
> -		return NULL;
> +		return false;
>  	}
>  
>  	for (i = 0; i < size; i++) {
> -		if (fmt[i].pixfmt == pixfmt)
> -			break;
> +		if (fmt[i] == pixfmt)
> +			return true;
>  	}
>  
> -	if (i == size || fmt[i].type != type)
> -		return NULL;
> -
> -	return &fmt[i];
> +	return false;
>  }
>  
> -static const struct iris_fmt *
> -find_format_by_index(struct iris_inst *inst, u32 index, u32 type)
> +static u32 find_format_by_index(struct iris_inst *inst, u32 index, u32 type)
>  {
> -	const struct iris_fmt *fmt = NULL;
> -	unsigned int size = 0;
> +	const u32 *fmt;
> +	unsigned int size;

pls follow reverse Christmas tree order

with that.

Reviewed-by: Dikshita Agarwal <dikshita.agarwal@xxxxxxxxxxxxxxxx>

Thanks,
Dikshita