* [PATCH] drm/amdgpu: Fix module unload hang by KIQ on Vega10 @ 2017-04-18 2:13 Trigger Huang [not found] ` <1492481623-23177-1-git-send-email-trigger.huang-5C7GfCeVMHo@public.gmane.org> 0 siblings, 1 reply; 4+ messages in thread From: Trigger Huang @ 2017-04-18 2:13 UTC (permalink / raw) To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Trigger Huang Apply commit 4e683cb2644f ("drm/amdgpu: Fix module unload hang by KIQ IRQ set")to vega10 Signed-off-by: Trigger Huang <trigger.huang@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@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 4+ messages in thread
[parent not found: <1492481623-23177-1-git-send-email-trigger.huang-5C7GfCeVMHo@public.gmane.org>]
* RE: [PATCH] drm/amdgpu: Fix module unload hang by KIQ on Vega10 [not found] ` <1492481623-23177-1-git-send-email-trigger.huang-5C7GfCeVMHo@public.gmane.org> @ 2017-04-18 5:21 ` Yu, Xiangliang 2017-04-18 13:33 ` Deucher, Alexander 1 sibling, 0 replies; 4+ messages in thread From: Yu, Xiangliang @ 2017-04-18 5:21 UTC (permalink / raw) To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Huang, Trigger Reviewed-by: Xiangliang Yu <Xiangliang.Yu@amd.com> Thanks! Xiangliang Yu > -----Original Message----- > From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf > Of Trigger Huang > Sent: Tuesday, April 18, 2017 10:14 AM > To: amd-gfx@lists.freedesktop.org > Cc: Huang, Trigger <Trigger.Huang@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@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@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH] drm/amdgpu: Fix module unload hang by KIQ on Vega10 [not found] ` <1492481623-23177-1-git-send-email-trigger.huang-5C7GfCeVMHo@public.gmane.org> 2017-04-18 5:21 ` Yu, Xiangliang @ 2017-04-18 13:33 ` Deucher, Alexander [not found] ` <BN6PR12MB16520E5F38D00D46AAE77A5CF7190-/b2+HYfkarQqUD6E6FAiowdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org> 1 sibling, 1 reply; 4+ messages in thread From: Deucher, Alexander @ 2017-04-18 13:33 UTC (permalink / raw) To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Huang, Trigger > -----Original Message----- > From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf > Of Trigger Huang > Sent: Monday, April 17, 2017 10:14 PM > To: amd-gfx@lists.freedesktop.org > Cc: Huang, Trigger > 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@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@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@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 4+ messages in thread
[parent not found: <BN6PR12MB16520E5F38D00D46AAE77A5CF7190-/b2+HYfkarQqUD6E6FAiowdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>]
* Re: [PATCH] drm/amdgpu: Fix module unload hang by KIQ on Vega10 [not found] ` <BN6PR12MB16520E5F38D00D46AAE77A5CF7190-/b2+HYfkarQqUD6E6FAiowdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org> @ 2017-04-18 14:21 ` Zhu, Rex 0 siblings, 0 replies; 4+ messages in thread From: Zhu, Rex @ 2017-04-18 14:21 UTC (permalink / raw) To: Deucher, Alexander, Huang, Trigger, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW [-- Attachment #1.1: Type: text/plain, Size: 3590 bytes --] I think no need to check function type. Best Regards Rex ________________________________ From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Deucher, Alexander <Alexander.Deucher-5C7GfCeVMHo@public.gmane.org> Sent: Tuesday, April 18, 2017 9:33:58 PM To: Huang, Trigger; amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Huang, Trigger Subject: RE: [PATCH] drm/amdgpu: Fix module unload hang by KIQ on Vega10 > -----Original Message----- > From: amd-gfx [mailto:amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org] On Behalf > Of Trigger Huang > Sent: Monday, April 17, 2017 10:14 PM > To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org > Cc: Huang, Trigger > 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-5C7GfCeVMHo@public.gmane.org> Reviewed-by: Alex Deucher <alexander.deucher-5C7GfCeVMHo@public.gmane.org> > --- > 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-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx [-- Attachment #1.2: Type: text/html, Size: 6390 bytes --] [-- Attachment #2: Type: text/plain, Size: 154 bytes --] _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-04-18 14:21 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-04-18 2:13 [PATCH] drm/amdgpu: Fix module unload hang by KIQ on Vega10 Trigger Huang [not found] ` <1492481623-23177-1-git-send-email-trigger.huang-5C7GfCeVMHo@public.gmane.org> 2017-04-18 5:21 ` Yu, Xiangliang 2017-04-18 13:33 ` Deucher, Alexander [not found] ` <BN6PR12MB16520E5F38D00D46AAE77A5CF7190-/b2+HYfkarQqUD6E6FAiowdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org> 2017-04-18 14:21 ` Zhu, Rex
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.