diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-03-29 19:59:52 -0400 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2011-05-10 16:56:44 -0400 |
commit | 9c23f7fc4cef14b46830b7f9eb0dc1b2d6f55d4d (patch) | |
tree | aa241d38d51e983ad2e909d60d6c627477b676a6 /drivers/gpu | |
parent | 93dfb40cd887c4f39e38f047c4d9ea0b7188a58a (diff) |
drm/i915: Do not clflush snooped objects
Rely on the GPU snooping into the CPU cache for appropriately bound
objects on MI_FLUSH. Or perhaps one day we will have a cache-coherent
CPU/GPU package...
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 264bec8f1f1d..bf32527fc928 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
@@ -2878,6 +2878,17 @@ i915_gem_clflush_object(struct drm_i915_gem_object *obj) | |||
2878 | if (obj->pages == NULL) | 2878 | if (obj->pages == NULL) |
2879 | return; | 2879 | return; |
2880 | 2880 | ||
2881 | /* If the GPU is snooping the contents of the CPU cache, | ||
2882 | * we do not need to manually clear the CPU cache lines. However, | ||
2883 | * the caches are only snooped when the render cache is | ||
2884 | * flushed/invalidated. As we always have to emit invalidations | ||
2885 | * and flushes when moving into and out of the RENDER domain, correct | ||
2886 | * snooping behaviour occurs naturally as the result of our domain | ||
2887 | * tracking. | ||
2888 | */ | ||
2889 | if (obj->cache_level != I915_CACHE_NONE) | ||
2890 | return; | ||
2891 | |||
2881 | trace_i915_gem_object_clflush(obj); | 2892 | trace_i915_gem_object_clflush(obj); |
2882 | 2893 | ||
2883 | drm_clflush_pages(obj->pages, obj->base.size / PAGE_SIZE); | 2894 | drm_clflush_pages(obj->pages, obj->base.size / PAGE_SIZE); |