Reviewed-by: Lyude Paul <[email protected]>

On Wed, 2026-11-11 at 16:00 +1000, Dave Airlie via B4 Relay wrote:
> From: Dave Airlie <[email protected]>
> 
> commit 604826acb3f5 attempted to add these flags but
> commit 6c65db809796 reverted it due to it
> failing on hw from pre-atomic times.
> 
> So use a second set of functions.
> 
> original commit msg from Lyude:
> "Apparently we never actually filled these in, despite the fact that
> we do
> in fact technically support atomic modesetting.
> 
> Since not having these filled in causes us to potentially forget to
> disable
> fbdev and friends during suspend/resume, let's fix it."
> 
> Reported-by: Ruben Wauters <[email protected]>
> Closes: https://gitlab.freedesktop.org/drm/nouveau/-/work_items/517
> Fixes: 6c65db809796 ("Revert "drm/nouveau/disp: Set
> drm_mode_config_funcs.atomic_(check|commit)")
> Cc: [email protected]
> Signed-off-by: Dave Airlie <[email protected]>
> ---
>  drivers/gpu/drm/nouveau/nouveau_display.c | 11 ++++++++++-
>  1 file changed, 10 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c
> b/drivers/gpu/drm/nouveau/nouveau_display.c
> index d71dcfc6ee66..07882624a7f6 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_display.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_display.c
> @@ -354,6 +354,11 @@ static const struct drm_mode_config_funcs
> nouveau_mode_config_funcs = {
>       .fb_create = nouveau_user_framebuffer_create,
>  };
>  
> +static const struct drm_mode_config_funcs
> nouveau_mode_config_funcs_atomic = {
> +     .fb_create = nouveau_user_framebuffer_create,
> +     .atomic_commit = drm_atomic_helper_commit,
> +     .atomic_check = drm_atomic_helper_check,
> +};
>  
>  struct nouveau_drm_prop_enum_list {
>       u8 gen_mask;
> @@ -654,7 +659,11 @@ nouveau_display_create(struct drm_device *dev)
>       drm_mode_create_scaling_mode_property(dev);
>       drm_mode_create_dvi_i_properties(dev);
>  
> -     dev->mode_config.funcs = &nouveau_mode_config_funcs;
> +     /* this only gets set if the driver has the ATOMIC flag */
> +     if (drm_drv_uses_atomic_modeset(dev))
> +             dev->mode_config.funcs =
> &nouveau_mode_config_funcs_atomic;
> +     else
> +             dev->mode_config.funcs = &nouveau_mode_config_funcs;
>  
>       dev->mode_config.min_width = 0;
>       dev->mode_config.min_height = 0;
> 
> ---
> base-commit: 067c5c24cef23d913b67eaaf71ae67e7169a6620
> change-id: 20261111-nouveau-atomic-fix-7478260ce6a7
> 
> Best regards,

Reply via email to