From c1c001c0997bda9a198e8f9aed05a23bd1cdab2c Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 19 Oct 2012 15:51:06 +0100 Subject: [PATCH] --- yaml --- r: 334711 b: refs/heads/master c: 74ce6b6c63262defba91c4d790b3f91074793c0d h: refs/heads/master i: 334709: b7dc755b294ded371f1d73b5408d853240da6656 334707: 0239aa1c80f234e890456688b2b349c9c35e8793 334703: 95f7cdb8e3dcae826dc0dcd05c00f5742923a082 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5ca728131101..3dc9ccf4b108 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c31407a3672aaebb4acddf90944a114fa5c8af7b +refs/heads/master: 74ce6b6c63262defba91c4d790b3f91074793c0d diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c index 45888d2ed534..8bc7ba76ace1 100644 --- a/trunk/drivers/gpu/drm/i915/i915_gem.c +++ b/trunk/drivers/gpu/drm/i915/i915_gem.c @@ -1825,10 +1825,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: