diff options
| author | Chris Wilson | 2018-08-06 16:56:47 +0200 |
|---|---|---|
| committer | Chris Wilson | 2018-08-06 19:24:10 +0200 |
| commit | a6476ebd4350d51146ef0492b4b06bc0d31e8827 (patch) | |
| tree | 6c7b7335ea38333af2e440a587f9801324c993a8 /drivers/gpu/drm/i915/i915_drv.c | |
| parent | drm/i915: kill resource streamer support (diff) | |
| download | kernel-qcow2-linux-a6476ebd4350d51146ef0492b4b06bc0d31e8827.tar.gz kernel-qcow2-linux-a6476ebd4350d51146ef0492b4b06bc0d31e8827.tar.xz kernel-qcow2-linux-a6476ebd4350d51146ef0492b4b06bc0d31e8827.zip | |
drm/i915: Stop dropping irq around resets
A long time ago, we were afraid of handling interrupts and signaling
waiters during a reset, worrying that the confusion in request handling
would interfere with our attempts to process the reset in an orderly
fashion. Since then, we have isolated our irq-driven request handling by
virtue of the engine->timeline.lock and control of kthreads where
required, eliminating the danger of concurrently processing interrupts.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180806145647.13131-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 3857e7963fc5..ed0169d49876 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1918,7 +1918,6 @@ void i915_reset(struct drm_i915_private *i915, dev_notice(i915->drm.dev, "Resetting chip for %s\n", reason); error->reset_count++; - disable_irq(i915->drm.irq); ret = i915_gem_reset_prepare(i915); if (ret) { dev_err(i915->drm.dev, "GPU recovery failed\n"); @@ -1980,8 +1979,6 @@ void i915_reset(struct drm_i915_private *i915, finish: i915_gem_reset_finish(i915); - enable_irq(i915->drm.irq); - wakeup: clear_bit(I915_RESET_HANDOFF, &error->flags); wake_up_bit(&error->flags, I915_RESET_HANDOFF); |