Commit cefade70 authored by Daniele Ceraolo Spurio's avatar Daniele Ceraolo Spurio Committed by Thomas Hellström
Browse files

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: f0027022 ("drm/xe: Hold a PM ref when GT TLB invalidations are inflight")
Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: <stable@vger.kernel.org> # v6.11+
Cc: Matthew Brost <matthew.brost@intel.com>
Cc: Nirmoy Das <nirmoy.das@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarNirmoy Das <nirmoy.das@intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241206015022.1567113-1-daniele.ceraolospurio@intel.com


(cherry picked from commit 65338639)
Signed-off-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
parent ed69b28b

drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c

+8 −0
Original line number Diff line number Diff line
@@ -65,6 +65,14 @@ invalidation_fence_signal(struct xe_device *xe, struct xe_gt_tlb_invalidation_fe 
	__invalidation_fence_signal(xe, fence);

}



void xe_gt_tlb_invalidation_fence_signal(struct xe_gt_tlb_invalidation_fence *fence)

{

	if (WARN_ON_ONCE(!fence->gt))

		return;



	__invalidation_fence_signal(gt_to_xe(fence->gt), fence);

}



static void xe_gt_tlb_fence_timeout(struct work_struct *work)

{

	struct xe_gt *gt = container_of(work, struct xe_gt,

drivers/gpu/drm/xe/xe_gt_tlb_invalidation.h

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ int xe_guc_tlb_invalidation_done_handler(struct xe_guc *guc, u32 *msg, u32 len); 
void xe_gt_tlb_invalidation_fence_init(struct xe_gt *gt,

				       struct xe_gt_tlb_invalidation_fence *fence,

				       bool stack);

void xe_gt_tlb_invalidation_fence_signal(struct xe_gt_tlb_invalidation_fence *fence);



static inline void

xe_gt_tlb_invalidation_fence_wait(struct xe_gt_tlb_invalidation_fence *fence)

drivers/gpu/drm/xe/xe_pt.c

+1 −2
Original line number Diff line number Diff line
@@ -1333,8 +1333,7 @@ static void invalidation_fence_cb(struct dma_fence *fence, 
		queue_work(system_wq, &ifence->work);

	} else {

		ifence->base.base.error = ifence->fence->error;

		dma_fence_signal(&ifence->base.base);

		dma_fence_put(&ifence->base.base);

		xe_gt_tlb_invalidation_fence_signal(&ifence->base);

	}

	dma_fence_put(ifence->fence);

}