Hi Lyude, Danilo, Dave, Simona,
could you please ack this patch? Note that it fixes commit 41ab92d35ccd
("drm: Make passing of format info to drm_helper_mode_fill_fb_struct()
mandatory") which is already part of Dave's 6.17-rc1 pull request at:
https://lore.kernel.org/all/CAPM=9tzvm80-v6_5nt6kko3nr+aqlz7r98i419fv8f4-ayq...@mail.gmail.com
Alex already acked the patchset, but patch 1 and 2 are still missing an
ack/reviewed-by from maintainers.
Thanks,
Imre
On Mon, Jul 28, 2025 at 01:16:02PM +0300, Imre Deak wrote:
> Plumb the format info from .fb_create() all the way to
> drm_helper_mode_fill_fb_struct() to avoid the redundant
> lookup.
>
> The patch is based on the driver parts of the patchset at Link:
> below, which missed converting the nouveau driver.
>
> Cc: Ville Syrjälä <[email protected]>
> Cc: Lyude Paul <[email protected]>
> Cc: Danilo Krummrich <[email protected]>
> Cc: Thomas Zimmermann <[email protected]>
> Cc: Maarten Lankhorst <[email protected]>
> Cc: Maxime Ripard <[email protected]>
> Fixes: 41ab92d35ccd ("drm: Make passing of format info to
> drm_helper_mode_fill_fb_struct() mandatory")
> Link:
> https://lore.kernel.org/all/[email protected]
> Signed-off-by: Imre Deak <[email protected]>
> ---
> drivers/gpu/drm/nouveau/nouveau_display.c | 9 +++------
> drivers/gpu/drm/nouveau/nouveau_display.h | 3 +++
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c
> b/drivers/gpu/drm/nouveau/nouveau_display.c
> index e1e5421263103..805d0a87aa546 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_display.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_display.c
> @@ -253,6 +253,7 @@ nouveau_check_bl_size(struct nouveau_drm *drm, struct
> nouveau_bo *nvbo,
>
> int
> nouveau_framebuffer_new(struct drm_device *dev,
> + const struct drm_format_info *info,
> const struct drm_mode_fb_cmd2 *mode_cmd,
> struct drm_gem_object *gem,
> struct drm_framebuffer **pfb)
> @@ -260,7 +261,6 @@ nouveau_framebuffer_new(struct drm_device *dev,
> struct nouveau_drm *drm = nouveau_drm(dev);
> struct nouveau_bo *nvbo = nouveau_gem_object(gem);
> struct drm_framebuffer *fb;
> - const struct drm_format_info *info;
> unsigned int height, i;
> uint32_t tile_mode;
> uint8_t kind;
> @@ -295,9 +295,6 @@ nouveau_framebuffer_new(struct drm_device *dev,
> kind = nvbo->kind;
> }
>
> - info = drm_get_format_info(dev, mode_cmd->pixel_format,
> - mode_cmd->modifier[0]);
> -
> for (i = 0; i < info->num_planes; i++) {
> height = drm_format_info_plane_height(info,
> mode_cmd->height,
> @@ -321,7 +318,7 @@ nouveau_framebuffer_new(struct drm_device *dev,
> if (!(fb = *pfb = kzalloc(sizeof(*fb), GFP_KERNEL)))
> return -ENOMEM;
>
> - drm_helper_mode_fill_fb_struct(dev, fb, NULL, mode_cmd);
> + drm_helper_mode_fill_fb_struct(dev, fb, info, mode_cmd);
> fb->obj[0] = gem;
>
> ret = drm_framebuffer_init(dev, fb, &nouveau_framebuffer_funcs);
> @@ -344,7 +341,7 @@ nouveau_user_framebuffer_create(struct drm_device *dev,
> if (!gem)
> return ERR_PTR(-ENOENT);
>
> - ret = nouveau_framebuffer_new(dev, mode_cmd, gem, &fb);
> + ret = nouveau_framebuffer_new(dev, info, mode_cmd, gem, &fb);
> if (ret == 0)
> return fb;
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_display.h
> b/drivers/gpu/drm/nouveau/nouveau_display.h
> index e45f211501f61..470e0910d4845 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_display.h
> +++ b/drivers/gpu/drm/nouveau/nouveau_display.h
> @@ -8,8 +8,11 @@
>
> #include <drm/drm_framebuffer.h>
>
> +struct drm_format_info;
> +
> int
> nouveau_framebuffer_new(struct drm_device *dev,
> + const struct drm_format_info *info,
> const struct drm_mode_fb_cmd2 *mode_cmd,
> struct drm_gem_object *gem,
> struct drm_framebuffer **pfb);
> --
> 2.49.1
>
