From: Daniel Vetter Date: Wed, 15 Feb 2012 22:50:24 +0000 (+0100) Subject: drm/i915: enable lazy global-gtt binding X-Git-Tag: MMI-PSA29.97-13-9~16236^2~115^2~87 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0ebb98299357e1dbeeea470eec29241263c8f244;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 69009d1027fb..863e14ac0406 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);