From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 5/5] drm/i915: Always flush tiling changes before accessing through the GTT Date: Sun, 15 Apr 2012 00:00:35 +0200 Message-ID: <20120414220035.GD4215@phenom.ffwll.local> References: <1334393751-8921-1-git-send-email-chris@chris-wilson.co.uk> <1334393751-8921-5-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-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by gabe.freedesktop.org (Postfix) with ESMTP id D45529EF61 for ; Sat, 14 Apr 2012 14:59:40 -0700 (PDT) Received: by wgbdr12 with SMTP id dr12so3356900wgb.12 for ; Sat, 14 Apr 2012 14:59:40 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1334393751-8921-5-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 09:55:51AM +0100, Chris Wilson wrote: > As we defer updating the fence register from set-tiling to the point of > use, we need to declare every access through the GTT as either fenced or > unfenced. > > This patches fixes an old bug in the execbuffer relocation processing > which could conceivably be hit by a pathological userspace. > > Signed-off-by: Chris Wilson Indeed, my git history digging got lost and given how we upload buffers I don't think there's any chance we can hit this, so no i-g-t test necessary. Reviewed-by: Daniel Vetter > --- > drivers/gpu/drm/i915/i915_gem_execbuffer.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c > index 2a24d0c..1a0d54f 100644 > --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c > +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c > @@ -381,7 +381,11 @@ i915_gem_execbuffer_relocate_entry(struct drm_i915_gem_object *obj, > uint32_t __iomem *reloc_entry; > void __iomem *reloc_page; > > - ret = i915_gem_object_set_to_gtt_domain(obj, 1); > + ret = i915_gem_object_set_to_gtt_domain(obj, true); > + if (ret) > + return ret; > + > + ret = i915_gem_object_put_fence(obj); > if (ret) > 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