drm/i915: Move engine reset preparation to i915_gem_reset_prepare()

Browse source

Now that we have prepare/finish routines for the GEM reset, move the
disabling of the engine->irq_tasklet into them to reduce repetition. The
device irq enable/disable is split out to ensure it is run first and
last always (even if the GPU reset fails).

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: http://patchwork.freedesktop.org/patch/msgid/1484668747-9120-1-git-send-email-mika.kuoppala@intel.com

...

This commit is contained in:

Chris Wilson 2017-01-17 17:59:01 +02:00

parent 77affa3172

commit 4c96554365

2 changed files with 14 additions and 24 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

21

drivers/gpu/drm/i915/i915_drv.c

View file

17

drivers/gpu/drm/i915/i915_gem.c

View file