• Maxime Ripard's avatar
    drm/atomic: Pass the full state to planes async atomic check and update · 5ddb0bd4
    Maxime Ripard authored
    The current atomic helpers have either their object state being passed as
    an argument or the full atomic state.
    
    The former is the pattern that was done at first, before switching to the
    latter for new hooks or when it was needed.
    
    Let's start convert all the remaining helpers to provide a consistent
    interface, starting with the planes atomic_async_check and
    atomic_async_update.
    
    The conversion was done using the coccinelle script below, built tested on
    all the drivers.
    
    @@
    identifier plane, plane_state;
    symbol state;
    @@
    
     struct drm_plane_helper_funcs {
     	...
    	int (*atomic_async_check)(struct drm_plane *plane,
    -				  struct drm_plane_state *plane_state);
    +				  struct drm_atomic_state *state);
    	...
     }
    
    @@
    identifier plane, plane_state;
    symbol state;
    @@
     struct drm_plane_helper_funcs {
     	...
    	void (*atomic_async_update)(struct drm_plane *plane,
    -				    struct drm_plane_state *plane_state);
    +				    struct drm_atomic_state *state);
    	...
     }
    
    @ plane_atomic_func @
    identifier helpers;
    identifier func;
    @@
    
    (
     static const struct drm_plane_helper_funcs helpers = {
    	...,
     	.atomic_async_check = func,
    	...,
     };
    |
     static const struct drm_plane_helper_funcs helpers = {
     	...,
     	.atomic_async_update = func,
     	...,
     };
    )
    
    @@
    struct drm_plane_helper_funcs *FUNCS;
    identifier f;
    identifier dev;
    identifier plane, plane_state, state;
    @@
    
     f(struct drm_device *dev, struct drm_atomic_state *state)
     {
     	<+...
    -	FUNCS->atomic_async_check(plane, plane_state)
    +	FUNCS->atomic_async_check(plane, state)
     	...+>
     }
    
    @@
    struct drm_plane_helper_funcs *FUNCS;
    identifier f;
    identifier dev;
    identifier plane, plane_state, state;
    @@
    
     f(struct drm_device *dev, struct drm_atomic_state *state)
     {
     	<+...
    -	FUNCS->atomic_async_update(plane, plane_state)
    +	FUNCS->atomic_async_update(plane, state)
     	...+>
     }
    
    @@
    identifier mtk_plane_atomic_async_update;
    identifier plane;
    symbol new_state, state;
    expression e;
    @@
    
      void mtk_plane_atomic_async_update(struct drm_plane *plane, struct drm_plane_state *new_state)
    {
      ...
    - struct mtk_plane_state *state = e;
    + struct mtk_plane_state *new_plane_state = e;
      <+...
    -       state
    +       new_plane_state
      ...+>
      }
    
    @@
    identifier plane_atomic_func.func;
    identifier plane;
    symbol state;
    @@
    
     func(struct drm_plane *plane,
    -    struct drm_plane_state *state)
    +    struct drm_plane_state *new_plane_state)
     {
    	<...
    -	state
    +	new_plane_state
    	...>
     }
    
    @ ignores_new_state @
    identifier plane_atomic_func.func;
    identifier plane, new_plane_state;
    @@
    
     func(struct drm_plane *plane, struct drm_plane_state *new_plane_state)
     {
    	... when != new_plane_state
     }
    
    @ adds_new_state depends on plane_atomic_func && !ignores_new_state @
    identifier plane_atomic_func.func;
    identifier plane, new_plane_state;
    @@
    
     func(struct drm_plane *plane, struct drm_plane_state *new_plane_state)
     {
    +	struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state, plane);
     	...
     }
    
    @ depends on plane_atomic_func @
    identifier plane_atomic_func.func;
    identifier plane, plane_state;
    @@
    
     func(struct drm_plane *plane,
    -     struct drm_plane_state *plane_state
    +     struct drm_atomic_state *state
         )
     { ... }
    
    @ include depends on adds_new_state @
    @@
    
     #include <drm/drm_atomic.h>
    
    @ no_include depends on !include && adds_new_state @
    @@
    
    + #include <drm/drm_atomic.h>
      #include <drm/...>
    
    @@
    identifier plane_atomic_func.func;
    identifier plane, state;
    identifier plane_state;
    @@
    
     func(struct drm_plane *plane, struct drm_atomic_state *state) {
            ...
            struct drm_plane_state *plane_state = drm_atomic_get_new_plane_state(state, plane);
            <+...
    -       plane_state->state
    +       state
            ...+>
     }
    Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
    Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
    Link: https://patchwork.freedesktop.org/patch/msgid/20210219120032.260676-1-maxime@cerno.tech
    5ddb0bd4
mtk_drm_plane.c 6.86 KB