From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 07/24] drm/i915: Remove useless checks from primary enable/disable Date: Mon, 10 Mar 2014 13:20:34 +0200 Message-ID: <20140310112034.GS3852@intel.com> References: <1394209951-9963-1-git-send-email-ville.syrjala@linux.intel.com> <1394209951-9963-8-git-send-email-ville.syrjala@linux.intel.com> <20140307212926.GE25837@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 87C92FA47A for ; Mon, 10 Mar 2014 04:20:37 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20140307212926.GE25837@phenom.ffwll.local> 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: Daniel Vetter Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, Mar 07, 2014 at 10:29:26PM +0100, Daniel Vetter wrote: > On Fri, Mar 07, 2014 at 06:32:14PM +0200, ville.syrjala@linux.intel.com w= rote: > > 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 ... There's a WARN() for the crtc->primary_enabled flag in there, which should cover things. Although we could add some sanity check that makes sure the DISPLAY_PLANE_ENABLE bit matches crtc->primary_enabled. > = > 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/i91= 5/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= _i915_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 dr= m_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 -- = Ville Syrj=E4l=E4 Intel OTC