Commit 7a2a519a authored by Chris Wilson's avatar Chris Wilson

drm/i915: Drop bool return from breadcrumbs signaler

Since removal of the "missed interrupt detection" nobody used the result
of whether or not we signaled anybody during that invocation, so now
remove the return value.

References: 789659f4 ("drm/i915: Drop fake breadcrumb irq")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190416085218.431-1-chris@chris-wilson.co.uk
parent c856dbc8
...@@ -27,8 +27,6 @@ ...@@ -27,8 +27,6 @@
#include "i915_drv.h" #include "i915_drv.h"
#define task_asleep(tsk) ((tsk)->state & TASK_NORMAL && !(tsk)->on_rq)
static void irq_enable(struct intel_engine_cs *engine) static void irq_enable(struct intel_engine_cs *engine)
{ {
if (!engine->irq_enable) if (!engine->irq_enable)
...@@ -82,7 +80,7 @@ static inline bool __request_completed(const struct i915_request *rq) ...@@ -82,7 +80,7 @@ static inline bool __request_completed(const struct i915_request *rq)
return i915_seqno_passed(__hwsp_seqno(rq), rq->fence.seqno); return i915_seqno_passed(__hwsp_seqno(rq), rq->fence.seqno);
} }
bool intel_engine_breadcrumbs_irq(struct intel_engine_cs *engine) void intel_engine_breadcrumbs_irq(struct intel_engine_cs *engine)
{ {
struct intel_breadcrumbs *b = &engine->breadcrumbs; struct intel_breadcrumbs *b = &engine->breadcrumbs;
struct intel_context *ce, *cn; struct intel_context *ce, *cn;
...@@ -146,19 +144,13 @@ bool intel_engine_breadcrumbs_irq(struct intel_engine_cs *engine) ...@@ -146,19 +144,13 @@ bool intel_engine_breadcrumbs_irq(struct intel_engine_cs *engine)
dma_fence_signal(&rq->fence); dma_fence_signal(&rq->fence);
i915_request_put(rq); i915_request_put(rq);
} }
return !list_empty(&signal);
} }
bool intel_engine_signal_breadcrumbs(struct intel_engine_cs *engine) void intel_engine_signal_breadcrumbs(struct intel_engine_cs *engine)
{ {
bool result;
local_irq_disable(); local_irq_disable();
result = intel_engine_breadcrumbs_irq(engine); intel_engine_breadcrumbs_irq(engine);
local_irq_enable(); local_irq_enable();
return result;
} }
static void signal_irq_work(struct irq_work *work) static void signal_irq_work(struct irq_work *work)
......
...@@ -388,7 +388,7 @@ void intel_engine_fini_breadcrumbs(struct intel_engine_cs *engine); ...@@ -388,7 +388,7 @@ void intel_engine_fini_breadcrumbs(struct intel_engine_cs *engine);
void intel_engine_pin_breadcrumbs_irq(struct intel_engine_cs *engine); void intel_engine_pin_breadcrumbs_irq(struct intel_engine_cs *engine);
void intel_engine_unpin_breadcrumbs_irq(struct intel_engine_cs *engine); void intel_engine_unpin_breadcrumbs_irq(struct intel_engine_cs *engine);
bool intel_engine_signal_breadcrumbs(struct intel_engine_cs *engine); void intel_engine_signal_breadcrumbs(struct intel_engine_cs *engine);
void intel_engine_disarm_breadcrumbs(struct intel_engine_cs *engine); void intel_engine_disarm_breadcrumbs(struct intel_engine_cs *engine);
static inline void static inline void
...@@ -397,7 +397,7 @@ intel_engine_queue_breadcrumbs(struct intel_engine_cs *engine) ...@@ -397,7 +397,7 @@ intel_engine_queue_breadcrumbs(struct intel_engine_cs *engine)
irq_work_queue(&engine->breadcrumbs.irq_work); irq_work_queue(&engine->breadcrumbs.irq_work);
} }
bool intel_engine_breadcrumbs_irq(struct intel_engine_cs *engine); void intel_engine_breadcrumbs_irq(struct intel_engine_cs *engine);
void intel_engine_reset_breadcrumbs(struct intel_engine_cs *engine); void intel_engine_reset_breadcrumbs(struct intel_engine_cs *engine);
void intel_engine_fini_breadcrumbs(struct intel_engine_cs *engine); void intel_engine_fini_breadcrumbs(struct intel_engine_cs *engine);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment