]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
drm/i915: Only try to park engines after a failed reset
authorChris Wilson <chris@chris-wilson.co.uk>
Wed, 13 Feb 2019 23:20:47 +0000 (23:20 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Thu, 14 Feb 2019 21:41:45 +0000 (21:41 +0000)
commit9a3b19a16dc28ab717cf1663d09ffee0715b735a
tree65c3e831b339c19a35ac53407c40eee6702e156f
parentd31c85fc864269ab8e6fb6ed36c87f2fc33a9430
drm/i915: Only try to park engines after a failed reset

Currently we try to stop the engine by programming the ring registers to
be disabled before we perform the reset. Sometimes, we see the context
image also have invalid ring registers, which one presumes may be
actually caused by us doing so. Lets risk not doing programming the
ring to zero on the first attempt to avoid preserving that corruption
into the context image, leaving the w/a in place for subsequent
reset attempts.

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