From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 4/5] drm/i915: Suppress a WARN on reading an object back for a GPU hang Date: Mon, 25 Aug 2014 23:27:28 +0200 Message-ID: <20140825212728.GS15520@phenom.ffwll.local> References: <1407870351-6064-1-git-send-email-chris@chris-wilson.co.uk> <1407870351-6064-4-git-send-email-chris@chris-wilson.co.uk> <87wqa962wp.fsf@gaia.fi.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-we0-f172.google.com (mail-we0-f172.google.com [74.125.82.172]) by gabe.freedesktop.org (Postfix) with ESMTP id 619A589DED for ; Mon, 25 Aug 2014 14:27:06 -0700 (PDT) Received: by mail-we0-f172.google.com with SMTP id x48so13983931wes.31 for ; Mon, 25 Aug 2014 14:27:05 -0700 (PDT) Content-Disposition: inline In-Reply-To: <87wqa962wp.fsf@gaia.fi.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Mika Kuoppala Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, Aug 15, 2014 at 09:09:10PM +0300, Mika Kuoppala wrote: > Chris Wilson writes: > > > Signed-off-by: Chris Wilson > > Reviewed-by: Mika Kuoppala Ok, pulled in the error state fixes Mika reviewed, thanks. Now the big question: Is the s/seqno/request/ patch ready for prime-time? ... I'll probably known the answer once I'm through with my intel-gfx backlog ... Cheers, Daniel > > > --- > > drivers/gpu/drm/i915/i915_gpu_error.c | 5 ++++- > > 1 file changed, 4 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c > > index 726e6b1..1e05414 100644 > > --- a/drivers/gpu/drm/i915/i915_gpu_error.c > > +++ b/drivers/gpu/drm/i915/i915_gpu_error.c > > @@ -577,7 +577,10 @@ i915_error_object_create(struct drm_i915_private *dev_priv, > > if (dst == NULL) > > return NULL; > > > > - dst->gtt_offset = i915_gem_obj_offset(src, vm); > > + if (i915_gem_obj_bound(src, vm)) > > + dst->gtt_offset = i915_gem_obj_offset(src, vm); > > + else > > + dst->gtt_offset = -1; > > > > reloc_offset = dst->gtt_offset; > > use_ggtt = (src->cache_level == I915_CACHE_NONE && > > -- > > 1.9.1 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch