From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: Re: [PATCH 1/2] drm/i915: clear up wedged transitions
Date: Thu, 4 Sep 2014 07:11:24 +0100
Message-ID: <20140904061124.GE3171@nuc-i3427.alporthouse.com>
References: <1352909648-21514-1-git-send-email-daniel.vetter@ffwll.ch>
 <1352996243-15590-1-git-send-email-daniel.vetter@ffwll.ch>
 <20140903202614.GD3171@nuc-i3427.alporthouse.com>
 <CAKMK7uG955wD+oAm4UkUJPZFUMH=WyYdTxpOP8m_SgBDhEBsRw@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from fireflyinternet.com (mail.fireflyinternet.com [87.106.93.118])
 by gabe.freedesktop.org (Postfix) with ESMTP id 925F06E687
 for <intel-gfx@lists.freedesktop.org>; Wed,  3 Sep 2014 23:11:29 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <CAKMK7uG955wD+oAm4UkUJPZFUMH=WyYdTxpOP8m_SgBDhEBsRw@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>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
List-Id: intel-gfx@lists.freedesktop.org

On Thu, Sep 04, 2014 at 08:03:26AM +0200, Daniel Vetter wrote:
> On Wed, Sep 3, 2014 at 10:26 PM, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> >> @@ -1385,7 +1372,7 @@ out:
> >>               /* If this -EIO is due to a gpu hang, give the reset code a
> >>                * chance to clean up the mess. Otherwise return the proper
> >>                * SIGBUS. */
> >> -             if (!atomic_read(&dev_priv->gpu_error.wedged))
> >> +             if (i915_terminally_wedged(&dev_priv->gpu_error))
> >>                       return VM_FAULT_SIGBUS;
> >
> > (i915_gem_fault())
> >
> > This if() is backwards.
> 
> It should keep the logic mostly unchanged. But I guess returning
> SIGBUS if the gpu died for real isn't too friendly?

No, the patch inverted the logic.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre