From: Dhinakaran Pandiyan <dhinakaran.pandiyan@gmail.com>
To: intel-gfx@lists.freedesktop.org
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>,
Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Subject: Re: [PATCH] drm/i915/psr: Fix register name mess up.
Date: Tue, 19 Dec 2017 22:46:51 -0800 [thread overview]
Message-ID: <4254568.DWFaLGn7I4@dk> (raw)
In-Reply-To: <20171220043520.2599-1-dhinakaran.pandiyan@intel.com>
On Tuesday, December 19, 2017 8:35:20 PM PST Dhinakaran Pandiyan wrote:
> Commit 77affa31722b ("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.
>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Fixes: 77affa31722b ("drm/i915/psr: Fix compiler warnings for hsw_psr_disable()")
> Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
> ---
> drivers/gpu/drm/i915/intel_psr.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_psr.c
> b/drivers/gpu/drm/i915/intel_psr.c index 095e0a5a8574..863650366425 100644
> --- a/drivers/gpu/drm/i915/intel_psr.c
> +++ b/drivers/gpu/drm/i915/intel_psr.c
> @@ -580,7 +580,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)
> @@ -589,24 +589,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");
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-12-20 6:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-20 4:35 [PATCH] drm/i915/psr: Fix register name mess up Dhinakaran Pandiyan
2017-12-20 4:57 ` ✓ Fi.CI.BAT: success for " Patchwork
2017-12-20 5:45 ` ✓ Fi.CI.IGT: " Patchwork
2017-12-20 6:46 ` Dhinakaran Pandiyan [this message]
2017-12-20 9:27 ` [PATCH] " Chris Wilson
2017-12-20 9:24 ` Chris Wilson
2017-12-20 19:40 ` Pandiyan, Dhinakaran
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4254568.DWFaLGn7I4@dk \
--to=dhinakaran.pandiyan@gmail.com \
--cc=dhinakaran.pandiyan@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=rodrigo.vivi@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox