From: Chandra Konduru Date: Tue, 7 Apr 2015 22:28:44 +0000 (-0700) Subject: drm/i915: copy staged scaler state from drm state to crtc->config. X-Git-Tag: v4.2-rc1~13^2~58^2~69 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f76f35dc040e44d63369fdba3124701feec714f0;p=karo-tx-linux.git 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: Chandra Konduru Reviewed-by: Matt Roper Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c index 42045ce29898..3c4b7cdeab77 100644 --- a/drivers/gpu/drm/i915/intel_atomic.c +++ b/drivers/gpu/drm/i915/intel_atomic.c @@ -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);