aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2011-03-17 03:20:20 -0400
committerChris Wilson <chris@chris-wilson.co.uk>2011-03-23 02:40:52 -0400
commit762237bb714b0cd93ce2405ccc891fadb405c26e (patch)
tree48f27bb52c136d30eca119c0a2b6613a204a51f6 /drivers/gpu/drm/i915
parent19b01b5fbf0b78930b3b06ee6080539c17b5d1fd (diff)
drm/i915: Remove surplus POSTING_READs before wait_for_vblank
... as wait_for_vblank (and friends) will do a flush of the MMIO writes anyway. References: https://bugs.freedesktop.org/show_bug.cgi?id=34601 Cc: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Keith Packard <keithp@keithp.com> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 3106c0dc8389..3bc6ab56cf8b 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1518,7 +1518,6 @@ static void intel_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe,
1518 val = I915_READ(reg); 1518 val = I915_READ(reg);
1519 val |= PIPECONF_ENABLE; 1519 val |= PIPECONF_ENABLE;
1520 I915_WRITE(reg, val); 1520 I915_WRITE(reg, val);
1521 POSTING_READ(reg);
1522 intel_wait_for_vblank(dev_priv->dev, pipe); 1521 intel_wait_for_vblank(dev_priv->dev, pipe);
1523} 1522}
1524 1523
@@ -1554,7 +1553,6 @@ static void intel_disable_pipe(struct drm_i915_private *dev_priv,
1554 val = I915_READ(reg); 1553 val = I915_READ(reg);
1555 val &= ~PIPECONF_ENABLE; 1554 val &= ~PIPECONF_ENABLE;
1556 I915_WRITE(reg, val); 1555 I915_WRITE(reg, val);
1557 POSTING_READ(reg);
1558 intel_wait_for_pipe_off(dev_priv->dev, pipe); 1556 intel_wait_for_pipe_off(dev_priv->dev, pipe);
1559} 1557}
1560 1558
@@ -1579,7 +1577,6 @@ static void intel_enable_plane(struct drm_i915_private *dev_priv,
1579 val = I915_READ(reg); 1577 val = I915_READ(reg);
1580 val |= DISPLAY_PLANE_ENABLE; 1578 val |= DISPLAY_PLANE_ENABLE;
1581 I915_WRITE(reg, val); 1579 I915_WRITE(reg, val);
1582 POSTING_READ(reg);
1583 intel_wait_for_vblank(dev_priv->dev, pipe); 1580 intel_wait_for_vblank(dev_priv->dev, pipe);
1584} 1581}
1585 1582
@@ -1612,7 +1609,6 @@ static void intel_disable_plane(struct drm_i915_private *dev_priv,
1612 val = I915_READ(reg); 1609 val = I915_READ(reg);
1613 val &= ~DISPLAY_PLANE_ENABLE; 1610 val &= ~DISPLAY_PLANE_ENABLE;
1614 I915_WRITE(reg, val); 1611 I915_WRITE(reg, val);
1615 POSTING_READ(reg);
1616 intel_flush_display_plane(dev_priv, plane); 1612 intel_flush_display_plane(dev_priv, plane);
1617 intel_wait_for_vblank(dev_priv->dev, pipe); 1613 intel_wait_for_vblank(dev_priv->dev, pipe);
1618} 1614}
@@ -1769,7 +1765,6 @@ static void g4x_enable_fbc(struct drm_crtc *crtc, unsigned long interval)
1769 return; 1765 return;
1770 1766
1771 I915_WRITE(DPFC_CONTROL, dpfc_ctl & ~DPFC_CTL_EN); 1767 I915_WRITE(DPFC_CONTROL, dpfc_ctl & ~DPFC_CTL_EN);
1772 POSTING_READ(DPFC_CONTROL);
1773 intel_wait_for_vblank(dev, intel_crtc->pipe); 1768 intel_wait_for_vblank(dev, intel_crtc->pipe);
1774 } 1769 }
1775 1770
@@ -1861,7 +1856,6 @@ static void ironlake_enable_fbc(struct drm_crtc *crtc, unsigned long interval)
1861 return; 1856 return;
1862 1857
1863 I915_WRITE(ILK_DPFC_CONTROL, dpfc_ctl & ~DPFC_CTL_EN); 1858 I915_WRITE(ILK_DPFC_CONTROL, dpfc_ctl & ~DPFC_CTL_EN);
1864 POSTING_READ(ILK_DPFC_CONTROL);
1865 intel_wait_for_vblank(dev, intel_crtc->pipe); 1859 intel_wait_for_vblank(dev, intel_crtc->pipe);
1866 } 1860 }
1867 1861
@@ -5777,7 +5771,6 @@ static void intel_increase_pllclock(struct drm_crtc *crtc)
5777 5771
5778 dpll &= ~DISPLAY_RATE_SELECT_FPA1; 5772 dpll &= ~DISPLAY_RATE_SELECT_FPA1;
5779 I915_WRITE(dpll_reg, dpll); 5773 I915_WRITE(dpll_reg, dpll);
5780 POSTING_READ(dpll_reg);
5781 intel_wait_for_vblank(dev, pipe); 5774 intel_wait_for_vblank(dev, pipe);
5782 5775
5783 dpll = I915_READ(dpll_reg); 5776 dpll = I915_READ(dpll_reg);
@@ -5821,7 +5814,6 @@ static void intel_decrease_pllclock(struct drm_crtc *crtc)
5821 5814
5822 dpll |= DISPLAY_RATE_SELECT_FPA1; 5815 dpll |= DISPLAY_RATE_SELECT_FPA1;
5823 I915_WRITE(dpll_reg, dpll); 5816 I915_WRITE(dpll_reg, dpll);
5824 dpll = I915_READ(dpll_reg);
5825 intel_wait_for_vblank(dev, pipe); 5817 intel_wait_for_vblank(dev, pipe);
5826 dpll = I915_READ(dpll_reg); 5818 dpll = I915_READ(dpll_reg);
5827 if (!(dpll & DISPLAY_RATE_SELECT_FPA1)) 5819 if (!(dpll & DISPLAY_RATE_SELECT_FPA1))