All other state init helpers take the state as first parameter and the entity as second: __drm_atomic_helper_crtc_state_init(), __drm_atomic_helper_plane_state_init(), __drm_atomic_helper_connector_state_init(), and __drm_atomic_helper_bridge_state_init().
__drm_atomic_helper_connector_hdmi_state_init() is the only one taking the connector first and the state second. Swap its parameters to match the established convention. Suggested-by: Maíra Canal <[email protected]> Signed-off-by: Maxime Ripard <[email protected]> --- drivers/gpu/drm/display/drm_bridge_connector.c | 4 ++-- drivers/gpu/drm/display/drm_hdmi_state_helper.c | 6 +++--- drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 3 ++- drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 3 ++- drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- include/drm/display/drm_hdmi_state_helper.h | 4 ++-- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/drm/display/drm_bridge_connector.c index 81f3e26f6fdf..2202e6044444 100644 --- a/drivers/gpu/drm/display/drm_bridge_connector.c +++ b/drivers/gpu/drm/display/drm_bridge_connector.c @@ -239,6 +239,6 @@ drm_bridge_connector_create_state(struct drm_connector *connector) if (bridge_connector->bridge_hdmi) - __drm_atomic_helper_connector_hdmi_state_init(connector, - conn_state); + __drm_atomic_helper_connector_hdmi_state_init(conn_state, + connector); return conn_state; diff --git a/drivers/gpu/drm/display/drm_hdmi_state_helper.c b/drivers/gpu/drm/display/drm_hdmi_state_helper.c index 7cdb7ca3dc12..c63d439382bb 100644 --- a/drivers/gpu/drm/display/drm_hdmi_state_helper.c +++ b/drivers/gpu/drm/display/drm_hdmi_state_helper.c @@ -310,6 +310,6 @@ /** * __drm_atomic_helper_connector_hdmi_state_init() - Initialize all HDMI @drm_connector_state resources - * @connector: DRM connector * @new_conn_state: connector state to initialize + * @connector: DRM connector * * Initializes all HDMI resources from a @drm_connector_state without @@ -319,6 +319,6 @@ * drm_atomic_helper_connector_create_state(). */ -void __drm_atomic_helper_connector_hdmi_state_init(struct drm_connector *connector, - struct drm_connector_state *new_conn_state) +void __drm_atomic_helper_connector_hdmi_state_init(struct drm_connector_state *new_conn_state, + struct drm_connector *connector) { unsigned int max_bpc = connector->max_bpc; diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c index 6f4fe0c8efae..3084f6570c29 100644 --- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c @@ -294,5 +294,6 @@ static void sun4i_hdmi_connector_reset(struct drm_connector *connector) { drm_atomic_helper_connector_reset(connector); - __drm_atomic_helper_connector_hdmi_state_init(connector, connector->state); + __drm_atomic_helper_connector_hdmi_state_init(connector->state, + connector); } diff --git a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c index b2e347863a77..9953f5e661ce 100644 --- a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c +++ b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c @@ -203,5 +203,6 @@ static void dummy_hdmi_connector_reset(struct drm_connector *connector) { drm_atomic_helper_connector_reset(connector); - __drm_atomic_helper_connector_hdmi_state_init(connector, connector->state); + __drm_atomic_helper_connector_hdmi_state_init(connector->state, + connector); } diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 6b00581f304f..31942638fcd8 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -508,5 +508,5 @@ static void vc4_hdmi_connector_reset(struct drm_connector *connector) { drm_atomic_helper_connector_reset(connector); - __drm_atomic_helper_connector_hdmi_state_init(connector, connector->state); + __drm_atomic_helper_connector_hdmi_state_init(connector->state, connector); drm_atomic_helper_connector_tv_margins_reset(connector); } diff --git a/include/drm/display/drm_hdmi_state_helper.h b/include/drm/display/drm_hdmi_state_helper.h index 965342f6bbc9..21e5a9215319 100644 --- a/include/drm/display/drm_hdmi_state_helper.h +++ b/include/drm/display/drm_hdmi_state_helper.h @@ -14,6 +14,6 @@ struct hdmi_audio_infoframe; enum drm_connector_status; -void __drm_atomic_helper_connector_hdmi_state_init(struct drm_connector *connector, - struct drm_connector_state *new_conn_state); +void __drm_atomic_helper_connector_hdmi_state_init(struct drm_connector_state *new_conn_state, + struct drm_connector *connector); int drm_atomic_helper_connector_hdmi_check(struct drm_connector *connector, -- 2.55.0
