From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 1/2] drm/i915: Fix VLV forcewake after reset Date: Wed, 5 Mar 2014 15:00:19 +0100 Message-ID: <20140305140019.GU17001@phenom.ffwll.local> References: <1393254129-438-1-git-send-email-ville.syrjala@linux.intel.com> <1393254129-438-2-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 24712FA6EB for ; Wed, 5 Mar 2014 06:00:23 -0800 (PST) Received: by mail-ea0-f182.google.com with SMTP id b10so1062143eae.27 for ; Wed, 05 Mar 2014 06:00:23 -0800 (PST) Content-Disposition: inline In-Reply-To: <1393254129-438-2-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 Mon, Feb 24, 2014 at 05:02:08PM +0200, ville.syrjala@linux.intel.com wro= te: > From: Ville Syrj=E4l=E4 > = > Use the render/media specific forcewake counts to properly restore the > forcewake status after a GPU reset on VLV. > = > Signed-off-by: Ville Syrj=E4l=E4 > --- > drivers/gpu/drm/i915/intel_uncore.c | 20 ++++++++++++++++---- > 1 file changed, 16 insertions(+), 4 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/i= ntel_uncore.c > index c628414..09fa555 100644 > --- a/drivers/gpu/drm/i915/intel_uncore.c > +++ b/drivers/gpu/drm/i915/intel_uncore.c > @@ -967,10 +967,22 @@ static int gen6_do_reset(struct drm_device *dev) > intel_uncore_forcewake_reset(dev); > = > /* If reset with a user forcewake, try to restore, otherwise turn it of= f */ > - if (dev_priv->uncore.forcewake_count) > - dev_priv->uncore.funcs.force_wake_get(dev_priv, FORCEWAKE_ALL); > - else > - dev_priv->uncore.funcs.force_wake_put(dev_priv, FORCEWAKE_ALL); > + if (IS_VALLEYVIEW(dev)) { > + if (dev_priv->uncore.fw_rendercount) > + dev_priv->uncore.funcs.force_wake_get(dev_priv, FORCEWAKE_RENDER); > + else > + dev_priv->uncore.funcs.force_wake_put(dev_priv, FORCEWAKE_RENDER); > + > + if (dev_priv->uncore.fw_mediacount) > + dev_priv->uncore.funcs.force_wake_get(dev_priv, FORCEWAKE_MEDIA); > + else > + dev_priv->uncore.funcs.force_wake_put(dev_priv, FORCEWAKE_MEDIA); > + } else { > + if (dev_priv->uncore.forcewake_count) > + dev_priv->uncore.funcs.force_wake_get(dev_priv, FORCEWAKE_ALL); > + else > + dev_priv->uncore.funcs.force_wake_put(dev_priv, FORCEWAKE_ALL); > + } It starts to feel like we should subsume the forcewake stuff into our power domain handling, and create a bunch of domains for this ... But that's lots of work since we need to switch to a more explicit forcewake power domain handling then I guess. Not sure whether that's worth it. -Daniel -- = Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch