summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2012-02-15 23:50:24 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-03-20 21:55:16 +0100
commit0ebb98299357e1dbeeea470eec29241263c8f244 (patch)
tree2afbfba89799fa6bb1fc7f38a0ef2a9a02c25190
parent149c84077fe717af883bae459623ef1cebd86388 (diff)
downloadlinux-3.10-0ebb98299357e1dbeeea470eec29241263c8f244.tar.gz
linux-3.10-0ebb98299357e1dbeeea470eec29241263c8f244.tar.bz2
linux-3.10-0ebb98299357e1dbeeea470eec29241263c8f244.zip
drm/i915: enable lazy global-gtt binding
Now that everything is in place, only bind to the global gtt when actually required. Patch split-up suggested by Chris Wilson. Reviewed-and-tested-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 69009d1027f..863e14ac040 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2762,7 +2762,9 @@ i915_gem_object_bind_to_gtt(struct drm_i915_gem_object *obj,
goto search_free;
}
- i915_gem_gtt_bind_object(obj, obj->cache_level);
+
+ if (!dev_priv->mm.aliasing_ppgtt)
+ i915_gem_gtt_bind_object(obj, obj->cache_level);
list_add_tail(&obj->gtt_list, &dev_priv->mm.gtt_list);
list_add_tail(&obj->mm_list, &dev_priv->mm.inactive_list);