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

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

drm/i915: Remove useless checks from primary enable/disable 



We won't be calling intel_enable_primary_plane() or
intel_disable_primary_plane() with the primary plane in the
wrong state. So remove the useless DISPLAY_PLANE_ENABLE checks.

v2: Convert the checks to WARNs instead (Daniel,Paulo)

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent d52fea5b

drivers/gpu/drm/i915/intel_display.c

+2 −4
Original line number Diff line number Diff line
@@ -1887,8 +1887,7 @@ static void intel_enable_primary_hw_plane(struct drm_i915_private *dev_priv, 


	reg = DSPCNTR(plane);

	val = I915_READ(reg);

	if (val & DISPLAY_PLANE_ENABLE)

		return;

	WARN_ON(val & DISPLAY_PLANE_ENABLE);



	I915_WRITE(reg, val | DISPLAY_PLANE_ENABLE);

	intel_flush_primary_plane(dev_priv, plane);
@@ -1918,8 +1917,7 @@ static void intel_disable_primary_hw_plane(struct drm_i915_private *dev_priv, 


	reg = DSPCNTR(plane);

	val = I915_READ(reg);

	if ((val & DISPLAY_PLANE_ENABLE) == 0)

		return;

	WARN_ON((val & DISPLAY_PLANE_ENABLE) == 0);



	I915_WRITE(reg, val & ~DISPLAY_PLANE_ENABLE);

	intel_flush_primary_plane(dev_priv, plane);