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

Commit cd0707cb authored by Dave Gordon's avatar Dave Gordon Committed by Daniel Vetter
Browse files

drm/i915: Remove redundant return value and WARN_ON 



execlists_submit_context() always returns 0, which is redundant.
And its name is inaccurate, since it actually submits (up to)
TWO contextS. So we rename it, change it to "void", and remove
the WARN_ON() testing its return value.

Change-Id: Ie225b0eca7754c6093c8b8bd15550b251b6feb82
Signed-off-by: default avatarDave Gordon <david.s.gordon@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 6402c330

drivers/gpu/drm/i915/intel_lrc.c

+6 −8
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ static int execlists_ctx_write_tail(struct drm_i915_gem_object *ctx_obj, u32 tai 
	return 0;

}



static int execlists_submit_context(struct intel_engine_cs *ring,

static void execlists_submit_contexts(struct intel_engine_cs *ring,

				      struct intel_context *to0, u32 tail0,

				      struct intel_context *to1, u32 tail1)

{
@@ -378,8 +378,6 @@ static int execlists_submit_context(struct intel_engine_cs *ring, 
	}



	execlists_elsp_write(ring, ctx_obj0, ctx_obj1);



	return 0;

}



static void execlists_context_unqueue(struct intel_engine_cs *ring)
@@ -413,9 +411,9 @@ static void execlists_context_unqueue(struct intel_engine_cs *ring) 


	WARN_ON(req1 && req1->elsp_submitted);



	WARN_ON(execlists_submit_context(ring, req0->ctx, req0->tail,

	execlists_submit_contexts(ring, req0->ctx, req0->tail,

				  req1 ? req1->ctx : NULL,

					 req1 ? req1->tail : 0));

				  req1 ? req1->tail : 0);



	req0->elsp_submitted++;

	if (req1)