Merge tag 'drm-intel-next-queued-2020-11-27' of git://anongit.freedesktop.org/drm...

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / gt / intel_reset.c

diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c
index 75817d0..3654c95 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_reset.c
+++ b/drivers/gpu/drm/i915/gt/intel_reset.c
@@ -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"
@@ -1250,7 +1251,7 @@ void intel_gt_handle_error(struct intel_gt *gt,
        engine_mask &= gt->info.engine_mask;
 
        if (flags & I915_ERROR_CAPTURE) {
-               i915_capture_error_state(gt->i915);
+               i915_capture_error_state(gt, engine_mask);
                intel_gt_clear_error_registers(gt, engine_mask);
        }
 
@@ -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)