Commit d297e103 authored Aug 06, 2014 by Ville Syrjälä Committed by Daniel Vetter Aug 06, 2014

drm/i915: Update scanline_offset only for active crtcs

update_scanline_offset() in intel_sanitize_crtc() was supposed to
be called only for active crtcs. But due to some underrun patches it
now gets updated for all crtcs on gmch platforms.

Move the update_scanline_offset() to the very beginning of
intel_sanitize_crtc() where we update the vblank state. This seems like
a better place anyway since the scanline offset ought to be up to date
before we might need to consult it. So before any vblanky stuff happens.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent cd19e52a

drivers/gpu/drm/i915/intel_display.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -12719,9 +12719,10 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc)
		I915_WRITE(reg, I915_READ(reg) & ~PIPECONF_FRAME_START_DELAY_MASK);

		/* restore vblank interrupts to correct state */
		if (crtc->active)
		if (crtc->active) {
		update_scanline_offset(crtc);
		drm_vblank_on(dev, crtc->pipe);
		else
		} else
		drm_vblank_off(dev, crtc->pipe);

		/* We need to sanitize the plane -> pipe mapping first because this will
		@@ -12820,8 +12821,6 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc)
		*/
		crtc->cpu_fifo_underrun_disabled = true;
		crtc->pch_fifo_underrun_disabled = true;

		update_scanline_offset(crtc);
		}
		}