• Maxime Ripard's avatar
    drm/atomic: Pass the full state to CRTC atomic enable/disable · 351f950d
    Maxime Ripard authored
    If the CRTC driver ever needs to access the full DRM state, it can't do so
    at atomic_enable / atomic_disable time since drm_atomic_helper_swap_state
    will have cleared the pointer from the struct drm_crtc_state to the struct
    drm_atomic_state before calling those hooks.
    
    In order to allow that, let's pass the full DRM state to atomic_enable and
    atomic_disable. The conversion was done using the coccinelle script below,
    built tested on all the drivers and actually tested on vc4.
    
    virtual report
    
    @@
    struct drm_crtc_helper_funcs *FUNCS;
    identifier dev, state;
    identifier crtc, crtc_state;
    @@
    
     disable_outputs(struct drm_device *dev, struct drm_atomic_state *state)
     {
     	<...
    -	FUNCS->atomic_disable(crtc, crtc_state);
    +	FUNCS->atomic_disable(crtc, state);
     	...>
     }
    
    @@
    struct drm_crtc_helper_funcs *FUNCS;
    identifier dev, state;
    identifier crtc, crtc_state;
    @@
    
     drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, struct drm_atomic_state *state)
     {
     	<...
    -	FUNCS->atomic_enable(crtc, crtc_state);
    +	FUNCS->atomic_enable(crtc, state);
     	...>
     }
    
    @@
    identifier crtc, old_state;
    @@
    
     struct drm_crtc_helper_funcs {
    	...
    -	void (*atomic_enable)(struct drm_crtc *crtc, struct drm_crtc_state *old_state);
    +	void (*atomic_enable)(struct drm_crtc *crtc, struct drm_atomic_state *state);
    	...
    -	void (*atomic_disable)(struct drm_crtc *crtc, struct drm_crtc_state *old_state);
    +	void (*atomic_disable)(struct drm_crtc *crtc, struct drm_atomic_state *state);
    	...
    }
    
    @ crtc_atomic_func @
    identifier helpers;
    identifier func;
    @@
    
    (
    static struct drm_crtc_helper_funcs helpers = {
    	...,
    	.atomic_enable = func,
    	...,
    };
    |
    static struct drm_crtc_helper_funcs helpers = {
    	...,
    	.atomic_disable = func,
    	...,
    };
    )
    
    @ ignores_old_state @
    identifier crtc_atomic_func.func;
    identifier crtc, old_state;
    @@
    
    void func(struct drm_crtc *crtc,
    		struct drm_crtc_state *old_state)
    {
    	... when != old_state
    }
    
    @ adds_old_state depends on crtc_atomic_func && !ignores_old_state @
    identifier crtc_atomic_func.func;
    identifier crtc, old_state;
    @@
    
    void func(struct drm_crtc *crtc, struct drm_crtc_state *old_state)
    {
    +	struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state, crtc);
    	...
    }
    
    @ depends on crtc_atomic_func @
    identifier crtc_atomic_func.func;
    expression E;
    type T;
    @@
    
    void func(...)
    {
    	...
    -	T state = E;
    +	T crtc_state = E;
    	<+...
    -	state
    +	crtc_state
    	...+>
    
    }
    
    @ depends on crtc_atomic_func @
    identifier crtc_atomic_func.func;
    type T;
    @@
    
    void func(...)
    {
    	...
    -	T state;
    +	T crtc_state;
    	<+...
    -	state
    +	crtc_state
    	...+>
    
    }
    
    @ depends on crtc_atomic_func @
    identifier crtc_atomic_func.func;
    identifier old_state;
    identifier crtc;
    @@
    
    void func(struct drm_crtc *crtc,
    -	       struct drm_crtc_state *old_state
    +	       struct drm_atomic_state *state
    	       )
    		{ ... }
    
    @ include depends on adds_old_state @
    @@
    
     #include <drm/drm_atomic.h>
    
    @ no_include depends on !include && adds_old_state @
    @@
    
    + #include <drm/drm_atomic.h>
      #include <drm/...>
    Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
    Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
    Link: https://patchwork.freedesktop.org/patch/msgid/845aa10ef171fc0ea060495efef142a0c13f7870.1602161031.git-series.maxime@cerno.tech
    351f950d
rcar_du_crtc.c 34 KB