drm/i915: Remove redundant return value and WARN_ON
Subsystems (2)
PATCH 1/1 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 Dave Gordon <[email protected]>
--- drivers/gpu/drm/i915/intel_lrc.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_lrc.c +6 -8
@@ -356,9 +356,9 @@ static int execlists_ctx_write_tail(struct drm_i915_gem_object *ctx_obj, u32 taireturn 0 ; } -static int execlists_submit_context (struct intel_engine_cs *ring, -struct intel_context *to0,u32 tail0, -struct intel_context *to1,u32 tail1) +static void execlists_submit_contexts (struct intel_engine_cs *ring, +struct intel_context *to0,u32 tail0, +struct intel_context *to1,u32 tail1) {struct drm_i915_gem_object *ctx_obj0;struct drm_i915_gem_object *ctx_obj1 =NULL ;
@@ -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, - req1 ? req1->ctx :NULL , - req1 ? req1->tail :0 )); +execlists_submit_contexts (ring, req0->ctx, req0->tail, + req1 ? req1->ctx :NULL , + req1 ? req1->tail :0 ); req0->elsp_submitted++;if (req1)
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedQuoted 7 lines · Dave Gordon
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 theWARN_ON()testing its return value.Change-Id Ie225b0eca7754c6093c8b8bd15550b251b6feb82Signed-off-by Dave Gordon <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx