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 1/4] drm/i915/bxt: Avoid early timeout during PLL enable
Date: Tue, 28 Jun 2016 13:37:30 +0300	[thread overview]
Message-ID: <1467110253-16046-2-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.

I noticed this via the PLL locking timing out incorrectly, with this fix
I couldn't reproduce the problem.

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_dpll_mgr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.c b/drivers/gpu/drm/i915/intel_dpll_mgr.c
index c0eff15..e130c3e 100644
--- a/drivers/gpu/drm/i915/intel_dpll_mgr.c
+++ b/drivers/gpu/drm/i915/intel_dpll_mgr.c
@@ -1374,8 +1374,8 @@ static void bxt_ddi_pll_enable(struct drm_i915_private *dev_priv,
 	I915_WRITE(BXT_PORT_PLL_ENABLE(port), temp);
 	POSTING_READ(BXT_PORT_PLL_ENABLE(port));
 
-	if (wait_for_atomic_us((I915_READ(BXT_PORT_PLL_ENABLE(port)) &
-			PORT_PLL_LOCK), 200))
+	if (wait_for_us((I915_READ(BXT_PORT_PLL_ENABLE(port)) & PORT_PLL_LOCK),
+			200))
 		DRM_ERROR("PLL %d not locked\n", port);
 
 	/*
-- 
2.5.0

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

  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 ` Imre Deak [this message]
2016-06-28 10:48   ` [PATCH 1/4] drm/i915/bxt: Avoid early timeout during PLL enable 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 ` [PATCH 3/4] drm/i915/hsw: Avoid early timeout during LCPLL disable/restore Imre Deak
2016-06-28 11:17   ` 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-2-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