• Maxime Ripard's avatar
    drm: Pass the full state to connectors atomic functions · eca22edb
    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.
    
    Now that the CRTCs have been converted, let's move forward with the
    connectors to provide a consistent interface.
    
    The conversion was done using the coccinelle script below, and built tested
    on all the drivers.
    
    @@
    identifier connector, connector_state;
    @@
    
     struct drm_connector_helper_funcs {
    	...
    	struct drm_encoder* (*atomic_best_encoder)(struct drm_connector *connector,
    -						   struct drm_connector_state *connector_state);
    +						   struct drm_atomic_state *state);
    	...
    }
    
    @@
    identifier connector, connector_state;
    @@
    
     struct drm_connector_helper_funcs {
    	...
    	void (*atomic_commit)(struct drm_connector *connector,
    -			      struct drm_connector_state *connector_state);
    +			      struct drm_atomic_state *state);
    	...
    }
    
    @@
    struct drm_connector_helper_funcs *FUNCS;
    identifier state;
    identifier connector, connector_state;
    identifier f;
    @@
    
     f(..., struct drm_atomic_state *state, ...)
     {
    	<+...
    -	FUNCS->atomic_commit(connector, connector_state);
    +	FUNCS->atomic_commit(connector, state);
    	...+>
     }
    
    @@
    struct drm_connector_helper_funcs *FUNCS;
    identifier state;
    identifier connector, connector_state;
    identifier var, f;
    @@
    
     f(struct drm_atomic_state *state, ...)
     {
    	<+...
    -	var = FUNCS->atomic_best_encoder(connector, connector_state);
    +	var = FUNCS->atomic_best_encoder(connector, state);
    	...+>
     }
    
    @ connector_atomic_func @
    identifier helpers;
    identifier func;
    @@
    
    (
    static struct drm_connector_helper_funcs helpers = {
    	...,
    	.atomic_best_encoder = func,
    	...,
    };
    |
    static struct drm_connector_helper_funcs helpers = {
    	...,
    	.atomic_commit = func,
    	...,
    };
    )
    
    @@
    identifier connector_atomic_func.func;
    identifier connector;
    symbol state;
    @@
    
     func(struct drm_connector *connector,
    -      struct drm_connector_state *state
    +      struct drm_connector_state *connector_state
          )
     {
    	...
    -	state
    +	connector_state
     	...
     }
    
    @ ignores_state @
    identifier connector_atomic_func.func;
    identifier connector, connector_state;
    @@
    
     func(struct drm_connector *connector,
          struct drm_connector_state *connector_state)
    {
    	... when != connector_state
    }
    
    @ adds_state depends on connector_atomic_func && !ignores_state @
    identifier connector_atomic_func.func;
    identifier connector, connector_state;
    @@
    
     func(struct drm_connector *connector, struct drm_connector_state *connector_state)
     {
    +	struct drm_connector_state *connector_state = drm_atomic_get_new_connector_state(state, connector);
    	...
     }
    
    @ depends on connector_atomic_func @
    identifier connector_atomic_func.func;
    identifier connector_state;
    identifier connector;
    @@
    
     func(struct drm_connector *connector,
    -     struct drm_connector_state *connector_state
    +     struct drm_atomic_state *state
    	   )
     { ... }
    
    @ include depends on adds_state @
    @@
    
     #include <drm/drm_atomic.h>
    
    @ no_include depends on !include && adds_state @
    @@
    
    + #include <drm/drm_atomic.h>
      #include <drm/...>
    Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
    Reviewed-by: default avatarRodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
    Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
    Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
    Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
    Cc: Leo Li <sunpeng.li@amd.com>
    Cc: Alex Deucher <alexander.deucher@amd.com>
    Cc: "Christian König" <christian.koenig@amd.com>
    Cc: Jani Nikula <jani.nikula@linux.intel.com>
    Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
    Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
    Cc: Ben Skeggs <bskeggs@redhat.com>
    Cc: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
    Cc: Melissa Wen <melissa.srw@gmail.com>
    Cc: Haneen Mohammed <hamohammed.sa@gmail.com>
    Link: https://patchwork.freedesktop.org/patch/msgid/20201118094758.506730-1-maxime@cerno.tech
    eca22edb
intel_dp_mst.c 30.2 KB