p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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 <david.s.gordon@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Dave Gordon 2014-10-30 15:41:56 +00:00 committed by Daniel Vetter
parent 6402c330a6
commit cd0707cb1d
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/i915/intel_lrc.c
View File

@ -356,9 +356,9 @@ static int execlists_ctx_write_tail(struct drm_i915_gem_object *ctx_obj, u32 tai
return 0; 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 *to0, u32 tail0,
struct intel_context *to1, u32 tail1) struct intel_context *to1, u32 tail1)
{ {
struct drm_i915_gem_object *ctx_obj0; struct drm_i915_gem_object *ctx_obj0;
struct drm_i915_gem_object *ctx_obj1 = NULL; 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); execlists_elsp_write(ring, ctx_obj0, ctx_obj1);
return 0;
} }
static void execlists_context_unqueue(struct intel_engine_cs *ring) 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(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->ctx : NULL,
req1 ? req1->tail : 0)); req1 ? req1->tail : 0);
req0->elsp_submitted++; req0->elsp_submitted++;
if (req1) if (req1)