Re: [PATCH v2 07/24] drm/i915: Remove useless checks from primary enable/disable

Paulo Zanoni
2014-04-28T21:39:38Z

2014-04-28 9:53 GMT-03:00 <ville.syrjala@linux.intel.com>:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> 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)

Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>

>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 7938556..af9e3fe 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -1896,8 +1896,7 @@ static void intel_enable_primary_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);
> @@ -1926,8 +1925,7 @@ static void intel_disable_primary_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);
> --
> 1.8.3.2
>

--
Paulo Zanoni