diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-02-14 08:01:16 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-02-14 08:18:00 -0500 |
commit | e01f69295b32dfd756d768a1fdae124108bfec04 (patch) | |
tree | 010a6c9bc7b9c91b8b5612b92840370296a3c9bc /drivers/gpu/drm/i915/intel_ringbuffer.c | |
parent | 9a6bbb62161a3b7b124ecd8325a928778dfcd67e (diff) |
drm/i915: Handle set_cache_level errors in the status page setup
Split out from Chris vma-bind rework.
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ben Widawsky <benjamin.widawsky@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index b1880a409251..76162acf7015 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c | |||
@@ -1273,7 +1273,9 @@ static int init_status_page(struct intel_ring_buffer *ring) | |||
1273 | goto err; | 1273 | goto err; |
1274 | } | 1274 | } |
1275 | 1275 | ||
1276 | i915_gem_object_set_cache_level(obj, I915_CACHE_LLC); | 1276 | ret = i915_gem_object_set_cache_level(obj, I915_CACHE_LLC); |
1277 | if (ret) | ||
1278 | goto err_unref; | ||
1277 | 1279 | ||
1278 | ret = i915_gem_obj_ggtt_pin(obj, 4096, 0); | 1280 | ret = i915_gem_obj_ggtt_pin(obj, 4096, 0); |
1279 | if (ret) | 1281 | if (ret) |