Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3ed6aad authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Use HAS_GMCH_DISPLAY un underrun reporting code 



A few open coded HAS_GMCH_DISPLAY() remain in the underrun reporting
code. Convert them over.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent f98cd096

drivers/gpu/drm/i915/i915_irq.c

+1 −1
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ static bool __intel_set_cpu_fifo_underrun_reporting(struct drm_device *dev, 
	old = !intel_crtc->cpu_fifo_underrun_disabled;

	intel_crtc->cpu_fifo_underrun_disabled = !enable;



	if (INTEL_INFO(dev)->gen < 5 || IS_VALLEYVIEW(dev))

	if (HAS_GMCH_DISPLAY(dev))

		i9xx_set_fifo_underrun_reporting(dev, pipe, enable, old);

	else if (IS_GEN5(dev) || IS_GEN6(dev))

		ironlake_set_fifo_underrun_reporting(dev, pipe, enable);

drivers/gpu/drm/i915/intel_display.c

+1 −1
Original line number Diff line number Diff line
@@ -13003,7 +13003,7 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc) 
		}

	}



	if (crtc->active || IS_VALLEYVIEW(dev) || INTEL_INFO(dev)->gen < 5) {

	if (crtc->active || HAS_GMCH_DISPLAY(dev)) {

		/*

		 * We start out with underrun reporting disabled to avoid races.

		 * For correct bookkeeping mark this on active crtcs.