diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2020-05-25 16:14:59 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-08-21 13:15:20 +0200 |
| commit | 01f876a47fc8af6d2ff1e8d7644a225956b5d80a (patch) | |
| tree | 5b2a985191b0ae6e6a046919c137430b52efd58d | |
| parent | 77fac4e901a193244b25f75bad443af282868818 (diff) | |
| download | linux-01f876a47fc8af6d2ff1e8d7644a225956b5d80a.tar.gz linux-01f876a47fc8af6d2ff1e8d7644a225956b5d80a.tar.bz2 linux-01f876a47fc8af6d2ff1e8d7644a225956b5d80a.zip | |
drm/i915/gt: Force the GT reset on shutdown
commit 7c4541a37bbbf83c0f16f779e85eb61d9348ed29 upstream.
Before we return control to the system, and letting it reuse all the
pages being accessed by HW, we must disable the HW. At the moment, we
dare not reset the GPU if it will clobber the display, but once we know
the display has been disabled, we can proceed with the reset as we
shutdown the module. We know the next user must reinitialise the HW for
their purpose.
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/489
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: stable@kernel.org
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200525151459.12083-1-chris@chris-wilson.co.uk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/gpu/drm/i915/gt/intel_gt.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c index f069551e412f..ebc29b6ee86c 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt.c +++ b/drivers/gpu/drm/i915/gt/intel_gt.c @@ -616,6 +616,11 @@ void intel_gt_driver_unregister(struct intel_gt *gt) void intel_gt_driver_release(struct intel_gt *gt) { struct i915_address_space *vm; + intel_wakeref_t wakeref; + + /* Scrub all HW state upon release */ + with_intel_runtime_pm(gt->uncore->rpm, wakeref) + __intel_gt_reset(gt, ALL_ENGINES); vm = fetch_and_zero(>->vm); if (vm) /* FIXME being called twice on error paths :( */ |