diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-03-30 09:48:45 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-03-30 09:48:58 +0200 |
| commit | c69f203df3e61414fbf1a66d130abfd7c3bf3fd0 (patch) | |
| tree | a6850417a1871f7bf321ef0318bd8c43439d7fed /drivers/gpu/drm/i915/intel_ringbuffer.h | |
| parent | 3906a13a6b4e78fbc0def03a808f091f0dff1b44 (diff) | |
| parent | fe82203b63e598c34d96e846dea49679a726fc7a (diff) | |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h index 79c2b8d72322..13dccb18cd43 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.h +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h @@ -403,6 +403,9 @@ struct intel_engine_cs { */ struct i915_gem_context *legacy_active_context; + /* status_notifier: list of callbacks for context-switch changes */ + struct atomic_notifier_head context_status_notifier; + struct intel_engine_hangcheck hangcheck; bool needs_cmd_parser; |