From: Jesse Barnes Subject: Re: [PATCH] drm/i915: Initialize obj->pages before use by i915_gem_object_do_bit17_swizzle() Date: Fri, 19 Oct 2012 09:43:17 -0700 Message-ID: <20121019094317.5923e6ce@jbarnes-desktop> References: <5081419F.4080605@winsoft.pl> <1350658266-13158-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 oproxy11-pub.bluehost.com (oproxy11-pub.bluehost.com [173.254.64.10]) by gabe.freedesktop.org (Postfix) with SMTP id 81C9A9E8D3 for ; Fri, 19 Oct 2012 09:42:23 -0700 (PDT) In-Reply-To: <1350658266-13158-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, Krzysztof Kolasa , stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org On Fri, 19 Oct 2012 15:51:06 +0100 Chris Wilson wrote: > If we leave obj->pages set to NULL before attempting to deswizzle them, > then an OOPS is well deserved. > > Fixes regression introduced in commit 9da3da660d8c19a54f6e93361d147509be3fff84 > Author: Chris Wilson > Date: Fri Jun 1 15:20:22 2012 +0100 > > drm/i915: Replace the array of pages with a scatterlist > > Reported-by: Krzysztof Kolasa > Signed-off-by: Chris Wilson > Cc: stable@vger.kernel.org > --- > drivers/gpu/drm/i915/i915_gem.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index ad2ed75..6ab7c68 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -1953,10 +1953,11 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) > sg_set_page(sg, page, PAGE_SIZE, 0); > } > > + obj->pages = st; > + > if (i915_gem_object_needs_bit17_swizzle(obj)) > i915_gem_object_do_bit_17_swizzle(obj); > > - obj->pages = st; > return 0; > > err_pages: Reviewed-by: Jesse Barnes -- Jesse Barnes, Intel Open Source Technology Center