diff options
Diffstat (limited to 'drivers/gpu/drm/xe/xe_hw_fence.c')
| -rw-r--r-- | drivers/gpu/drm/xe/xe_hw_fence.c | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/drivers/gpu/drm/xe/xe_hw_fence.c b/drivers/gpu/drm/xe/xe_hw_fence.c index b2a0c46dfcd4..ae8ed15b64c5 100644 --- a/drivers/gpu/drm/xe/xe_hw_fence.c +++ b/drivers/gpu/drm/xe/xe_hw_fence.c @@ -8,9 +8,7 @@ #include <linux/device.h> #include <linux/slab.h> -#include "xe_bo.h" -#include "xe_device.h" -#include "xe_gt.h" +#include "xe_device_types.h" #include "xe_hw_engine.h" #include "xe_macros.h" #include "xe_map.h" @@ -85,7 +83,6 @@ void xe_hw_fence_irq_finish(struct xe_hw_fence_irq *irq) { struct xe_hw_fence *fence, *next; unsigned long flags; - int err; bool tmp; if (XE_WARN_ON(!list_empty(&irq->pending))) { @@ -93,9 +90,8 @@ void xe_hw_fence_irq_finish(struct xe_hw_fence_irq *irq) spin_lock_irqsave(&irq->lock, flags); list_for_each_entry_safe(fence, next, &irq->pending, irq_link) { list_del_init(&fence->irq_link); - err = dma_fence_signal_locked(&fence->dma); + XE_WARN_ON(dma_fence_check_and_signal_locked(&fence->dma)); dma_fence_put(&fence->dma); - XE_WARN_ON(err); } spin_unlock_irqrestore(&irq->lock, flags); dma_fence_end_signalling(tmp); @@ -110,22 +106,6 @@ void xe_hw_fence_irq_run(struct xe_hw_fence_irq *irq) irq_work_queue(&irq->work); } -void xe_hw_fence_irq_stop(struct xe_hw_fence_irq *irq) -{ - spin_lock_irq(&irq->lock); - irq->enabled = false; - spin_unlock_irq(&irq->lock); -} - -void xe_hw_fence_irq_start(struct xe_hw_fence_irq *irq) -{ - spin_lock_irq(&irq->lock); - irq->enabled = true; - spin_unlock_irq(&irq->lock); - - irq_work_queue(&irq->work); -} - void xe_hw_fence_ctx_init(struct xe_hw_fence_ctx *ctx, struct xe_gt *gt, struct xe_hw_fence_irq *irq, const char *name) { |