drm/i915: Pass idle crtc_state to intel_dp_sink_crc

IPS can only be enabled if the primary plane is visible, so
first make sure sw state matches hw state by waiting for hw_done.

After this pass crtc_state to intel_dp_sink_crc() so that can be used,
instead of using legacy pointers.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171110113503.16253-7-maarten.lankhorst@linux.intel.com
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index ff8f508a7661485edf3e4ee101258c2558714f39..df3852c02a35341ff0924bb2135430e42f6bb072 100644 (file)
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2746,6 +2746,7 @@ static int i915_sink_crc(struct seq_file *m, void *data)
        for_each_intel_connector_iter(connector, &conn_iter) {
                struct drm_crtc *crtc;
                struct drm_connector_state *state;
+               struct intel_crtc_state *crtc_state;
 
                if (connector->base.connector_type != DRM_MODE_CONNECTOR_eDP)
                        continue;
@@ -2764,12 +2765,24 @@ retry:
                if (ret)
                        goto err;
 
-               if (!crtc->state->active)
+               crtc_state = to_intel_crtc_state(crtc->state);
+               if (!crtc_state->base.active)
                        continue;
 
+               /*
+                * We need to wait for all crtc updates to complete, to make
+                * sure any pending modesets and plane updates are completed.
+                */
+               if (crtc_state->base.commit) {
+                       ret = wait_for_completion_interruptible(&crtc_state->base.commit->hw_done);
+
+                       if (ret)
+                               goto err;
+               }
+
                intel_dp = enc_to_intel_dp(state->best_encoder);
 
-               ret = intel_dp_sink_crc(intel_dp, crc);
+               ret = intel_dp_sink_crc(intel_dp, crtc_state, crc);
                if (ret)
                        goto err;
 

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index c9c416389d0ef6581fcb9f580dae42bd4d79ec24..74c7cd655db4865219a608480494a49b5a5e8259 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -3861,11 +3861,12 @@ intel_dp_configure_mst(struct intel_dp *intel_dp)
                                        intel_dp->is_mst);
 }
 
-static int intel_dp_sink_crc_stop(struct intel_dp *intel_dp)
+static int intel_dp_sink_crc_stop(struct intel_dp *intel_dp,
+                                 struct intel_crtc_state *crtc_state, bool disable_wa)
 {
        struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
        struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);
-       struct intel_crtc *intel_crtc = to_intel_crtc(dig_port->base.base.crtc);
+       struct intel_crtc *intel_crtc = to_intel_crtc(crtc_state->base.crtc);
        u8 buf;
        int ret = 0;
        int count = 0;
@@ -3901,15 +3902,17 @@ static int intel_dp_sink_crc_stop(struct intel_dp *intel_dp)
        }
 
  out:
-       hsw_enable_ips(intel_crtc);
+       if (disable_wa)
+               hsw_enable_ips(intel_crtc);
        return ret;
 }
 
-static int intel_dp_sink_crc_start(struct intel_dp *intel_dp)
+static int intel_dp_sink_crc_start(struct intel_dp *intel_dp,
+                                  struct intel_crtc_state *crtc_state)
 {
        struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
        struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);
-       struct intel_crtc *intel_crtc = to_intel_crtc(dig_port->base.base.crtc);
+       struct intel_crtc *intel_crtc = to_intel_crtc(crtc_state->base.crtc);
        u8 buf;
        int ret;
 
@@ -3923,7 +3926,7 @@ static int intel_dp_sink_crc_start(struct intel_dp *intel_dp)
                return -EIO;
 
        if (buf & DP_TEST_SINK_START) {
-               ret = intel_dp_sink_crc_stop(intel_dp);
+               ret = intel_dp_sink_crc_stop(intel_dp, crtc_state, false);
                if (ret)
                        return ret;
        }
@@ -3940,16 +3943,16 @@ static int intel_dp_sink_crc_start(struct intel_dp *intel_dp)
        return 0;
 }
 
-int intel_dp_sink_crc(struct intel_dp *intel_dp, u8 *crc)
+int intel_dp_sink_crc(struct intel_dp *intel_dp, struct intel_crtc_state *crtc_state, u8 *crc)
 {
        struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
        struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);
-       struct intel_crtc *intel_crtc = to_intel_crtc(dig_port->base.base.crtc);
+       struct intel_crtc *intel_crtc = to_intel_crtc(crtc_state->base.crtc);
        u8 buf;
        int count, ret;
        int attempts = 6;
 
-       ret = intel_dp_sink_crc_start(intel_dp);
+       ret = intel_dp_sink_crc_start(intel_dp, crtc_state);
        if (ret)
                return ret;
 
@@ -3977,7 +3980,7 @@ int intel_dp_sink_crc(struct intel_dp *intel_dp, u8 *crc)
        }
 
 stop:
-       intel_dp_sink_crc_stop(intel_dp);
+       intel_dp_sink_crc_stop(intel_dp, crtc_state, true);
        return ret;
 }
 

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 645c5e8ee9f06e912d87dbf105a35136c648e437..225392fe67625ff59dbdde2da47702306515a116 100644 (file)
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1531,7 +1531,8 @@ void intel_dp_sink_dpms(struct intel_dp *intel_dp, int mode);
 void intel_dp_encoder_reset(struct drm_encoder *encoder);
 void intel_dp_encoder_suspend(struct intel_encoder *intel_encoder);
 void intel_dp_encoder_destroy(struct drm_encoder *encoder);
-int intel_dp_sink_crc(struct intel_dp *intel_dp, u8 *crc);
+int intel_dp_sink_crc(struct intel_dp *intel_dp,
+                     struct intel_crtc_state *crtc_state, u8 *crc);
 bool intel_dp_compute_config(struct intel_encoder *encoder,
                             struct intel_crtc_state *pipe_config,
                             struct drm_connector_state *conn_state);