Commit 2807cf69 authored by Daniel Vetter's avatar Daniel Vetter

drm/i915: Track the psr dp connector in dev_priv->psr.enabled

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: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 1fcc9d1c
...@@ -1894,7 +1894,7 @@ static int i915_edp_psr_status(struct seq_file *m, void *data) ...@@ -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, "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, "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)); seq_printf(m, "Active: %s\n", yesno(dev_priv->psr.active));
enabled = HAS_PSR(dev) && enabled = HAS_PSR(dev) &&
......
...@@ -658,10 +658,11 @@ struct i915_drrs { ...@@ -658,10 +658,11 @@ struct i915_drrs {
struct intel_connector *connector; struct intel_connector *connector;
}; };
struct intel_dp;
struct i915_psr { struct i915_psr {
bool sink_support; bool sink_support;
bool source_ok; bool source_ok;
bool enabled; struct intel_dp *enabled;
bool active; bool active;
struct delayed_work work; struct delayed_work work;
}; };
......
...@@ -1843,7 +1843,7 @@ static void intel_edp_psr_do_enable(struct intel_dp *intel_dp) ...@@ -1843,7 +1843,7 @@ static void intel_edp_psr_do_enable(struct intel_dp *intel_dp)
/* Enable PSR on the host */ /* Enable PSR on the host */
intel_edp_psr_enable_source(intel_dp); intel_edp_psr_enable_source(intel_dp);
dev_priv->psr.enabled = true; dev_priv->psr.enabled = intel_dp;
dev_priv->psr.active = true; dev_priv->psr.active = true;
} }
...@@ -1884,26 +1884,22 @@ void intel_edp_psr_disable(struct intel_dp *intel_dp) ...@@ -1884,26 +1884,22 @@ void intel_edp_psr_disable(struct intel_dp *intel_dp)
EDP_PSR_STATUS_STATE_MASK) == 0, 2000, 10)) EDP_PSR_STATUS_STATE_MASK) == 0, 2000, 10))
DRM_ERROR("Timed out waiting for PSR Idle State\n"); 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) static void intel_edp_psr_work(struct work_struct *work)
{ {
struct drm_i915_private *dev_priv = struct drm_i915_private *dev_priv =
container_of(work, typeof(*dev_priv), psr.work.work); container_of(work, typeof(*dev_priv), psr.work.work);
struct drm_device *dev = dev_priv->dev; struct intel_dp *intel_dp = dev_priv->psr.enabled;
struct intel_encoder *encoder;
struct intel_dp *intel_dp = NULL;
list_for_each_entry(encoder, &dev->mode_config.encoder_list, base.head) if (!intel_dp)
if (encoder->type == INTEL_OUTPUT_EDP) { return;
intel_dp = enc_to_intel_dp(&encoder->base);
if (!intel_edp_psr_match_conditions(intel_dp)) if (!intel_edp_psr_match_conditions(intel_dp))
intel_edp_psr_disable(intel_dp); intel_edp_psr_disable(intel_dp);
else else
intel_edp_psr_do_enable(intel_dp); intel_edp_psr_do_enable(intel_dp);
}
} }
static void intel_edp_psr_inactivate(struct drm_device *dev) static void intel_edp_psr_inactivate(struct drm_device *dev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment