diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-08-06 13:17:02 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-08-06 16:35:30 +0200 |
| commit | 350ec881d966453bdcf1d3299071e90da4e507b4 (patch) | |
| tree | 6a527acf2968da235bf6d8b0906efcbf7107b5d9 /drivers/gpu/drm/i915/i915_gem_context.c | |
| parent | ad8d270c21aa2f57f0cd578b1737f65c44c34b80 (diff) | |
| download | blackbird-obmc-linux-350ec881d966453bdcf1d3299071e90da4e507b4.tar.gz blackbird-obmc-linux-350ec881d966453bdcf1d3299071e90da4e507b4.zip | |
drm/i915: Rename I915_CACHE_MLC_LLC to L3_LLC for Ivybridge
MLC_LLC was never validated for Sandybridge and was superseded by a new
level of cacheing for the GPU in Ivybridge. Update our names to be
consistent with usage, and in the process stop setting the unwanted bit
on Sandybridge.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
[danvet: s/BUG/WARN_ON(1) bikeshed.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_context.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index d1cb28cbc71e..7273a729a039 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -155,7 +155,7 @@ create_hw_context(struct drm_device *dev, if (INTEL_INFO(dev)->gen >= 7) { ret = i915_gem_object_set_cache_level(ctx->obj, - I915_CACHE_LLC_MLC); + I915_CACHE_L3_LLC); /* Failure shouldn't ever happen this early */ if (WARN_ON(ret)) goto err_out; |
