Commit adeca76d authored by John Harrison's avatar John Harrison Committed by Daniel Vetter

drm/i915: Simplify i915_gem_execbuffer_retire_commands() parameters

Shrunk the parameter list of i915_gem_execbuffer_retire_commands() to a single
structure as everything it requires is available in the execbuff_params object.

For: VIZ-5115
Signed-off-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Reviewed-by: default avatarTomas Elf <tomas.elf@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 5f19e2bf
...@@ -2692,10 +2692,7 @@ int i915_gem_sw_finish_ioctl(struct drm_device *dev, void *data, ...@@ -2692,10 +2692,7 @@ int i915_gem_sw_finish_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv); struct drm_file *file_priv);
void i915_gem_execbuffer_move_to_active(struct list_head *vmas, void i915_gem_execbuffer_move_to_active(struct list_head *vmas,
struct intel_engine_cs *ring); struct intel_engine_cs *ring);
void i915_gem_execbuffer_retire_commands(struct drm_device *dev, void i915_gem_execbuffer_retire_commands(struct i915_execbuffer_params *params);
struct drm_file *file,
struct intel_engine_cs *ring,
struct drm_i915_gem_object *obj);
int i915_gem_ringbuffer_submission(struct i915_execbuffer_params *params, int i915_gem_ringbuffer_submission(struct i915_execbuffer_params *params,
struct drm_i915_gem_execbuffer2 *args, struct drm_i915_gem_execbuffer2 *args,
struct list_head *vmas); struct list_head *vmas);
......
...@@ -1060,16 +1060,13 @@ i915_gem_execbuffer_move_to_active(struct list_head *vmas, ...@@ -1060,16 +1060,13 @@ i915_gem_execbuffer_move_to_active(struct list_head *vmas,
} }
void void
i915_gem_execbuffer_retire_commands(struct drm_device *dev, i915_gem_execbuffer_retire_commands(struct i915_execbuffer_params *params)
struct drm_file *file,
struct intel_engine_cs *ring,
struct drm_i915_gem_object *obj)
{ {
/* Unconditionally force add_request to emit a full flush. */ /* Unconditionally force add_request to emit a full flush. */
ring->gpu_caches_dirty = true; params->ring->gpu_caches_dirty = true;
/* Add a breadcrumb for the completion of the batch buffer */ /* Add a breadcrumb for the completion of the batch buffer */
__i915_add_request(ring, file, obj); __i915_add_request(params->ring, params->file, params->batch_obj);
} }
static int static int
...@@ -1346,8 +1343,7 @@ i915_gem_ringbuffer_submission(struct i915_execbuffer_params *params, ...@@ -1346,8 +1343,7 @@ i915_gem_ringbuffer_submission(struct i915_execbuffer_params *params,
trace_i915_gem_ring_dispatch(intel_ring_get_request(ring), params->dispatch_flags); trace_i915_gem_ring_dispatch(intel_ring_get_request(ring), params->dispatch_flags);
i915_gem_execbuffer_move_to_active(vmas, ring); i915_gem_execbuffer_move_to_active(vmas, ring);
i915_gem_execbuffer_retire_commands(params->dev, params->file, ring, i915_gem_execbuffer_retire_commands(params);
params->batch_obj);
error: error:
kfree(cliprects); kfree(cliprects);
......
...@@ -946,7 +946,7 @@ int intel_execlists_submission(struct i915_execbuffer_params *params, ...@@ -946,7 +946,7 @@ int intel_execlists_submission(struct i915_execbuffer_params *params,
trace_i915_gem_ring_dispatch(intel_ring_get_request(ring), params->dispatch_flags); trace_i915_gem_ring_dispatch(intel_ring_get_request(ring), params->dispatch_flags);
i915_gem_execbuffer_move_to_active(vmas, ring); i915_gem_execbuffer_move_to_active(vmas, ring);
i915_gem_execbuffer_retire_commands(params->dev, params->file, ring, params->batch_obj); i915_gem_execbuffer_retire_commands(params);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment