From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: Suppress EIO during set-to-cpu-domain Date: Sun, 15 Apr 2012 00:16:15 +0200 Message-ID: <20120414221615.GG4215@phenom.ffwll.local> References: <1334395461-10285-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by gabe.freedesktop.org (Postfix) with ESMTP id CE5C89EF3E for ; Sat, 14 Apr 2012 15:15:20 -0700 (PDT) Received: by wibhj13 with SMTP id hj13so3284612wib.12 for ; Sat, 14 Apr 2012 15:15:20 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1334395461-10285-1-git-send-email-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: Chris Wilson Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Sat, Apr 14, 2012 at 10:24:21AM +0100, Chris Wilson wrote: > If the hardware is dead, we can simply discard any outstanding writes > from the GPU and presume the buffer is either in the GTT domain or > already in the CPU domain and continue on flushing the CPU caches. > > Signed-off-by: Chris Wilson Pardon my ignorance, but I fail to see the goal of these -EIO patches ... Care to mind the dense? -Daniel > --- > drivers/gpu/drm/i915/i915_gem.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index 19ca320..80fb67d 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -3087,12 +3087,12 @@ i915_gem_object_set_to_cpu_domain(struct drm_i915_gem_object *obj, bool write) > return 0; > > ret = i915_gem_object_flush_gpu_write_domain(obj); > - if (ret) > + if (ret && ret != -EIO) > return ret; > > if (write || obj->pending_gpu_write) { > ret = i915_gem_object_wait_rendering(obj); > - if (ret) > + if (ret && ret != -EIO) > return ret; > } > > -- > 1.7.10 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Mail: daniel@ffwll.ch Mobile: +41 (0)79 365 57 48