Commit d1c7dc57 authored by Linus Walleij's avatar Linus Walleij
Browse files

drm/atomic-helper: Export and namespace some functions 



Export and namespace those not prefixed with drm_* so
it becomes possible to write custom commit tail functions
in individual drivers using the helper infrastructure.

Tested-by: default avatarMarek Vasut <marek.vasut+renesas@mailbox.org>
Reviewed-by: default avatarMaxime Ripard <mripard@kernel.org>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Cc: stable@vger.kernel.org # v6.17+
Fixes: c9b1150a ("drm/atomic-helper: Re-order bridge chain pre-enable and post-disable")
Reviewed-by: default avatarAradhya Bhatia <aradhya.bhatia@linux.dev>
Reviewed-by: default avatarLinus Walleij <linusw@kernel.org>
Tested-by: default avatarLinus Walleij <linusw@kernel.org>
Signed-off-by: default avatarLinus Walleij <linusw@kernel.org>
Link: https://patch.msgid.link/20251205-drm-seq-fix-v1-3-fda68fa1b3de@ideasonboard.com
parent 33e8150b

drivers/gpu/drm/drm_atomic_helper.c

+99 −23
Original line number Diff line number Diff line
@@ -1162,8 +1162,18 @@ crtc_needs_disable(struct drm_crtc_state *old_state, 
	       new_state->self_refresh_active;

}



static void

encoder_bridge_disable(struct drm_device *dev, struct drm_atomic_state *state)

/**

 * drm_atomic_helper_commit_encoder_bridge_disable - disable bridges and encoder

 * @dev: DRM device

 * @state: the driver state object

 *

 * Loops over all connectors in the current state and if the CRTC needs

 * it, disables the bridge chain all the way, then disables the encoder

 * afterwards.

 */

void

drm_atomic_helper_commit_encoder_bridge_disable(struct drm_device *dev,

						struct drm_atomic_state *state)

{

	struct drm_connector *connector;

	struct drm_connector_state *old_conn_state, *new_conn_state;
@@ -1229,9 +1239,18 @@ encoder_bridge_disable(struct drm_device *dev, struct drm_atomic_state *state) 
		}

	}

}

EXPORT_SYMBOL(drm_atomic_helper_commit_encoder_bridge_disable);



static void

crtc_disable(struct drm_device *dev, struct drm_atomic_state *state)

/**

 * drm_atomic_helper_commit_crtc_disable - disable CRTSs

 * @dev: DRM device

 * @state: the driver state object

 *

 * Loops over all CRTCs in the current state and if the CRTC needs

 * it, disables it.

 */

void

drm_atomic_helper_commit_crtc_disable(struct drm_device *dev, struct drm_atomic_state *state)

{

	struct drm_crtc *crtc;

	struct drm_crtc_state *old_crtc_state, *new_crtc_state;
@@ -1282,9 +1301,18 @@ crtc_disable(struct drm_device *dev, struct drm_atomic_state *state) 
			drm_crtc_vblank_put(crtc);

	}

}

EXPORT_SYMBOL(drm_atomic_helper_commit_crtc_disable);



static void

encoder_bridge_post_disable(struct drm_device *dev, struct drm_atomic_state *state)

/**

 * drm_atomic_helper_commit_encoder_bridge_post_disable - post-disable encoder bridges

 * @dev: DRM device

 * @state: the driver state object

 *

 * Loops over all connectors in the current state and if the CRTC needs

 * it, post-disables all encoder bridges.

 */

void

drm_atomic_helper_commit_encoder_bridge_post_disable(struct drm_device *dev, struct drm_atomic_state *state)

{

	struct drm_connector *connector;

	struct drm_connector_state *old_conn_state, *new_conn_state;
@@ -1335,15 +1363,16 @@ encoder_bridge_post_disable(struct drm_device *dev, struct drm_atomic_state *sta 
		drm_bridge_put(bridge);

	}

}

EXPORT_SYMBOL(drm_atomic_helper_commit_encoder_bridge_post_disable);



static void

