drm/i915: Rework GPU reset sequence to match driver load & thaw

Browse source

This patch is to address Daniels concerns over different code during reset:

http://lists.freedesktop.org/archives/intel-gfx/2014-June/047758.html

"The reason for aiming as hard as possible to use the exact same code for
driver load, gpu reset and runtime pm/system resume is that we've simply
seen too many bugs due to slight variations and unintended omissions."

Tested using igt drv_hangman.

V2: Cleaner way of preventing check_wedge returning -EAGAIN
V3: Clean the last_context during reset, to ensure do_switch() does the MI_SET_CONTEXT. As per review.
Signed-off-by: McAulay, Alistair <alistair.mcaulay@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
[danvet: Rebase over ctx->ppgtt rework and extend the comment in
check_wedge a bit.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

...

This commit is contained in:

McAulay, Alistair 2014-08-15 18:51:35 +01:00 • committed by Daniel Vetter

parent 47c1296829

commit 6689c167ae

6 changed files with 30 additions and 86 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

6

drivers/gpu/drm/i915/i915_drv.c

View file

3

drivers/gpu/drm/i915/i915_drv.h

View file

8

drivers/gpu/drm/i915/i915_gem.c

View file

33

drivers/gpu/drm/i915/i915_gem_context.c

View file

63

drivers/gpu/drm/i915/i915_gem_gtt.c

View file

3

drivers/gpu/drm/i915/i915_gem_gtt.h

View file