@@ -1157,10 +1157,13 @@ intel_tv_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode,
I915_WRITE(dspbase_reg, I915_READ(dspbase_reg));
/* Wait for vblank for the disable to take effect */
- if (!IS_I9XX(dev))
+ if (!IS_I9XX(dev)) {
+ POSTING_READ(dspbase_reg);
intel_wait_for_vblank(dev, intel_crtc->pipe);
+ }
I915_WRITE(pipeconf_reg, pipeconf & ~PIPEACONF_ENABLE);
+ POSTING_READ(pipeconf_reg);
/* Wait for vblank for the disable to take effect. */
intel_wait_for_vblank(dev, intel_crtc->pipe);
@@ -1268,11 +1271,15 @@ intel_tv_detect_type (struct intel_tv *intel_tv)
DAC_C_0_7_V);
I915_WRITE(TV_CTL, tv_ctl);
I915_WRITE(TV_DAC, tv_dac);
+ POSTING_READ(TV_DAC);
intel_wait_for_vblank(dev, intel_crtc->pipe);
+
tv_dac = I915_READ(TV_DAC);
I915_WRITE(TV_DAC, save_tv_dac);
I915_WRITE(TV_CTL, save_tv_ctl);
+ POSTING_READ(TV_CTL);
intel_wait_for_vblank(dev, intel_crtc->pipe);
+
/*
* A B C
* 0 1 1 Composite