drm/i915: Re-enable GGTT earlier after GPU reset
authorChris Wilson <chris@chris-wilson.co.uk>
Sun, 17 Dec 2017 13:28:50 +0000 (13:28 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 18 Dec 2017 11:16:07 +0000 (11:16 +0000)
commita31d73c3a7218539bc25fc298ac6cd5b66d96b86
treea83328828a391c76b73208f3e592f3a9ce251d01
parentab309a6a3a0b3b6ce495c7a31731ff82cff7faa2
drm/i915: Re-enable GGTT earlier after GPU reset

Inside i915_gem_reset(), we start touching the HW and so require the
low-level HW to be re-enabled, in particular the PCI BARs.

Fixes: 7b6da818d86f ("drm/i915: Restore the kernel context after a GPU reset on an idle engine")
References: 0db8c9612091 ("drm/i915: Re-enable GTT following a device reset")
Testcase: igt/drv_hangman #i915g/i915gm
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Michel Thierry <michel.thierry@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171217132852.30642-1-chris@chris-wilson.co.uk
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
drivers/gpu/drm/i915/i915_drv.c