diff options
author | Ben Widawsky <ben@bwidawsk.net> | 2013-03-13 20:21:05 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-03-17 22:02:53 -0400 |
commit | cf144969d54da1476e2b80dd632952a2f93c6b34 (patch) | |
tree | d843b1dca3c1ea3bf02d352e72cf9ed6a4b698d6 | |
parent | a24a11e6b4e96bca817f854e0ffcce75d3eddd13 (diff) |
drm/i915: Remove unused file arg from execbuf
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem_execbuffer.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index ea963c32772d..87948a467641 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c | |||
@@ -475,7 +475,6 @@ i915_gem_execbuffer_unreserve_object(struct drm_i915_gem_object *obj) | |||
475 | 475 | ||
476 | static int | 476 | static int |
477 | i915_gem_execbuffer_reserve(struct intel_ring_buffer *ring, | 477 | i915_gem_execbuffer_reserve(struct intel_ring_buffer *ring, |
478 | struct drm_file *file, | ||
479 | struct list_head *objects, | 478 | struct list_head *objects, |
480 | bool *need_relocs) | 479 | bool *need_relocs) |
481 | { | 480 | { |
@@ -663,7 +662,7 @@ i915_gem_execbuffer_relocate_slow(struct drm_device *dev, | |||
663 | goto err; | 662 | goto err; |
664 | 663 | ||
665 | need_relocs = (args->flags & I915_EXEC_NO_RELOC) == 0; | 664 | need_relocs = (args->flags & I915_EXEC_NO_RELOC) == 0; |
666 | ret = i915_gem_execbuffer_reserve(ring, file, &eb->objects, &need_relocs); | 665 | ret = i915_gem_execbuffer_reserve(ring, &eb->objects, &need_relocs); |
667 | if (ret) | 666 | if (ret) |
668 | goto err; | 667 | goto err; |
669 | 668 | ||
@@ -984,7 +983,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, | |||
984 | 983 | ||
985 | /* Move the objects en-masse into the GTT, evicting if necessary. */ | 984 | /* Move the objects en-masse into the GTT, evicting if necessary. */ |
986 | need_relocs = (args->flags & I915_EXEC_NO_RELOC) == 0; | 985 | need_relocs = (args->flags & I915_EXEC_NO_RELOC) == 0; |
987 | ret = i915_gem_execbuffer_reserve(ring, file, &eb->objects, &need_relocs); | 986 | ret = i915_gem_execbuffer_reserve(ring, &eb->objects, &need_relocs); |
988 | if (ret) | 987 | if (ret) |
989 | goto err; | 988 | goto err; |
990 | 989 | ||