diff options
| author | Matthew Brost <matthew.brost@intel.com> | 2021-09-09 19:47:43 +0300 |
|---|---|---|
| committer | John Harrison <John.C.Harrison@Intel.com> | 2021-09-13 21:30:54 +0300 |
| commit | af5bc9f21e3acb479683e4339c5c3ea27334b270 (patch) | |
| tree | 81ec9dbbec6dd2a8f65011b8f4af19ed7ce9402f /drivers/gpu/drm/i915/i915_trace.h | |
| parent | 3cb3e3434b9f9c34e98605658818b72fdaef0795 (diff) | |
| download | linux-af5bc9f21e3acb479683e4339c5c3ea27334b270.tar.xz | |
drm/i915/guc: Drop guc_active move everything into guc_state
Now that we have locking hierarchy of sched_engine->lock ->
ce->guc_state everything from guc_active can be moved into guc_state and
protected the guc_state.lock.
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210909164744.31249-23-matthew.brost@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/i915_trace.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_trace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h index 75a40a33e13a..9795f456cccf 100644 --- a/drivers/gpu/drm/i915/i915_trace.h +++ b/drivers/gpu/drm/i915/i915_trace.h @@ -910,7 +910,7 @@ DECLARE_EVENT_CLASS(intel_context, __entry->guc_id = ce->guc_id.id; __entry->pin_count = atomic_read(&ce->pin_count); __entry->sched_state = ce->guc_state.sched_state; - __entry->guc_prio = ce->guc_active.prio; + __entry->guc_prio = ce->guc_state.prio; ), TP_printk("guc_id=%d, pin_count=%d sched_state=0x%x, guc_prio=%u", |