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

Commit f76f35dc authored by Chandra Konduru's avatar Chandra Konduru Committed by Daniel Vetter
Browse files

drm/i915: copy staged scaler state from drm state to crtc->config. 



This is required for commit to perform as per staged assignment
of scalers until atomic crtc commit function is available.

As a place holder doing this copy from intel_atomic_commit for
scaling to operate correctly.

Signed-off-by: default avatarChandra Konduru <chandra.konduru@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent e04fa803

drivers/gpu/drm/i915/intel_atomic.c

+12 −0
Original line number Diff line number Diff line
@@ -168,6 +168,18 @@ int intel_atomic_commit(struct drm_device *dev, 
		swap(state->plane_states[i], plane->state);

		plane->state->state = NULL;

	}



	/* swap crtc_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;

	}



	drm_atomic_helper_commit_planes(dev, state);

	drm_atomic_helper_wait_for_vblanks(dev, state);

	drm_atomic_helper_cleanup_planes(dev, state);