diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-07-11 10:30:09 -0700 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-07-23 07:05:14 +0200 |
| commit | 9a603f48fa2e0760d043bd66f4dc62055ea8c745 (patch) | |
| tree | 4bc85af396feaf51f5f6045030f4c04863f31ba1 /drivers/gpu/drm/i915/intel_dp.c | |
| parent | b04c5bd6fda54703e56f29569e4bca489d6c5a5c (diff) | |
| download | op-kernel-dev-9a603f48fa2e0760d043bd66f4dc62055ea8c745.zip op-kernel-dev-9a603f48fa2e0760d043bd66f4dc62055ea8c745.tar.gz | |
drm/i915: Run psr_setup unconditionally
Due to runtime pm and system s/r we need to restore hw state every
time we enable a pipe again. Hence trying to avoid that is just
pointless book-keeping which Rodrigo then tried to work around by
manually adding psr_setup calls to our resume code.
Much simpler to just remove code instead.
v2: Properly bail out of psr exit if psr isn't enabled. Spotted by
Rodrigo.
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index ec080e5..6359005 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -1681,9 +1681,6 @@ static void intel_edp_psr_setup(struct intel_dp *intel_dp) struct drm_i915_private *dev_priv = dev->dev_private; struct edp_vsc_psr psr_vsc; - if (dev_priv->psr.setup_done) - return; - /* Prepare VSC packet as per EDP 1.3 spec, Table 3.10 */ memset(&psr_vsc, 0, sizeof(psr_vsc)); psr_vsc.sdp_header.HB0 = 0; @@ -1695,8 +1692,6 @@ static void intel_edp_psr_setup(struct intel_dp *intel_dp) /* Avoid continuous PSR exit by masking memup and hpd */ I915_WRITE(EDP_PSR_DEBUG_CTL(dev), EDP_PSR_DEBUG_MASK_MEMUP | EDP_PSR_DEBUG_MASK_HPD | EDP_PSR_DEBUG_MASK_LPSP); - - dev_priv->psr.setup_done = true; } static void intel_edp_psr_enable_sink(struct intel_dp *intel_dp) @@ -1928,7 +1923,7 @@ void intel_edp_psr_exit(struct drm_device *dev) if (!HAS_PSR(dev)) return; - if (!dev_priv->psr.setup_done) + if (!dev_priv->psr.enabled) return; cancel_delayed_work_sync(&dev_priv->psr.work); |
