Skip to content

Commit 6533863

Browse files
committed
drm/xe: Call invalidation_fence_fini for PT inval fences in error state
Invalidation_fence_init takes a PM reference, which is released in its _fini counterpart, so we need to make sure that the latter is called, even if the fence is in an error state. Since we already have a function that calls _fini() and signals the fence in the tlb inval code, we can expose that and call it from the PT code. Fixes: f002702 ("drm/xe: Hold a PM ref when GT TLB invalidations are inflight") Signed-off-by: Daniele Ceraolo Spurio <[email protected]> Cc: <[email protected]> # v6.11+ Cc: Matthew Brost <[email protected]> Cc: Nirmoy Das <[email protected]> Cc: Rodrigo Vivi <[email protected]> Reviewed-by: Nirmoy Das <[email protected]> Reviewed-by: Matthew Brost <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 720f63a commit 6533863

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,14 @@ invalidation_fence_signal(struct xe_device *xe, struct xe_gt_tlb_invalidation_fe
6565
__invalidation_fence_signal(xe, fence);
6666
}
6767

68+
void xe_gt_tlb_invalidation_fence_signal(struct xe_gt_tlb_invalidation_fence *fence)
69+
{
70+
if (WARN_ON_ONCE(!fence->gt))
71+
return;
72+
73+
__invalidation_fence_signal(gt_to_xe(fence->gt), fence);
74+
}
75+
6876
static void xe_gt_tlb_fence_timeout(struct work_struct *work)
6977
{
7078
struct xe_gt *gt = container_of(work, struct xe_gt,

drivers/gpu/drm/xe/xe_gt_tlb_invalidation.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ int xe_guc_tlb_invalidation_done_handler(struct xe_guc *guc, u32 *msg, u32 len);
2828
void xe_gt_tlb_invalidation_fence_init(struct xe_gt *gt,
2929
struct xe_gt_tlb_invalidation_fence *fence,
3030
bool stack);
31+
void xe_gt_tlb_invalidation_fence_signal(struct xe_gt_tlb_invalidation_fence *fence);
3132

3233
static inline void
3334
xe_gt_tlb_invalidation_fence_wait(struct xe_gt_tlb_invalidation_fence *fence)

drivers/gpu/drm/xe/xe_pt.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1334,8 +1334,7 @@ static void invalidation_fence_cb(struct dma_fence *fence,
13341334
queue_work(system_wq, &ifence->work);
13351335
} else {
13361336
ifence->base.base.error = ifence->fence->error;
1337-
dma_fence_signal(&ifence->base.base);
1338-
dma_fence_put(&ifence->base.base);
1337+
xe_gt_tlb_invalidation_fence_signal(&ifence->base);
13391338
}
13401339
dma_fence_put(ifence->fence);
13411340
}

0 commit comments

Comments
 (0)