disable_outputs(struct drm_device *dev, struct drm_atomic_state *state)

{

	encoder_bridge_disable(dev, state);

	drm_atomic_helper_commit_encoder_bridge_disable(dev, state);



	encoder_bridge_post_disable(dev, state);

	drm_atomic_helper_commit_encoder_bridge_post_disable(dev, state);



	crtc_disable(dev, state);

	drm_atomic_helper_commit_crtc_disable(dev, state);

}



/**
@@ -1446,8 +1475,17 @@ void drm_atomic_helper_calc_timestamping_constants(struct drm_atomic_state *stat 
}

EXPORT_SYMBOL(drm_atomic_helper_calc_timestamping_constants);



static void

crtc_set_mode(struct drm_device *dev, struct drm_atomic_state *state)

/**

 * drm_atomic_helper_commit_crtc_set_mode - set the new mode

 * @dev: DRM device

 * @state: the driver state object

 *

 * Loops over all connectors in the current state and if the mode has

 * changed, change the mode of the CRTC, then call down the bridge

 * chain and change the mode in all bridges as well.

 */

void

drm_atomic_helper_commit_crtc_set_mode(struct drm_device *dev, struct drm_atomic_state *state)

{

	struct drm_crtc *crtc;

	struct drm_crtc_state *new_crtc_state;
@@ -1508,6 +1546,7 @@ crtc_set_mode(struct drm_device *dev, struct drm_atomic_state *state) 
		drm_bridge_put(bridge);

	}

}

EXPORT_SYMBOL(drm_atomic_helper_commit_crtc_set_mode);



/**

 * drm_atomic_helper_commit_modeset_disables - modeset commit to disable outputs
@@ -1531,11 +1570,20 @@ void drm_atomic_helper_commit_modeset_disables(struct drm_device *dev, 
	drm_atomic_helper_update_legacy_modeset_state(dev, state);

	drm_atomic_helper_calc_timestamping_constants(state);



	crtc_set_mode(dev, state);

	drm_atomic_helper_commit_crtc_set_mode(dev, state);

}

EXPORT_SYMBOL(drm_atomic_helper_commit_modeset_disables);



static void drm_atomic_helper_commit_writebacks(struct drm_device *dev,

/**

 * drm_atomic_helper_commit_writebacks - issue writebacks

 * @dev: DRM device

 * @state: atomic state object being committed

 *

 * This loops over the connectors, checks if the new state requires

 * a writeback job to be issued and in that case issues an atomic

 * commit on each connector.

 */

void drm_atomic_helper_commit_writebacks(struct drm_device *dev,

					 struct drm_atomic_state *state)

{

	struct drm_connector *connector;
@@ -1555,9 +1603,18 @@ static void drm_atomic_helper_commit_writebacks(struct drm_device *dev, 
		}

	}

}

EXPORT_SYMBOL(drm_atomic_helper_commit_writebacks);



static void

encoder_bridge_pre_enable(struct drm_device *dev, struct drm_atomic_state *state)

/**

 * drm_atomic_helper_commit_encoder_bridge_pre_enable - pre-enable bridges

 * @dev: DRM device

 * @state: atomic state object being committed

 *

 * This loops over the connectors and if the CRTC needs it, pre-enables

 * the entire bridge chain.

 */

void

drm_atomic_helper_commit_encoder_bridge_pre_enable(struct drm_device *dev, struct drm_atomic_state *state)

{

	struct drm_connector *connector;

	struct drm_connector_state *new_conn_state;
@@ -1588,9 +1645,18 @@ encoder_bridge_pre_enable(struct drm_device *dev, struct drm_atomic_state *state 
		drm_bridge_put(bridge);

	}

}

EXPORT_SYMBOL(drm_atomic_helper_commit_encoder_bridge_pre_enable);



static void

crtc_enable(struct drm_device *dev, struct drm_atomic_state *state)

/**

 * drm_atomic_helper_commit_crtc_enable - enables the CRTCs

 * @dev: DRM device

 * @state: atomic state object being committed

 *

 * This loops over CRTCs in the new state, and of the CRTC needs

 * it, enables it.

 */

