Skip to content

Commit

Permalink
drm/i915/guc: Only assign guc_id.id when stealing guc_id
Browse files Browse the repository at this point in the history
Previously assigned whole guc_id structure (list, spin lock) which is
incorrect, only assign the guc_id.id.

Fixes: 0f79765 ("drm/i915/guc: Rework and simplify locking")
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: John Harrison <John.C.Harrison@Intel.com>
Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211214170500.28569-3-matthew.brost@intel.com
(cherry picked from commit 939d8e9)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
  • Loading branch information
Matthew Brost authored and Jani Nikula committed Dec 20, 2021
1 parent 64d16ac commit 7807bf2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
Original file line number Diff line number Diff line change
Expand Up @@ -1662,7 +1662,7 @@ static int steal_guc_id(struct intel_guc *guc, struct intel_context *ce)
GEM_BUG_ON(intel_context_is_parent(cn));

list_del_init(&cn->guc_id.link);
ce->guc_id = cn->guc_id;
ce->guc_id.id = cn->guc_id.id;

spin_lock(&cn->guc_state.lock);
clr_context_registered(cn);
Expand Down

0 comments on commit 7807bf2

Please sign in to comment.