Skip to content

Commit

Permalink
drm/i915/psr: Fix register name mess up.
Browse files Browse the repository at this point in the history
Commit 77affa3 ("drm/i915/psr: Fix compiler warnings for
hsw_psr_disable()") swapped status and control registers while fixing
indentation. The _ctl at the end of the status register name must have to
led to this.

Fixes: 77affa3 ("drm/i915/psr: Fix compiler warnings for hsw_psr_disable()")
References: https://www.mrc-cbu.cam.ac.uk/people/matt.davis/cmabridge/
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171220043520.2599-1-dhinakaran.pandiyan@intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
  • Loading branch information
Dhinakaran Pandiyan authored and Chris Wilson committed Dec 20, 2017
1 parent 16c8619 commit 14c6547
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions drivers/gpu/drm/i915/intel_psr.c
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ static void hsw_psr_disable(struct intel_dp *intel_dp,
struct drm_i915_private *dev_priv = to_i915(dev);

if (dev_priv->psr.active) {
i915_reg_t psr_ctl;
i915_reg_t psr_status;
u32 psr_status_mask;

if (dev_priv->psr.aux_frame_sync)
Expand All @@ -599,24 +599,24 @@ static void hsw_psr_disable(struct intel_dp *intel_dp,
0);

if (dev_priv->psr.psr2_support) {
psr_ctl = EDP_PSR2_CTL;
psr_status = EDP_PSR2_STATUS_CTL;
psr_status_mask = EDP_PSR2_STATUS_STATE_MASK;

I915_WRITE(psr_ctl,
I915_READ(psr_ctl) &
I915_WRITE(EDP_PSR2_CTL,
I915_READ(EDP_PSR2_CTL) &
~(EDP_PSR2_ENABLE | EDP_SU_TRACK_ENABLE));

} else {
psr_ctl = EDP_PSR_STATUS_CTL;
psr_status = EDP_PSR_STATUS_CTL;
psr_status_mask = EDP_PSR_STATUS_STATE_MASK;

I915_WRITE(psr_ctl,
I915_READ(psr_ctl) & ~EDP_PSR_ENABLE);
I915_WRITE(EDP_PSR_CTL,
I915_READ(EDP_PSR_CTL) & ~EDP_PSR_ENABLE);
}

/* Wait till PSR is idle */
if (intel_wait_for_register(dev_priv,
psr_ctl, psr_status_mask, 0,
psr_status, psr_status_mask, 0,
2000))
DRM_ERROR("Timed out waiting for PSR Idle State\n");

Expand Down

0 comments on commit 14c6547

Please sign in to comment.