diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-12-23 02:21:43 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-12-23 02:21:44 +0100 |
| commit | dbfba788c7ef839849e013264fef551e4d119d0b (patch) | |
| tree | 9fcab0a2477000ff85b9ffc4aec37324b1758a0b | |
| parent | Merge tag 'mediatek-drm-fixes-5.16' of https://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | drm/i915/guc: Only assign guc_id.id when stealing guc_id (diff) | |
| download | linux-dbfba788c7ef839849e013264fef551e4d119d0b.tar.xz linux-dbfba788c7ef839849e013264fef551e4d119d0b.zip | |
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: Dave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87wnjwydhs.fsf@intel.com
| -rw-r--r-- | drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c index c48557dfa04c..302e9ff0602c 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c @@ -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); |