|
@@ -7468,7 +7468,13 @@ static int intel_gen6_queue_flip(struct drm_device *dev,
|
|
|
OUT_RING(fb->pitches[0] | obj->tiling_mode);
|
|
|
OUT_RING(obj->gtt_offset);
|
|
|
|
|
|
- pf = I915_READ(PF_CTL(intel_crtc->pipe)) & PF_ENABLE;
|
|
|
+ /* Contrary to the suggestions in the documentation,
|
|
|
+ * "Enable Panel Fitter" does not seem to be required when page
|
|
|
+ * flipping with a non-native mode, and worse causes a normal
|
|
|
+ * modeset to fail.
|
|
|
+ * pf = I915_READ(PF_CTL(intel_crtc->pipe)) & PF_ENABLE;
|
|
|
+ */
|
|
|
+ pf = 0;
|
|
|
pipesrc = I915_READ(PIPESRC(intel_crtc->pipe)) & 0x0fff0fff;
|
|
|
OUT_RING(pf | pipesrc);
|
|
|
ADVANCE_LP_RING();
|