| From c0ead2313b0c1357569b715fc6088f73a6f6d611 Mon Sep 17 00:00:00 2001 |
| From: Daniel Vetter <daniel.vetter@ffwll.ch> |
| Date: Wed, 21 Aug 2013 23:38:08 +0200 |
| Subject: drm/i915: Use POSTING_READ in lcpll code |
| |
| If we don't use the return value of a mmio read our coding style is to |
| use the POSTING_READ macro. This avoids cluttering the mmio traces. |
| |
| While at it add the missing posting read in the lcpll enable function |
| that Paulo spotted. |
| |
| v2: Drop the _NOTRACE changes, tracing such wait_for loops in the modeset |
| code might actually be rather useful! |
| |
| Cc: Paulo Zanoni <przanoni@gmail.com> |
| Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit 35d8f2eb259e2d32c4bb67e9733ba0cba031f64f) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_display.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c |
| index 7453d6f82631..58da4ddc3e16 100644 |
| --- a/drivers/gpu/drm/i915/intel_display.c |
| +++ b/drivers/gpu/drm/i915/intel_display.c |
| @@ -6036,13 +6036,14 @@ void hsw_restore_lcpll(struct drm_i915_private *dev_priv) |
| if (val & LCPLL_POWER_DOWN_ALLOW) { |
| val &= ~LCPLL_POWER_DOWN_ALLOW; |
| I915_WRITE(LCPLL_CTL, val); |
| + POSTING_READ(LCPLL_CTL); |
| } |
| |
| val = I915_READ(D_COMP); |
| val |= D_COMP_COMP_FORCE; |
| val &= ~D_COMP_COMP_DISABLE; |
| I915_WRITE(D_COMP, val); |
| - I915_READ(D_COMP); |
| + POSTING_READ(D_COMP); |
| |
| val = I915_READ(LCPLL_CTL); |
| val &= ~LCPLL_PLL_DISABLE; |
| -- |
| 1.8.5.rc3 |
| |
