drm/i915: Cancel reset preparations on failed resets
authorMika Kuoppala <mika.kuoppala@linux.intel.com>
Tue, 5 Jun 2018 16:03:56 +0000 (19:03 +0300)
committerMika Kuoppala <mika.kuoppala@linux.intel.com>
Fri, 8 Jun 2018 09:16:19 +0000 (12:16 +0300)
commitc30acb04e7c401d5b412ec925ff4b862bc77b0b8
tree0b83aa90348759a91cd3a7ac35f701ef15e8fc36
parent17f297b427a32ef5524a494de331c68366e8226d
drm/i915: Cancel reset preparations on failed resets

Our reset handling has a retry layer further up in the
chain. As we have told the engine to prepare for reset,
and failed it, make sure to remove that preparation so
that the next attempted reset has a clean slate by triggering
another full prepare cycle for the engines.

v2: ret as int, simplified cleanup (Chris)

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180605160357.32591-1-mika.kuoppala@linux.intel.com
drivers/gpu/drm/i915/intel_uncore.c