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

Commit 61c05498 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Jani Nikula
Browse files

drm/i915: Use drm_atomic_helper_swap_state in intel_atomic_commit. 



And update crtc->config to point to the new state. There is no point
in swapping only part of the state when the rest of the state
should be untouched.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent de419ab6

drivers/gpu/drm/i915/intel_atomic.c

+12 −32
Original line number Diff line number Diff line
@@ -129,6 +129,8 @@ int intel_atomic_commit(struct drm_device *dev, 
			struct drm_atomic_state *state,

			bool async)

{

	struct drm_crtc_state *crtc_state;

	struct drm_crtc *crtc;

	int ret;

	int i;
@@ -142,48 +144,26 @@ int intel_atomic_commit(struct drm_device *dev, 
		return ret;



	/* Point of no return */

	drm_atomic_helper_swap_state(dev, state);



	for_each_crtc_in_state(state, crtc, crtc_state, i) {

		to_intel_crtc(crtc)->config = to_intel_crtc_state(crtc->state);



		if (INTEL_INFO(dev)->gen >= 9)

			skl_detach_scalers(to_intel_crtc(crtc));

	}



	/*

	 * FIXME:  The proper sequence here will eventually be:

	 *

	 * drm_atomic_helper_swap_state(dev, state)

	 * drm_atomic_helper_commit_modeset_disables(dev, state);

	 * drm_atomic_helper_commit_planes(dev, state);

	 * drm_atomic_helper_commit_modeset_enables(dev, state);

	 * drm_atomic_helper_wait_for_vblanks(dev, state);

	 * drm_atomic_helper_cleanup_planes(dev, state);

	 * drm_atomic_state_free(state);

	 *

	 * once we have full atomic modeset.  For now, just manually update

	 * plane states to avoid clobbering good states with dummy states

	 * while nuclear pageflipping.

	 * once we have full atomic modeset.

	 */

	for (i = 0; i < dev->mode_config.num_total_plane; i++) {

		struct drm_plane *plane = state->planes[i];



		if (!plane)

			continue;



		plane->state->state = state;

		swap(state->plane_states[i], plane->state);

		plane->state->state = NULL;

	}



	/* swap crtc_scaler_state */

	for (i = 0; i < dev->mode_config.num_crtc; i++) {

		struct drm_crtc *crtc = state->crtcs[i];

		if (!crtc) {

			continue;

		}



		to_intel_crtc(crtc)->config->scaler_state =

			to_intel_crtc_state(state->crtc_states[i])->scaler_state;



		if (INTEL_INFO(dev)->gen >= 9)

			skl_detach_scalers(to_intel_crtc(crtc));

	}



	drm_atomic_helper_commit_planes(dev, state);



	drm_atomic_helper_wait_for_vblanks(dev, state);

	drm_atomic_helper_cleanup_planes(dev, state);

	drm_atomic_state_free(state);