From c89d869d81953fe74aa8c90839eca22a81bfaeb7 Mon Sep 17 00:00:00 2001 From: Ben Widawsky Date: Tue, 6 Nov 2012 09:50:16 +0000 Subject: [PATCH] --- yaml --- r: 345292 b: refs/heads/master c: ccdf56cdb2a4d6103eb6627494d6cd34edb1c2ea h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d7599a1ff5f7..f63140a13f3e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44cbd33899302fc5294fc5fedfd0276348d796e4 +refs/heads/master: ccdf56cdb2a4d6103eb6627494d6cd34edb1c2ea diff --git a/trunk/drivers/gpu/drm/i915/i915_gem_gtt.c b/trunk/drivers/gpu/drm/i915/i915_gem_gtt.c index afa56e978e80..0aed724c7321 100644 --- a/trunk/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/trunk/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -439,7 +439,7 @@ static void gen6_ggtt_bind_object(struct drm_i915_gem_object *obj, len = sg_dma_len(sg) >> PAGE_SHIFT; for (m = 0; m < len; m++) { addr = sg_dma_address(sg) + (m << PAGE_SHIFT); - gtt_entries[i] = pte_encode(dev, addr, level); + iowrite32(pte_encode(dev, addr, level), >t_entries[i]); i++; } }