public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Imre Deak <imre.deak@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 3/4] drm/i915/hsw: Avoid early timeout during LCPLL disable/restore
Date: Tue, 28 Jun 2016 13:37:32 +0300	[thread overview]
Message-ID: <1467110253-16046-4-git-send-email-imre.deak@intel.com> (raw)
In-Reply-To: <1467110253-16046-1-git-send-email-imre.deak@intel.com>

Since wait_for_atomic doesn't re-check the wait-for condition after
expiry of the timeout it can fail when called from non-atomic context
even if the condition is set correctly before the expiry. Fix this by
using the non-atomic wait_for instead.

Fixes: 0351b93992aa ("drm/i915: Do not lie about atomic timeout granularity")
CC: Chris Wilson <chris@chris-wilson.co.uk>
CC: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 0312472..d902a70 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -9534,8 +9534,8 @@ static void hsw_disable_lcpll(struct drm_i915_private *dev_priv,
 		val |= LCPLL_CD_SOURCE_FCLK;
 		I915_WRITE(LCPLL_CTL, val);
 
-		if (wait_for_atomic_us(I915_READ(LCPLL_CTL) &
-				       LCPLL_CD_SOURCE_FCLK_DONE, 1))
+		if (wait_for_us(I915_READ(LCPLL_CTL) &
+				LCPLL_CD_SOURCE_FCLK_DONE, 1))
 			DRM_ERROR("Switching to FCLK failed\n");
 
 		val = I915_READ(LCPLL_CTL);
@@ -9608,8 +9608,8 @@ static void hsw_restore_lcpll(struct drm_i915_private *dev_priv)
 		val &= ~LCPLL_CD_SOURCE_FCLK;
 		I915_WRITE(LCPLL_CTL, val);
 
-		if (wait_for_atomic_us((I915_READ(LCPLL_CTL) &
-					LCPLL_CD_SOURCE_FCLK_DONE) == 0, 1))
+		if (wait_for_us((I915_READ(LCPLL_CTL) &
+				 LCPLL_CD_SOURCE_FCLK_DONE) == 0, 1))
 			DRM_ERROR("Switching back to LCPLL failed\n");
 	}
 
-- 
2.5.0

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

  parent reply	other threads:[~2016-06-28 10:37 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-28 10:37 [PATCH 0/4] drm/i915: Avoid early timeout due to wait_for_atomic Imre Deak
2016-06-28 10:37 ` [PATCH 1/4] drm/i915/bxt: Avoid early timeout during PLL enable Imre Deak
2016-06-28 10:48   ` Chris Wilson
2016-06-28 11:00     ` Imre Deak
2016-06-28 11:05     ` Tvrtko Ursulin
2016-06-28 11:11       ` Chris Wilson
2016-06-28 11:16       ` Imre Deak
2016-06-28 11:21         ` Tvrtko Ursulin
2016-06-28 11:26   ` Tvrtko Ursulin
2016-06-28 10:37 ` [PATCH 2/4] drm/i915/lpt: Avoid early timeout during FDI PHY reset Imre Deak
2016-06-28 10:50   ` Chris Wilson
2016-06-28 11:03     ` Imre Deak
2016-06-28 11:12   ` Tvrtko Ursulin
2016-06-28 10:37 ` Imre Deak [this message]
2016-06-28 11:17   ` [PATCH 3/4] drm/i915/hsw: Avoid early timeout during LCPLL disable/restore Tvrtko Ursulin
2016-06-28 10:37 ` [PATCH 4/4] drm/i915: Avoid early timeout during AUX transfers Imre Deak
2016-06-28 11:19   ` Tvrtko Ursulin
2016-06-28 11:00 ` ✓ Ro.CI.BAT: success for drm/i915: Avoid early timeout due to wait_for_atomic Patchwork
2016-06-28 19:17   ` Imre Deak

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=1467110253-16046-4-git-send-email-imre.deak@intel.com \
    --to=imre.deak@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /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