Reviewed-by: Xiangliang Yu <Xiangliang.Yu at amd.com> Thanks! Xiangliang Yu > -----Original Message----- > From: amd-gfx [mailto:amd-gfx-bounces at lists.freedesktop.org] On Behalf > Of Trigger Huang > Sent: Tuesday, April 18, 2017 10:14 AM > To: amd-gfx at lists.freedesktop.org > Cc: Huang, Trigger <Trigger.Huang at amd.com> > Subject: [PATCH] drm/amdgpu: Fix module unload hang by KIQ on Vega10 > > Apply commit 4e683cb2644f ("drm/amdgpu: Fix module unload hang by KIQ > IRQ set")to vega10 > > Signed-off-by: Trigger Huang <trigger.huang at amd.com> > --- > drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c > b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c > index f6b2329..b7b2ed8 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c > @@ -631,7 +631,6 @@ static int gfx_v9_0_kiq_init_ring(struct > amdgpu_device *adev, > ring->pipe = 1; > } > > - irq->data = ring; > ring->queue = 0; > ring->eop_gpu_addr = kiq->eop_gpu_addr; > sprintf(ring->name, "kiq %d.%d.%d", ring->me, ring->pipe, ring- > >queue); @@ -647,7 +646,6 @@ static void gfx_v9_0_kiq_free_ring(struct > amdgpu_ring *ring, { > amdgpu_wb_free(ring->adev, ring->adev->virt.reg_val_offs); > amdgpu_ring_fini(ring); > - irq->data = NULL; > } > > /* create MQD for each compute queue */ @@ -3367,9 +3365,9 @@ static > int gfx_v9_0_kiq_set_interrupt_state(struct amdgpu_device *adev, > enum amdgpu_interrupt_state > state) { > uint32_t tmp, target; > - struct amdgpu_ring *ring = (struct amdgpu_ring *)src->data; > + struct amdgpu_ring *ring = &(adev->gfx.kiq.ring); > > - BUG_ON(!ring || (ring->funcs->type != AMDGPU_RING_TYPE_KIQ)); > + BUG_ON(ring->funcs->type != AMDGPU_RING_TYPE_KIQ); > > if (ring->me == 1) > target = SOC15_REG_OFFSET(GC, 0, > mmCP_ME1_PIPE0_INT_CNTL); @@ -3413,9 +3411,9 @@ static int > gfx_v9_0_kiq_irq(struct amdgpu_device *adev, > struct amdgpu_iv_entry *entry) > { > u8 me_id, pipe_id, queue_id; > - struct amdgpu_ring *ring = (struct amdgpu_ring *)source->data; > + struct amdgpu_ring *ring = &(adev->gfx.kiq.ring); > > - BUG_ON(!ring || (ring->funcs->type != AMDGPU_RING_TYPE_KIQ)); > + BUG_ON(ring->funcs->type != AMDGPU_RING_TYPE_KIQ); > > me_id = (entry->ring_id & 0x0c) >> 2; > pipe_id = (entry->ring_id & 0x03) >> 0; > -- > 2.7.4 > > _______________________________________________ > amd-gfx mailing list > amd-gfx at lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
