diff options
author | Ben Widawsky <ben@bwidawsk.net> | 2013-03-13 20:21:06 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-03-17 22:03:19 -0400 |
commit | 41fda596826c5db206f67ce5d639f65a19924a99 (patch) | |
tree | 9ba4240087517c867f5e849b7cfbaa5cf12a8967 | |
parent | cf144969d54da1476e2b80dd632952a2f93c6b34 (diff) |
drm/i915: Remove unneeded dev argument
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 87948a467641..983083976dd8 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c | |||
@@ -359,8 +359,7 @@ i915_gem_execbuffer_relocate_object_slow(struct drm_i915_gem_object *obj, | |||
359 | } | 359 | } |
360 | 360 | ||
361 | static int | 361 | static int |
362 | i915_gem_execbuffer_relocate(struct drm_device *dev, | 362 | i915_gem_execbuffer_relocate(struct eb_objects *eb) |
363 | struct eb_objects *eb) | ||
364 | { | 363 | { |
365 | struct drm_i915_gem_object *obj; | 364 | struct drm_i915_gem_object *obj; |
366 | int ret = 0; | 365 | int ret = 0; |
@@ -989,7 +988,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, | |||
989 | 988 | ||
990 | /* The objects are in their final locations, apply the relocations. */ | 989 | /* The objects are in their final locations, apply the relocations. */ |
991 | if (need_relocs) | 990 | if (need_relocs) |
992 | ret = i915_gem_execbuffer_relocate(dev, eb); | 991 | ret = i915_gem_execbuffer_relocate(eb); |
993 | if (ret) { | 992 | if (ret) { |
994 | if (ret == -EFAULT) { | 993 | if (ret == -EFAULT) { |
995 | ret = i915_gem_execbuffer_relocate_slow(dev, args, file, ring, | 994 | ret = i915_gem_execbuffer_relocate_slow(dev, args, file, ring, |