Commit b0573472 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/gt: Retire cancelled requests on unload 



If we manage to hit the intel_gt_set_wedged_on_fini() while active, i.e.
module unload during a stress test, we may cancel the requests but not
clean up. This leads to a very slow module unload as we wait for
something or other to trigger the retirement flushing, or timeout and
unload with a bunch of warnings. Instead if we explicitly cancel then
cleanup on an active unload, it should be instant and quiet.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200930163253.2789-3-chris@chris-wilson.co.uk
parent eb3afbe1

drivers/gpu/drm/i915/gt/intel_reset.c

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "intel_engine_pm.h"

#include "intel_gt.h"

#include "intel_gt_pm.h"

#include "intel_gt_requests.h"

#include "intel_reset.h"



#include "uc/intel_guc.h"
@@ -1370,6 +1371,7 @@ void intel_gt_set_wedged_on_fini(struct intel_gt *gt) 
{

	intel_gt_set_wedged(gt);

	set_bit(I915_WEDGED_ON_FINI, &gt->reset.flags);

	intel_gt_retire_requests(gt); /* cleanup any wedged requests */

}



void intel_gt_init_reset(struct intel_gt *gt)