From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: Re: [PATCH] drm/i915: reset forcewake count after reset
Date: Fri, 24 Jun 2011 00:45:27 +0100
Message-ID: <d08817$guh2r@azsmga001.ch.intel.com>
References: <1308870382-1587-1-git-send-email-ben@bwidawsk.net>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from mga14.intel.com (mga14.intel.com [143.182.124.37])
	by gabe.freedesktop.org (Postfix) with ESMTP id 64BF99E8EB
	for <intel-gfx@lists.freedesktop.org>;
	Thu, 23 Jun 2011 16:45:30 -0700 (PDT)
In-Reply-To: <1308870382-1587-1-git-send-email-ben@bwidawsk.net>
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+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
To: Ben Widawsky <ben@bwidawsk.net>, intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

On Thu, 23 Jun 2011 16:06:22 -0700, Ben Widawsky <ben@bwidawsk.net> wrote:
> 
> Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
> ---
>  drivers/gpu/drm/i915/i915_drv.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 0defd42..9292499 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -579,6 +579,7 @@ int i915_reset(struct drm_device *dev, u8 flags)
>  	} else switch (INTEL_INFO(dev)->gen) {
>  	case 6:
>  		ret = gen6_do_reset(dev, flags);
> +		atomic_set(&dev_priv->forcewake_count, 0);
>  		break;
>  	case 5:
>  		ret = ironlake_do_reset(dev, flags);

Can forcewake be non-zero here? If it has been bumped by a user wakelock,
then what happens when that is subsequently released? I don't think this
is safe...

What scenario are you trying to fix?
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre