Hi Ville,
Thank you for the patch.
On Tue, Jul 01, 2025 at 12:07:04PM +0300, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrj...@linux.intel.com>
>
> Decouple .get_format_info() from struct drm_mode_fb_cmd2 and just
> pass the pixel format+modifier combo in by hand.
>
> We may want to use .get_format_info() outside of the normal
> addfb paths where we won't have a struct drm_mode_fb_cmd2, and
> creating a temporary one just for this seems silly.
>
> v2: Fix intel_fb_get_format_info() docs (Laurent)
>
> Cc: Harry Wentland <harry.wentl...@amd.com>
> Cc: Leo Li <sunpeng...@amd.com>
> Cc: Rodrigo Siqueira <sique...@igalia.com>
> Cc: Alex Deucher <alexander.deuc...@amd.com>
> Cc: amd-...@lists.freedesktop.org
> Cc: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
> Reviewed-by: Thomas Zimmermann <tzimmerm...@suse.de>
> Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart+rene...@ideasonboard.com>
> ---
> .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 4 ++--
> .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h | 2 +-
> drivers/gpu/drm/drm_fourcc.c | 3 ++-
> drivers/gpu/drm/i915/display/intel_fb.c | 11 ++++++-----
> drivers/gpu/drm/i915/display/intel_fb.h | 2 +-
> include/drm/drm_mode_config.h | 2 +-
> 6 files changed, 13 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
> b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
> index b7c6e8d13435..eef51652ca35 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
> @@ -92,9 +92,9 @@ enum dm_micro_swizzle {
> MICRO_SWIZZLE_R = 3
> };
>
> -const struct drm_format_info *amdgpu_dm_plane_get_format_info(const struct
> drm_mode_fb_cmd2 *cmd)
> +const struct drm_format_info *amdgpu_dm_plane_get_format_info(u32
> pixel_format, u64 modifier)
> {
> - return amdgpu_lookup_format_info(cmd->pixel_format, cmd->modifier[0]);
> + return amdgpu_lookup_format_info(pixel_format, modifier);
> }
>
> void amdgpu_dm_plane_fill_blending_from_plane_state(const struct
> drm_plane_state *plane_state,
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h
> b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h
> index 615d2ab2b803..ea2619b507db 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h
> @@ -58,7 +58,7 @@ int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm,
> unsigned long possible_crtcs,
> const struct dc_plane_cap *plane_cap);
>
> -const struct drm_format_info *amdgpu_dm_plane_get_format_info(const struct
> drm_mode_fb_cmd2 *cmd);
> +const struct drm_format_info *amdgpu_dm_plane_get_format_info(u32
> pixel_format, u64 modifier);
>
> void amdgpu_dm_plane_fill_blending_from_plane_state(const struct
> drm_plane_state *plane_state,
> bool *per_pixel_alpha, bool
> *pre_multiplied_alpha,
> diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c
> index 2890e889dd15..4b4444f6d504 100644
> --- a/drivers/gpu/drm/drm_fourcc.c
> +++ b/drivers/gpu/drm/drm_fourcc.c
> @@ -430,7 +430,8 @@ drm_get_format_info(struct drm_device *dev,
> const struct drm_format_info *info = NULL;
>
> if (dev->mode_config.funcs->get_format_info)
> - info = dev->mode_config.funcs->get_format_info(mode_cmd);
> + info =
> dev->mode_config.funcs->get_format_info(mode_cmd->pixel_format,
> +
> mode_cmd->modifier[0]);
>
> if (!info)
> info = drm_format_info(mode_cmd->pixel_format);
> diff --git a/drivers/gpu/drm/i915/display/intel_fb.c
> b/drivers/gpu/drm/i915/display/intel_fb.c
> index 6158031821fd..52c4901dc072 100644
> --- a/drivers/gpu/drm/i915/display/intel_fb.c
> +++ b/drivers/gpu/drm/i915/display/intel_fb.c
> @@ -422,21 +422,22 @@ unsigned int intel_fb_modifier_to_tiling(u64
> fb_modifier)
>
> /**
> * intel_fb_get_format_info: Get a modifier specific format information
> - * @cmd: FB add command structure
> + * @pixel_format: pixel format
> + * @modifier: modifier
> *
> * Returns:
> - * Returns the format information for @cmd->pixel_format specific to
> @cmd->modifier[0],
> + * Returns the format information for @pixel_format specific to @modifier,
> * or %NULL if the modifier doesn't override the format.
> */
> const struct drm_format_info *
> -intel_fb_get_format_info(const struct drm_mode_fb_cmd2 *cmd)
> +intel_fb_get_format_info(u32 pixel_format, u64 modifier)
> {
> - const struct intel_modifier_desc *md =
> lookup_modifier_or_null(cmd->modifier[0]);
> + const struct intel_modifier_desc *md =
> lookup_modifier_or_null(modifier);
>
> if (!md || !md->formats)
> return NULL;
>
> - return lookup_format_info(md->formats, md->format_count,
> cmd->pixel_format);
> + return lookup_format_info(md->formats, md->format_count, pixel_format);
> }
>
> static bool plane_caps_contain_any(u8 caps, u8 mask)
> diff --git a/drivers/gpu/drm/i915/display/intel_fb.h
> b/drivers/gpu/drm/i915/display/intel_fb.h
> index bdd76b372957..7d1267fbeee2 100644
> --- a/drivers/gpu/drm/i915/display/intel_fb.h
> +++ b/drivers/gpu/drm/i915/display/intel_fb.h
> @@ -47,7 +47,7 @@ u64 *intel_fb_plane_get_modifiers(struct intel_display
> *display,
> bool intel_fb_plane_supports_modifier(struct intel_plane *plane, u64
> modifier);
>
> const struct drm_format_info *
> -intel_fb_get_format_info(const struct drm_mode_fb_cmd2 *cmd);
> +intel_fb_get_format_info(u32 pixel_format, u64 modifier);
>
> bool
> intel_format_info_is_yuv_semiplanar(const struct drm_format_info *info,
> diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h
> index 9e524b51a001..e971e1b8a850 100644
> --- a/include/drm/drm_mode_config.h
> +++ b/include/drm/drm_mode_config.h
> @@ -95,7 +95,7 @@ struct drm_mode_config_funcs {
> * The format information specific to the given fb metadata, or
> * NULL if none is found.
> */
> - const struct drm_format_info *(*get_format_info)(const struct
> drm_mode_fb_cmd2 *mode_cmd);
> + const struct drm_format_info *(*get_format_info)(u32 pixel_format, u64
> modifier);
>
> /**
> * @mode_valid:
--
Regards,
Laurent Pinchart
