OSDN Git Service

drm/i915: Mark GPU wedging on driver unregister unrecoverable
authorJanusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
Fri, 3 Sep 2021 14:28:37 +0000 (16:28 +0200)
committerMatt Roper <matthew.d.roper@intel.com>
Wed, 15 Sep 2021 14:57:06 +0000 (07:57 -0700)
GPU wedged flag now set on driver unregister to prevent from further
using the GPU can be then cleared unintentionally when calling
__intel_gt_unset_wedged() still before the flag is finally marked
unrecoverable.  We need to have it marked unrecoverable earlier.
Implement that by replacing a call to intel_gt_set_wedged() in
intel_gt_driver_unregister() with intel_gt_set_wedged_on_fini().

With the above in place, intel_gt_set_wedged_on_fini() is now called
twice on driver remove, second time from __intel_gt_disable().  This
seems harmless, while dropping intel_gt_set_wedged_on_fini() from
__intel_gt_disable() proved to break some driver probe error unwind
paths as well as mock selftest exit path.

Signed-off-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210903142837.216978-1-janusz.krzysztofik@linux.intel.com
drivers/gpu/drm/i915/gt/intel_gt.c

index 2aeaae0..55e87af 100644 (file)
@@ -752,7 +752,7 @@ void intel_gt_driver_unregister(struct intel_gt *gt)
         * all in-flight requests so that we can quickly unbind the active
         * resources.
         */
-       intel_gt_set_wedged(gt);
+       intel_gt_set_wedged_on_fini(gt);
 
        /* Scrub all HW state upon release */
        with_intel_runtime_pm(gt->uncore->rpm, wakeref)