From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 07/24] drm/i915: Remove useless checks from primary enable/disable Date: Fri, 7 Mar 2014 22:29:26 +0100 Message-ID: <20140307212926.GE25837@phenom.ffwll.local> References: <1394209951-9963-1-git-send-email-ville.syrjala@linux.intel.com> <1394209951-9963-8-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-ea0-f182.google.com (mail-ea0-f182.google.com [209.85.215.182]) by gabe.freedesktop.org (Postfix) with ESMTP id DB575FACD2 for ; Fri, 7 Mar 2014 13:29:33 -0800 (PST) Received: by mail-ea0-f182.google.com with SMTP id b10so2589355eae.13 for ; Fri, 07 Mar 2014 13:29:30 -0800 (PST) Content-Disposition: inline In-Reply-To: <1394209951-9963-8-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: ville.syrjala@linux.intel.com Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, Mar 07, 2014 at 06:32:14PM +0200, ville.syrjala@linux.intel.com wro= te: > From: Ville Syrj=E4l=E4 > = > 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. > = > Signed-off-by: Ville Syrj=E4l=E4 Convert them to asserts, or are we already covered in this regard? /me has an uncanny love for self-checks ... Cheers, Daniel > --- > drivers/gpu/drm/i915/intel_display.c | 4 ---- > 1 file changed, 4 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/= intel_display.c > index 7938556..2815351 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -1896,8 +1896,6 @@ static void intel_enable_primary_plane(struct drm_i= 915_private *dev_priv, > = > reg =3D DSPCNTR(plane); > val =3D I915_READ(reg); > - if (val & DISPLAY_PLANE_ENABLE) > - return; > = > I915_WRITE(reg, val | DISPLAY_PLANE_ENABLE); > intel_flush_primary_plane(dev_priv, plane); > @@ -1926,8 +1924,6 @@ static void intel_disable_primary_plane(struct drm_= i915_private *dev_priv, > = > reg =3D DSPCNTR(plane); > val =3D I915_READ(reg); > - if ((val & DISPLAY_PLANE_ENABLE) =3D=3D 0) > - return; > = > I915_WRITE(reg, val & ~DISPLAY_PLANE_ENABLE); > intel_flush_primary_plane(dev_priv, plane); > -- = > 1.8.3.2 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch