From mboxrd@z Thu Jan  1 00:00:00 1970
From: "S, Deepak" <deepak.s@intel.com>
Subject: Re: Fwd: [PATCH 1/2] drm/i915: Fix VLV forcewake after
 reset
Date: Thu, 27 Feb 2014 19:54:49 +0530
Message-ID: <530F4AB1.8000701@intel.com>
References: <1393254129-438-1-git-send-email-ville.syrjala@linux.intel.com>	<1393254129-438-2-git-send-email-ville.syrjala@linux.intel.com>
	<CAOh5HuXvv4Kcp+mCYCPp+hb06M_CxZ-Z+hivB7TOcn72tsaBcQ@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="iso-8859-1"; Format="flowed"
Content-Transfer-Encoding: quoted-printable
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
	by gabe.freedesktop.org (Postfix) with ESMTP id 48802FB769
	for <intel-gfx@lists.freedesktop.org>;
	Thu, 27 Feb 2014 06:24:51 -0800 (PST)
In-Reply-To: <CAOh5HuXvv4Kcp+mCYCPp+hb06M_CxZ-Z+hivB7TOcn72tsaBcQ@mail.gmail.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=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?= <ville.syrjala@linux.intel.com>, 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: ** <ville.syrjala@linux.intel.com
> <mailto:ville.syrjala@linux.intel.com>>
> Date: Mon, Feb 24, 2014 at 8:32 PM
> Subject: [Intel-gfx] [PATCH 1/2] drm/i915: Fix VLV forcewake after reset
> To: intel-gfx@lists.freedesktop.org <mailto:intel-gfx@lists.freedesktop.o=
rg>
>
>
> From: Ville Syrj=E4l=E4 <ville.syrjala@linux.intel.com
> <mailto:ville.syrjala@linux.intel.com>>
>
> 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 <ville.syrjala@linux.intel.com
> <mailto:ville.syrjala@linux.intel.com>>
> ---
>   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/intel_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 off */
> -       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);
> +       }
>
>          /* Restore fifo count */
>          dev_priv->uncore.fifo_count =3D __raw_i915_read32(dev_priv,
> GTFIFOCTL) & GT_FIFO_FREE_ENTRIES_MASK;
> --
> 1.8.3.2
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org <mailto:Intel-gfx@lists.freedesktop.org>
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>

Reviewed-by: Deepak S <deepak.s@intel.com>