Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4218a32f authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/atomic-helpers: Properly avoid full modeset dance 



Legacy setCrtc has a nice fastpath for just updating the frontbuffer
when the output routing doesn't change. Which I of course tried to
keep working, except that I fumbled the job: The helpers correctly
compute ->mode_changed, CRTC updates get correctly skipped but
connector functions are called unconditionally.

Fix this.

v2: For the disable sided connector->state->crtc might be NULL.
Instead look at the old_connector_state->crtc, but still use the new
crtc state for that old crtc. Reported by Thierry.

Reported-and-Tested-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> (v1)
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Gustavo Padovan <gustavo.padovan@collabora.co.uk> (v1)
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parent 27798365

drivers/gpu/drm/drm_atomic_helper.c

+4 −2
Original line number Diff line number Diff line
@@ -587,7 +587,8 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state) 


		old_crtc_state = old_state->crtc_states[drm_crtc_index(old_conn_state->crtc)];



		if (!old_crtc_state->active)

		if (!old_crtc_state->active ||

		    !needs_modeset(old_conn_state->crtc->state))

			continue;



		encoder = old_conn_state->best_encoder;
@@ -847,7 +848,8 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, 
		if (!connector || !connector->state->best_encoder)

			continue;



		if (!connector->state->crtc->state->active)

		if (!connector->state->crtc->state->active ||

		    !needs_modeset(connector->state->crtc->state))

			continue;



		encoder = connector->state->best_encoder;