Skip to content

Commit

Permalink
drm/i915: Drop bool return from breadcrumbs signaler
Browse files Browse the repository at this point in the history
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: 789659f ("drm/i915: Drop fake breadcrumb irq")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190416085218.431-1-chris@chris-wilson.co.uk
  • Loading branch information
Chris Wilson committed Apr 16, 2019
1 parent c856dbc commit 7a2a519
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 13 deletions.
14 changes: 3 additions & 11 deletions drivers/gpu/drm/i915/intel_breadcrumbs.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@

#include "i915_drv.h"

#define task_asleep(tsk) ((tsk)->state & TASK_NORMAL && !(tsk)->on_rq)

static void irq_enable(struct intel_engine_cs *engine)
{
if (!engine->irq_enable)
Expand Down Expand Up @@ -82,7 +80,7 @@ static inline bool __request_completed(const struct i915_request *rq)
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_context *ce, *cn;
Expand Down Expand Up @@ -146,19 +144,13 @@ bool intel_engine_breadcrumbs_irq(struct intel_engine_cs *engine)
dma_fence_signal(&rq->fence);
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();
result = intel_engine_breadcrumbs_irq(engine);
intel_engine_breadcrumbs_irq(engine);
local_irq_enable();

return result;
}

static void signal_irq_work(struct irq_work *work)
Expand Down
4 changes: 2 additions & 2 deletions drivers/gpu/drm/i915/intel_ringbuffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_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);

static inline void
Expand All @@ -397,7 +397,7 @@ intel_engine_queue_breadcrumbs(struct intel_engine_cs *engine)
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_fini_breadcrumbs(struct intel_engine_cs *engine);
Expand Down

0 comments on commit 7a2a519

Please sign in to comment.