diff options
| author | Chris Wilson | 2019-01-14 22:04:01 +0100 |
|---|---|---|
| committer | Chris Wilson | 2019-01-16 16:24:16 +0100 |
| commit | 18bb2bccb5492fb5c36908191b8af77e54c58814 (patch) | |
| tree | 96cb21f22d1eb251d6f3853b300912b1f1c81800 /drivers/gpu/drm/i915/i915_gpu_error.h | |
| parent | drm/i915: Pass down rc in intel_encoder->compute_config() (diff) | |
| download | kernel-qcow2-linux-18bb2bccb5492fb5c36908191b8af77e54c58814.tar.gz kernel-qcow2-linux-18bb2bccb5492fb5c36908191b8af77e54c58814.tar.xz kernel-qcow2-linux-18bb2bccb5492fb5c36908191b8af77e54c58814.zip | |
drm/i915: Serialise concurrent calls to i915_gem_set_wedged()
Make i915_gem_set_wedged() and i915_gem_unset_wedged() behaviour more
consistent if called concurrently, and only do the wedging and reporting
once, curtailing any possible race where we start unwedging in the middle
of a wedge.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190114210408.4561-2-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gpu_error.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gpu_error.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.h b/drivers/gpu/drm/i915/i915_gpu_error.h index 6d9f45468ac1..604291f7762d 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.h +++ b/drivers/gpu/drm/i915/i915_gpu_error.h @@ -271,8 +271,8 @@ struct i915_gpu_error { #define I915_RESET_BACKOFF 0 #define I915_RESET_HANDOFF 1 #define I915_RESET_MODESET 2 +#define I915_RESET_ENGINE 3 #define I915_WEDGED (BITS_PER_LONG - 1) -#define I915_RESET_ENGINE (I915_WEDGED - I915_NUM_ENGINES) /** Number of times an engine has been reset */ u32 reset_engine_count[I915_NUM_ENGINES]; @@ -283,6 +283,8 @@ struct i915_gpu_error { /** Reason for the current *global* reset */ const char *reason; + struct mutex wedge_mutex; /* serialises wedging/unwedging */ + /** * Waitqueue to signal when a hang is detected. Used to for waiters * to release the struct_mutex for the reset to procede. |