aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_gem.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2011-02-07 10:23:02 -0500
committerChris Wilson <chris@chris-wilson.co.uk>2011-02-07 10:24:03 -0500
commit8d7e3de1e019238211fa06e109437a13cae62004 (patch)
tree313b27496749bd54f2e4f0cfc80a0d2782c2619a /drivers/gpu/drm/i915/i915_gem.c
parentdb53a302611c06bde01851f61fa0675a84ca018c (diff)
drm/i915: Skip the no-op domain changes when already in CPU|GTT domains
Removes some superfluous fluff from tracing... Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index f0f8c6ff684f..9297143447cf 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2931,6 +2931,9 @@ i915_gem_object_set_to_gtt_domain(struct drm_i915_gem_object *obj, bool write)
2931 if (obj->gtt_space == NULL) 2931 if (obj->gtt_space == NULL)
2932 return -EINVAL; 2932 return -EINVAL;
2933 2933
2934 if (obj->base.write_domain == I915_GEM_DOMAIN_GTT)
2935 return 0;
2936
2934 ret = i915_gem_object_flush_gpu_write_domain(obj); 2937 ret = i915_gem_object_flush_gpu_write_domain(obj);
2935 if (ret) 2938 if (ret)
2936 return ret; 2939 return ret;
@@ -3033,6 +3036,9 @@ i915_gem_object_set_to_cpu_domain(struct drm_i915_gem_object *obj, bool write)
3033 uint32_t old_write_domain, old_read_domains; 3036 uint32_t old_write_domain, old_read_domains;
3034 int ret; 3037 int ret;
3035 3038
3039 if (obj->base.write_domain == I915_GEM_DOMAIN_CPU)
3040 return 0;
3041
3036 ret = i915_gem_object_flush_gpu_write_domain(obj); 3042 ret = i915_gem_object_flush_gpu_write_domain(obj);
3037 if (ret) 3043 if (ret)
3038 return ret; 3044 return ret;