diff options
| author | Mark Brown <broonie@sirena.org.uk> | 2013-06-14 12:08:35 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@sirena.org.uk> | 2013-06-14 12:08:35 +0100 |
| commit | 017db6aba01656f754d034bf17c6fae0a76ca36e (patch) | |
| tree | a3cf0fd4d94aaaa6d56013da1386bd71ca929e52 /drivers/gpu/drm/i915/i915_gem_context.c | |
| parent | 964318b02e12781615db595075a29557f4302940 (diff) | |
| parent | 4b73febd1ba302268aabe370de25601eaa884b25 (diff) | |
Merge branch 'tracking-linux-3.x.y' into merge-manifest
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_context.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_context.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index 94d873a6cff..a1e8ecb6adf 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -152,6 +152,13 @@ create_hw_context(struct drm_device *dev, return ERR_PTR(-ENOMEM); } + if (INTEL_INFO(dev)->gen >= 7) { + ret = i915_gem_object_set_cache_level(ctx->obj, + I915_CACHE_LLC_MLC); + if (ret) + goto err_out; + } + /* The ring associated with the context object is handled by the normal * object tracking code. We give an initial ring value simple to pass an * assertion in the context switch code. |