void

drm_atomic_helper_commit_crtc_enable(struct drm_device *dev, struct drm_atomic_state *state)

{

	struct drm_crtc *crtc;

	struct drm_crtc_state *old_crtc_state;
@@ -1619,9 +1685,18 @@ crtc_enable(struct drm_device *dev, struct drm_atomic_state *state) 
		}

	}

}

EXPORT_SYMBOL(drm_atomic_helper_commit_crtc_enable);



static void

encoder_bridge_enable(struct drm_device *dev, struct drm_atomic_state *state)

/**

 * drm_atomic_helper_commit_encoder_bridge_enable - enables the bridges

 * @dev: DRM device

 * @state: atomic state object being committed

 *

 * This loops over all connectors in the new state, and of the CRTC needs

 * it, enables the entire bridge chain.

 */

void

drm_atomic_helper_commit_encoder_bridge_enable(struct drm_device *dev, struct drm_atomic_state *state)

{

	struct drm_connector *connector;

	struct drm_connector_state *new_conn_state;
@@ -1664,6 +1739,7 @@ encoder_bridge_enable(struct drm_device *dev, struct drm_atomic_state *state) 
		drm_bridge_put(bridge);

	}

}

EXPORT_SYMBOL(drm_atomic_helper_commit_encoder_bridge_enable);



/**

 * drm_atomic_helper_commit_modeset_enables - modeset commit to enable outputs
@@ -1682,11 +1758,11 @@ encoder_bridge_enable(struct drm_device *dev, struct drm_atomic_state *state) 
void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev,

					      struct drm_atomic_state *state)

{

	crtc_enable(dev, state);

	drm_atomic_helper_commit_crtc_enable(dev, state);



	encoder_bridge_pre_enable(dev, state);

	drm_atomic_helper_commit_encoder_bridge_pre_enable(dev, state);



	encoder_bridge_enable(dev, state);

	drm_atomic_helper_commit_encoder_bridge_enable(dev, state);



	drm_atomic_helper_commit_writebacks(dev, state);

}

include/drm/drm_atomic_helper.h

+22 −0
Original line number Diff line number Diff line
@@ -60,6 +60,12 @@ int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state, 
int drm_atomic_helper_check_planes(struct drm_device *dev,

			       struct drm_atomic_state *state);

int drm_atomic_helper_check_crtc_primary_plane(struct drm_crtc_state *crtc_state);

void drm_atomic_helper_commit_encoder_bridge_disable(struct drm_device *dev,

						     struct drm_atomic_state *state);

void drm_atomic_helper_commit_crtc_disable(struct drm_device *dev,

					   struct drm_atomic_state *state);

void drm_atomic_helper_commit_encoder_bridge_post_disable(struct drm_device *dev,

							  struct drm_atomic_state *state);

int drm_atomic_helper_check(struct drm_device *dev,

			    struct drm_atomic_state *state);

void drm_atomic_helper_commit_tail(struct drm_atomic_state *state);
@@ -89,8 +95,24 @@ drm_atomic_helper_update_legacy_modeset_state(struct drm_device *dev, 
void

drm_atomic_helper_calc_timestamping_constants(struct drm_atomic_state *state);



void drm_atomic_helper_commit_crtc_set_mode(struct drm_device *dev,

					    struct drm_atomic_state *state);



void drm_atomic_helper_commit_modeset_disables(struct drm_device *dev,

					       struct drm_atomic_state *state);



void drm_atomic_helper_commit_writebacks(struct drm_device *dev,

					 struct drm_atomic_state *state);



void drm_atomic_helper_commit_encoder_bridge_pre_enable(struct drm_device *dev,

							struct drm_atomic_state *state);



void drm_atomic_helper_commit_crtc_enable(struct drm_device *dev,

					  struct drm_atomic_state *state);



void drm_atomic_helper_commit_encoder_bridge_enable(struct drm_device *dev,

						    struct drm_atomic_state *state);



void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev,

					  struct drm_atomic_state *old_state);