[Intel-gfx] [PATCH 03/11] drm/i915: Track the psr dp connector in dev_priv->psr.enabled

[Rodrigo Vivi]

From: Daniel Vetter <daniel.vet...@ffwll.ch>

Trying to fish that one out through looping is a bit a locking
nightmare. So just set it and use it in the work struct.

v2:
- Don't Oops in psr_work, spotted by Rodrigo.
- Fix compile warning.

Reviewed-by: Rodrigo Vivi <rodrigo.v...@intel.com>
Signed-off-by: Daniel Vetter <daniel.vet...@ffwll.ch>
Signed-off-by: Rodrigo Vivi <rodrigo.v...@intel.com>
---
 drivers/gpu/drm/i915/i915_debugfs.c |  2 +-
 drivers/gpu/drm/i915/i915_drv.h     |  3 ++-
 drivers/gpu/drm/i915/intel_dp.c     | 22 +++++++++-------------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c 
b/drivers/gpu/drm/i915/i915_debugfs.c
index 981ca42..62ea619 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1894,7 +1894,7 @@ static int i915_edp_psr_status(struct seq_file *m, void 
*data)
 
        seq_printf(m, "Sink_Support: %s\n", yesno(dev_priv->psr.sink_support));
        seq_printf(m, "Source_OK: %s\n", yesno(dev_priv->psr.source_ok));
-       seq_printf(m, "Enabled: %s\n", yesno(dev_priv->psr.enabled));
+       seq_printf(m, "Enabled: %s\n", yesno((bool)dev_priv->psr.enabled));
        seq_printf(m, "Active: %s\n", yesno(dev_priv->psr.active));
 
        enabled = HAS_PSR(dev) &&
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 91f137f..1ec4d4a 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -654,10 +654,11 @@ struct i915_drrs {
        struct intel_connector *connector;
 };
 
+struct intel_dp;
 struct i915_psr {
        bool sink_support;
        bool source_ok;
-       bool enabled;
+       struct intel_dp *enabled;
        bool active;
        struct delayed_work work;
 };
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index cb57494..a07d192 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1876,7 +1876,7 @@ static void intel_edp_psr_do_enable(struct intel_dp 
*intel_dp)
        /* Enable PSR on the host */
        intel_edp_psr_enable_source(intel_dp);
 
-       dev_priv->psr.enabled = true;
+       dev_priv->psr.enabled = intel_dp;
        dev_priv->psr.active = true;
 }
 
@@ -1917,26 +1917,22 @@ void intel_edp_psr_disable(struct intel_dp *intel_dp)
                       EDP_PSR_STATUS_STATE_MASK) == 0, 2000, 10))
                DRM_ERROR("Timed out waiting for PSR Idle State\n");
 
-       dev_priv->psr.enabled = false;
+       dev_priv->psr.enabled = NULL;
 }
 
 static void intel_edp_psr_work(struct work_struct *work)
 {
        struct drm_i915_private *dev_priv =
                container_of(work, typeof(*dev_priv), psr.work.work);
-       struct drm_device *dev = dev_priv->dev;
-       struct intel_encoder *encoder;
-       struct intel_dp *intel_dp = NULL;
+       struct intel_dp *intel_dp = dev_priv->psr.enabled;
 
-       list_for_each_entry(encoder, &dev->mode_config.encoder_list, base.head)
-               if (encoder->type == INTEL_OUTPUT_EDP) {
-                       intel_dp = enc_to_intel_dp(&encoder->base);
+       if (!intel_dp)
+               return;
 
-                       if (!intel_edp_psr_match_conditions(intel_dp))
-                               intel_edp_psr_disable(intel_dp);
-                       else
-                               intel_edp_psr_do_enable(intel_dp);
-               }
+       if (!intel_edp_psr_match_conditions(intel_dp))
+               intel_edp_psr_disable(intel_dp);
+       else
+               intel_edp_psr_do_enable(intel_dp);
 }
 
 static void intel_edp_psr_inactivate(struct drm_device *dev)
-- 
1.9.3

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx