Commit dbfba788 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2021-12-22' of... 

Merge tag 'drm-intel-fixes-2021-12-22' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

drm/i915 fixes for v5.16-rc7:
- Fix fallout from guc submission locking rework

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87wnjwydhs.fsf@intel.com
parents ae95af97 7807bf28

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

+3 −3
Original line number Diff line number Diff line
@@ -1662,11 +1662,11 @@ 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(&ce->guc_state.lock);

		spin_lock(&cn->guc_state.lock);

		clr_context_registered(cn);

		spin_unlock(&ce->guc_state.lock);

		spin_unlock(&cn->guc_state.lock);



		set_context_guc_id_invalid(cn);