drm/i915: Ensure setting up scalers into staged crtc_state

From intel_atomic_check, call intel_atomic_setup_scalers() to
assign scalers based on staged scaling requests. Fail the
transaction if setup returns error.

Setting up of scalers should be moved to atomic crtc check  once
atomic crtc is ready.

v2:
-updated parameter passing to setup_scalers (me)

Signed-off-by: Chandra Konduru <chandra.konduru@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c
index c5e4b6c30643136ed4d50d9377fbee0297df752c..42045ce2989829f9677310b91294abd0fa364dcf 100644 (file)
--- a/drivers/gpu/drm/i915/intel_atomic.c
+++ b/drivers/gpu/drm/i915/intel_atomic.c
@@ -48,6 +48,8 @@ int intel_atomic_check(struct drm_device *dev,
        int ncrtcs = dev->mode_config.num_crtc;
        int nconnectors = dev->mode_config.num_connector;
        enum pipe nuclear_pipe = INVALID_PIPE;
+       struct intel_crtc *nuclear_crtc = NULL;
+       struct intel_crtc_state *crtc_state = NULL;
        int ret;
        int i;
        bool not_nuclear = false;
@@ -80,6 +82,10 @@ int intel_atomic_check(struct drm_device *dev,
                        memset(&crtc->atomic, 0, sizeof(crtc->atomic));
                if (crtc && crtc->pipe != nuclear_pipe)
                        not_nuclear = true;
+               if (crtc && crtc->pipe == nuclear_pipe) {
+                       nuclear_crtc = crtc;
+                       crtc_state = to_intel_crtc_state(state->crtc_states[i]);
+               }
        }
        for (i = 0; i < nconnectors; i++)
                if (state->connectors[i] != NULL)
@@ -94,6 +100,11 @@ int intel_atomic_check(struct drm_device *dev,
        if (ret)
                return ret;
 
+       /* FIXME: move to crtc atomic check function once it is ready */
+       ret = intel_atomic_setup_scalers(dev, nuclear_crtc, crtc_state);
+       if (ret)
+               return ret;
+
        return ret;
 }