|
@@ -475,7 +475,6 @@ i915_gem_execbuffer_unreserve_object(struct drm_i915_gem_object *obj)
|
|
|
|
|
|
static int
|
|
|
i915_gem_execbuffer_reserve(struct intel_ring_buffer *ring,
|
|
|
- struct drm_file *file,
|
|
|
struct list_head *objects,
|
|
|
bool *need_relocs)
|
|
|
{
|
|
@@ -663,7 +662,7 @@ i915_gem_execbuffer_relocate_slow(struct drm_device *dev,
|
|
|
goto err;
|
|
|
|
|
|
need_relocs = (args->flags & I915_EXEC_NO_RELOC) == 0;
|
|
|
- ret = i915_gem_execbuffer_reserve(ring, file, &eb->objects, &need_relocs);
|
|
|
+ ret = i915_gem_execbuffer_reserve(ring, &eb->objects, &need_relocs);
|
|
|
if (ret)
|
|
|
goto err;
|
|
|
|
|
@@ -984,7 +983,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
|
|
|
|
|
|
/* Move the objects en-masse into the GTT, evicting if necessary. */
|
|
|
need_relocs = (args->flags & I915_EXEC_NO_RELOC) == 0;
|
|
|
- ret = i915_gem_execbuffer_reserve(ring, file, &eb->objects, &need_relocs);
|
|
|
+ ret = i915_gem_execbuffer_reserve(ring, &eb->objects, &need_relocs);
|
|
|
if (ret)
|
|
|
goto err;
|
|
|
|