Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a8edb59 authored by John Harrison's avatar John Harrison Committed by Daniel Vetter
Browse files

drm/i915: Update execbuffer_move_to_active() to take a request structure 



The plan is to pass requests around as the basic submission tracking structure
rather than rings and contexts. This patch updates the
execbuffer_move_to_active() code path.

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 535fbe82

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -2693,7 +2693,7 @@ int i915_gem_set_domain_ioctl(struct drm_device *dev, void *data, 
int i915_gem_sw_finish_ioctl(struct drm_device *dev, void *data,

			     struct drm_file *file_priv);

void i915_gem_execbuffer_move_to_active(struct list_head *vmas,

					struct intel_engine_cs *ring);

					struct drm_i915_gem_request *req);

void i915_gem_execbuffer_retire_commands(struct i915_execbuffer_params *params);

int i915_gem_ringbuffer_submission(struct i915_execbuffer_params *params,

				   struct drm_i915_gem_execbuffer2 *args,

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+3 −3
Original line number Diff line number Diff line
@@ -1020,9 +1020,9 @@ i915_gem_validate_context(struct drm_device *dev, struct drm_file *file, 


void

i915_gem_execbuffer_move_to_active(struct list_head *vmas,

				   struct intel_engine_cs *ring)

				   struct drm_i915_gem_request *req)

{

	struct drm_i915_gem_request *req = intel_ring_get_request(ring);

	struct intel_engine_cs *ring = i915_gem_request_get_ring(req);

	struct i915_vma *vma;



	list_for_each_entry(vma, vmas, exec_list) {
@@ -1342,7 +1342,7 @@ i915_gem_ringbuffer_submission(struct i915_execbuffer_params *params, 


	trace_i915_gem_ring_dispatch(params->request, params->dispatch_flags);



	i915_gem_execbuffer_move_to_active(vmas, ring);

	i915_gem_execbuffer_move_to_active(vmas, params->request);

	i915_gem_execbuffer_retire_commands(params);



error:

drivers/gpu/drm/i915/intel_lrc.c

+1 −1
Original line number Diff line number Diff line
@@ -944,7 +944,7 @@ int intel_execlists_submission(struct i915_execbuffer_params *params, 


	trace_i915_gem_ring_dispatch(params->request, params->dispatch_flags);



	i915_gem_execbuffer_move_to_active(vmas, ring);

	i915_gem_execbuffer_move_to_active(vmas, params->request);

	i915_gem_execbuffer_retire_commands(params);



	return 0;