From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: Intel-gfx@lists.freedesktop.org
Subject: [PATCH 5/5] drm/i915: Do not wait atomically for display clocks
Date: Thu, 3 Mar 2016 14:36:45 +0000 [thread overview]
Message-ID: <1457015805-23742-5-git-send-email-tvrtko.ursulin@linux.intel.com> (raw)
In-Reply-To: <1457015805-23742-1-git-send-email-tvrtko.ursulin@linux.intel.com>
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Looks like this code does not need to wait atomically since it
otherwise takes the mutex.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.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 08c363127885..124342bdbe90 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -9857,8 +9857,8 @@ static void broadwell_set_cdclk(struct drm_device *dev, int cdclk)
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);
@@ -9892,8 +9892,8 @@ static void broadwell_set_cdclk(struct drm_device *dev, int cdclk)
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");
mutex_lock(&dev_priv->rps.hw_lock);
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-03-03 14:36 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-03 14:36 [PATCH 1/5] drm/i915: Add wait_for_us Tvrtko Ursulin
2016-03-03 14:36 ` [PATCH 2/5] drm/i915/lrc: Do not wait atomically when stopping engines Tvrtko Ursulin
2016-03-03 14:36 ` [PATCH 3/5] drm/i915: Kconfig for extra driver debugging Tvrtko Ursulin
2016-03-03 14:36 ` [PATCH 4/5] drm/i915: Do not lie about atomic wait granularity Tvrtko Ursulin
2016-03-03 15:11 ` Chris Wilson
2016-03-03 15:43 ` Tvrtko Ursulin
2016-03-03 16:10 ` Chris Wilson
2016-03-03 16:21 ` [PATCH v5 4/5] drm/i915: Do not lie about atomic timeout granularity Tvrtko Ursulin
2016-03-03 14:36 ` Tvrtko Ursulin [this message]
2016-03-03 15:03 ` ✗ Fi.CI.BAT: failure for series starting with [1/5] drm/i915: Add wait_for_us Patchwork
2016-03-03 17:01 ` Tvrtko Ursulin
2016-03-03 17:20 ` Chris Wilson
2016-03-03 17:35 ` Tvrtko Ursulin
2016-03-03 17:01 ` ✗ Fi.CI.BAT: warning for series starting with [1/5] drm/i915: Add wait_for_us (rev2) Patchwork
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=1457015805-23742-5-git-send-email-tvrtko.ursulin@linux.intel.com \
--to=tvrtko.ursulin@linux.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