]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: Skip the ERR_PTR error state
authorChris Wilson <chris@chris-wilson.co.uk>
Fri, 7 Dec 2018 11:05:54 +0000 (11:05 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Fri, 7 Dec 2018 13:40:10 +0000 (13:40 +0000)
commit194441196f0d726838dbaa9fd784e774e81fed0f
tree60f47c2e0b2b831dc4e718b7eeeb51087278169f
parent507a0830c86eec06c015920bf6a08028a0b73491
drm/i915: Skip the ERR_PTR error state

Although commit 2244e88a5b53 ("drm/i915: Prevent machine hang from
Broxton's vtd w/a and error capture") applied cleanly after a 24 month
hiatus, the code had moved on with new methods for peeking and fetching
the captured gpu info. Make sure we catch all uses of the stashed error
state and avoid dereferencing the error pointer.

v2: Move error pointer determination into i915_gpu_capture_state
v3: Restore early check to avoid capturing and then throwing away
subsequent GPU error states.

Fixes: 2244e88a5b53 ("drm/i915: Prevent machine hang from Broxton's vtd w/a and error capture")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181207110554.19897-1-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/i915_debugfs.c
drivers/gpu/drm/i915/i915_gpu_error.c
drivers/gpu/drm/i915/i915_sysfs.c