> -----Original Message----- > From: amd-gfx [mailto:[email protected]] On Behalf > Of Monk Liu > Sent: Tuesday, February 07, 2017 1:11 AM > To: [email protected] > Cc: Liu, Monk > Subject: [PATCH 10/20] drm/amdgpu:change kiq lock name > > Change-Id: Ib11de11fb0a9e8086e542b932c9c62d5aa40ebb2 > Signed-off-by: Monk Liu <[email protected]>
Reviewed-by: Alex Deucher <[email protected]> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 10 +++++----- > drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 2 +- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c > index 76ef641..82a70db 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c > @@ -98,7 +98,7 @@ void amdgpu_virt_init_setting(struct amdgpu_device > *adev) > adev->mode_info.num_crtc = 1; > adev->enable_virtual_display = true; > > - mutex_init(&adev->virt.lock); > + mutex_init(&adev->virt.lock_kiq); > } > > uint32_t amdgpu_virt_kiq_rreg(struct amdgpu_device *adev, uint32_t reg) > @@ -111,14 +111,14 @@ uint32_t amdgpu_virt_kiq_rreg(struct > amdgpu_device *adev, uint32_t reg) > > BUG_ON(!ring->funcs->emit_rreg); > > - mutex_lock(&adev->virt.lock); > + mutex_lock(&adev->virt.lock_kiq); > amdgpu_ring_alloc(ring, 32); > amdgpu_ring_emit_hdp_flush(ring); > amdgpu_ring_emit_rreg(ring, reg); > amdgpu_ring_emit_hdp_invalidate(ring); > amdgpu_fence_emit(ring, &f); > amdgpu_ring_commit(ring); > - mutex_unlock(&adev->virt.lock); > + mutex_unlock(&adev->virt.lock_kiq); > > r = fence_wait(f, false); > if (r) > @@ -139,14 +139,14 @@ void amdgpu_virt_kiq_wreg(struct amdgpu_device > *adev, uint32_t reg, uint32_t v) > > BUG_ON(!ring->funcs->emit_wreg); > > - mutex_lock(&adev->virt.lock); > + mutex_lock(&adev->virt.lock_kiq); > amdgpu_ring_alloc(ring, 32); > amdgpu_ring_emit_hdp_flush(ring); > amdgpu_ring_emit_wreg(ring, reg, v); > amdgpu_ring_emit_hdp_invalidate(ring); > amdgpu_fence_emit(ring, &f); > amdgpu_ring_commit(ring); > - mutex_unlock(&adev->virt.lock); > + mutex_unlock(&adev->virt.lock_kiq); > > r = fence_wait(f, false); > if (r) > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h > b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h > index 73d24df..7020ff2 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h > @@ -46,7 +46,7 @@ struct amdgpu_virt { > uint64_t csa_vmid0_addr; > bool chained_ib_support; > uint32_t reg_val_offs; > - struct mutex lock; > + struct mutex lock_kiq; > struct amdgpu_irq_src ack_irq; > struct amdgpu_irq_src rcv_irq; > struct delayed_work flr_work; > -- > 2.7.4 > > _______________________________________________ > amd-gfx mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
