From mboxrd@z Thu Jan 1 00:00:00 1970 From: "S, Deepak" Subject: Re: Fwd: [PATCH 2/2] drm/i915: Drop the forcewake count inc/dec around register read on VLV Date: Thu, 27 Feb 2014 19:56:23 +0530 Message-ID: <530F4B0F.2040203@intel.com> References: <1393254129-438-1-git-send-email-ville.syrjala@linux.intel.com> <1393254129-438-3-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1"; Format="flowed" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 2F5F6FB74E for ; Thu, 27 Feb 2014 06:26:25 -0800 (PST) In-Reply-To: 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: =?ISO-8859-1?Q?Ville_Syrj=E4l=E4?= , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Wed, Jan 29, 2014 at 9:55 AM, ville syrjala > > > ---------- Forwarded message ---------- > From: ** > > Date: Mon, Feb 24, 2014 at 8:32 PM > Subject: [Intel-gfx] [PATCH 2/2] drm/i915: Drop the forcewake count > inc/dec around register read on VLV > To: intel-gfx@lists.freedesktop.org > > > From: Ville Syrj=E4l=E4 > > > VLV is the only platform where we increment/decrement the forcewake > count around register access. Drop the inc/dec on VLV to make the > forcewake code a bit more unified. > > The inc/dec are not necessary since we hold the uncore lock around > the whole operation. > > Signed-off-by: Ville Syrj=E4l=E4 > > --- > drivers/gpu/drm/i915/intel_uncore.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_uncore.c > b/drivers/gpu/drm/i915/intel_uncore.c > index 09fa555..dacb751 100644 > --- a/drivers/gpu/drm/i915/intel_uncore.c > +++ b/drivers/gpu/drm/i915/intel_uncore.c > @@ -502,22 +502,22 @@ gen6_read##x(struct drm_i915_private *dev_priv, > off_t reg, bool trace) { \ > static u##x \ > vlv_read##x(struct drm_i915_private *dev_priv, off_t reg, bool trace) {= \ > unsigned fwengine =3D 0; \ > - unsigned *fwcount; \ > + unsigned fwcount; \ > REG_READ_HEADER(x); \ > if (FORCEWAKE_VLV_RENDER_RANGE_OFFSET(reg)) { \ > fwengine =3D FORCEWAKE_RENDER; \ > - fwcount =3D &dev_priv->uncore.fw_rendercount; \ > + fwcount =3D dev_priv->uncore.fw_rendercount; \ > } \ > else if (FORCEWAKE_VLV_MEDIA_RANGE_OFFSET(reg)) { \ > fwengine =3D FORCEWAKE_MEDIA; \ > - fwcount =3D &dev_priv->uncore.fw_mediacount; \ > + fwcount =3D dev_priv->uncore.fw_mediacount; \ > } \ > if (fwengine !=3D 0) { \ > - if ((*fwcount)++ =3D=3D 0) \ > + if (fwcount =3D=3D 0) \ > (dev_priv)->uncore.funcs.force_wake_get(dev_priv= , \ > > fwengine); \ > val =3D __raw_i915_read##x(dev_priv, reg); \ > - if (--(*fwcount) =3D=3D 0) \ > + if (fwcount =3D=3D 0) \ > (dev_priv)->uncore.funcs.force_wake_put(dev_priv= , \ > fwengine); \ > } else { \ > -- > 1.8.3.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > > Reviewed-by: Deepak S