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

Commit 9400ae5c authored by John Harrison's avatar John Harrison Committed by Daniel Vetter
Browse files

drm/i915: Remove obsolete seqno parameter from 'i915_add_request' 



There is no longer any need to retrieve a seqno value from an i915_add_request()
call. The calling code already knows which request structure is being processed
(it can only be ring->OLR). And as the request itself is now used in preference
to the basic seqno value, the latter is now redundant in this situation.

For: VIZ-4377
Signed-off-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Reviewed-by: default avatarThomas Daniel <Thomas.Daniel@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 9c654818

drivers/gpu/drm/i915/i915_drv.h

+3 −4
Original line number Diff line number Diff line
@@ -2621,10 +2621,9 @@ int __must_check i915_gpu_idle(struct drm_device *dev); 
int __must_check i915_gem_suspend(struct drm_device *dev);

int __i915_add_request(struct intel_engine_cs *ring,

		       struct drm_file *file,

		       struct drm_i915_gem_object *batch_obj,

		       u32 *seqno);

#define i915_add_request(ring, seqno) \

	__i915_add_request(ring, NULL, NULL, seqno)

		       struct drm_i915_gem_object *batch_obj);

#define i915_add_request(ring) \

	__i915_add_request(ring, NULL, NULL)

int __i915_wait_request(struct drm_i915_gem_request *req,

			unsigned reset_counter,

			bool interruptible,

drivers/gpu/drm/i915/i915_gem.c

+2 −5
Original line number Diff line number Diff line
@@ -1164,7 +1164,7 @@ i915_gem_check_olr(struct drm_i915_gem_request *req) 


	ret = 0;

	if (req == req->ring->outstanding_lazy_request)

		ret = i915_add_request(req->ring, NULL);

		ret = i915_add_request(req->ring);



	return ret;

}
@@ -2412,8 +2412,7 @@ i915_gem_get_seqno(struct drm_device *dev, u32 *seqno) 


int __i915_add_request(struct intel_engine_cs *ring,

		       struct drm_file *file,

		       struct drm_i915_gem_object *obj,

		       u32 *out_seqno)

		       struct drm_i915_gem_object *obj)

{

	struct drm_i915_private *dev_priv = ring->dev->dev_private;

	struct drm_i915_gem_request *request;
@@ -2512,8 +2511,6 @@ int __i915_add_request(struct intel_engine_cs *ring, 
			   round_jiffies_up_relative(HZ));

	intel_mark_busy(dev_priv->dev);



	if (out_seqno)

		*out_seqno = request->seqno;

	return 0;

}

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -993,7 +993,7 @@ i915_gem_execbuffer_retire_commands(struct drm_device *dev, 
	ring->gpu_caches_dirty = true;



	/* Add a breadcrumb for the completion of the batch buffer */

	(void)__i915_add_request(ring, file, obj, NULL);

	(void)__i915_add_request(ring, file, obj);

}



static int

drivers/gpu/drm/i915/i915_gem_render_state.c

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ int i915_gem_render_state_init(struct intel_engine_cs *ring) 


	i915_vma_move_to_active(i915_gem_obj_to_ggtt(so.obj), ring);



	ret = __i915_add_request(ring, NULL, so.obj, NULL);

	ret = __i915_add_request(ring, NULL, so.obj);

	/* __i915_add_request moves object to inactive if it fails */

out:

	i915_gem_render_state_fini(&so);

drivers/gpu/drm/i915/intel_lrc.c

+1 −1
Original line number Diff line number Diff line
@@ -1628,7 +1628,7 @@ int intel_lr_context_render_state_init(struct intel_engine_cs *ring, 


	i915_vma_move_to_active(i915_gem_obj_to_ggtt(so.obj), ring);



	ret = __i915_add_request(ring, file, so.obj, NULL);

	ret = __i915_add_request(ring, file, so.obj);

	/* intel_logical_ring_add_request moves object to inactive if it

	 * fails */

out: