Commit 7807bf28 authored by Matthew Brost's avatar Matthew Brost Committed by Jani Nikula
Browse files

drm/i915/guc: Only assign guc_id.id when stealing guc_id 



Previously assigned whole guc_id structure (list, spin lock) which is
incorrect, only assign the guc_id.id.

Fixes: 0f797650 ("drm/i915/guc: Rework and simplify locking")
Signed-off-by: default avatarMatthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Signed-off-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211214170500.28569-3-matthew.brost@intel.com


(cherry picked from commit 939d8e9c)
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 64d16aca

drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c

+1 −1
Original line number Diff line number Diff line
@@ -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);