[regression] drm/i915: cleanup per-pipe reg usage

Commit Message

Jesse Barnes Feb. 17, 2011, 6:32 p.m. UTC

None

Patch

different for some reason.

Oops, I see a problem.  Does this patch help?

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_d
index 0dc5c6f..7bab2ef 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5291,7 +5291,7 @@  static void i9xx_update_cursor(struct drm_crtc *crtc, u32 
        bool visible = base != 0;
 
        if (intel_crtc->cursor_visible != visible) {
-               uint32_t cntl = CURCNTR(pipe);
+               uint32_t cntl = I915_READ(CURCNTR(pipe));
                if (base) {
                        cntl &= ~(CURSOR_MODE | MCURSOR_PIPE_SELECT);
                        cntl |= CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE;