drm/amdgpu/gfx8: move eop programming per queue
Subsystems (2)
PATCH 1/1 drm/amdgpu/gfx8: move eop programming per queue
It's per queue not per pipe.
--- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 49 ++++++++++++++--------------------- 1 file changed, 19 insertions(+), 30 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +19 -30
@@ -1371,7 +1371,7 @@ static int gfx_v8_0_mec_init(struct amdgpu_device *adev)if (adev->gfx.mec.hpd_eop_obj ==NULL ) { r =amdgpu_bo_create (adev, - adev->gfx.mec.num_mec *adev->gfx.mec.num_pipe *MEC_HPD_SIZE *2 , + adev->gfx.mec.num_queue *MEC_HPD_SIZE ,PAGE_SIZE , true,AMDGPU_GEM_DOMAIN_GTT ,0 ,NULL ,NULL , &adev->gfx.mec.hpd_eop_obj);
@@ -1400,7 +1400,7 @@ static int gfx_v8_0_mec_init(struct amdgpu_device *adev)return r; } -memset (hpd,0 , adev->gfx.mec.num_mec *adev->gfx.mec.num_pipe *MEC_HPD_SIZE *2 ); +memset (hpd,0 , adev->gfx.mec.num_queue *MEC_HPD_SIZE );amdgpu_bo_kunmap (adev->gfx.mec.hpd_eop_obj);amdgpu_bo_unreserve (adev->gfx.mec.hpd_eop_obj);
@@ -4763,34 +4763,7 @@ static int gfx_v8_0_cp_compute_resume(struct amdgpu_device *adev)u32 *buf;struct vi_mqd *mqd; -/* init the pipes */ -mutex_lock (&adev->srbm_mutex); -for (i =0 ; i < (adev->gfx.mec.num_pipe * adev->gfx.mec.num_mec); i++) { -int me = (i <4 ) ?1 :2 ; -int pipe = (i <4 ) ? i : (i -4 ); - - eop_gpu_addr = adev->gfx.mec.hpd_eop_gpu_addr + (i *MEC_HPD_SIZE ); - eop_gpu_addr >>=8 ; - -vi_srbm_select (adev, me, pipe,0 ,0 ); - -/* write the EOP addr */ -WREG32 (mmCP_HQD_EOP_BASE_ADDR, eop_gpu_addr); -WREG32 (mmCP_HQD_EOP_BASE_ADDR_HI,upper_32_bits (eop_gpu_addr)); - -/* set the VMID assigned */ -WREG32 (mmCP_HQD_VMID,0 ); - -/* set the EOP size, register value is 2^(EOP_SIZE+1) dwords */ - tmp =RREG32 (mmCP_HQD_EOP_CONTROL); - tmp =REG_SET_FIELD (tmp,CP_HQD_EOP_CONTROL ,EOP_SIZE , - (order_base_2 (MEC_HPD_SIZE /4 ) -1 )); -WREG32 (mmCP_HQD_EOP_CONTROL, tmp); - } -vi_srbm_select (adev,0 ,0 ,0 ,0 ); -mutex_unlock (&adev->srbm_mutex); - -/* init the queues. Just two for now. */ +/* init the queues. */ for (i =0 ; i < adev->gfx.num_compute_rings; i++) {struct amdgpu_ring *ring = &adev->gfx.compute_ring[i];
@@ -4842,6 +4815,22 @@ static int gfx_v8_0_cp_compute_resume(struct amdgpu_device *adev) ring->pipe, ring->queue, 0); + eop_gpu_addr = adev->gfx.mec.hpd_eop_gpu_addr + (i *MEC_HPD_SIZE ); + eop_gpu_addr >>=8 ; + +/* write the EOP addr */ +WREG32 (mmCP_HQD_EOP_BASE_ADDR, eop_gpu_addr); +WREG32 (mmCP_HQD_EOP_BASE_ADDR_HI,upper_32_bits (eop_gpu_addr)); + +/* set the VMID assigned */ +WREG32 (mmCP_HQD_VMID,0 ); + +/* set the EOP size, register value is 2^(EOP_SIZE+1) dwords */ + tmp =RREG32 (mmCP_HQD_EOP_CONTROL); + tmp =REG_SET_FIELD (tmp,CP_HQD_EOP_CONTROL ,EOP_SIZE , + (order_base_2 (MEC_HPD_SIZE /4 ) -1 )); +WREG32 (mmCP_HQD_EOP_CONTROL, tmp); +/* disable wptr polling */ tmp =RREG32 (mmCP_PQ_WPTR_POLL_CNTL); tmp =REG_SET_FIELD (tmp,CP_PQ_WPTR_POLL_CNTL ,EN ,0 );
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1479932826-3362-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
PATCH 1/1 drm/amdgpu/gfx7: move eop programming per queue
It's per queue not per pipe.
--- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 48 ++++++++++++++--------------------- 1 file changed, 19 insertions(+), 29 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +19 -29
@@ -2815,7 +2815,7 @@ static int gfx_v7_0_mec_init(struct amdgpu_device *adev)if (adev->gfx.mec.hpd_eop_obj ==NULL ) { r =amdgpu_bo_create (adev, - adev->gfx.mec.num_mec *adev->gfx.mec.num_pipe *MEC_HPD_SIZE *2 , + adev->gfx.mec.num_queue *MEC_HPD_SIZE ,PAGE_SIZE , true,AMDGPU_GEM_DOMAIN_GTT ,0 ,NULL ,NULL , &adev->gfx.mec.hpd_eop_obj);
@@ -2845,7 +2845,7 @@ static int gfx_v7_0_mec_init(struct amdgpu_device *adev) }/* clear memory. Not sure if this is required or not */ -memset (hpd,0 , adev->gfx.mec.num_mec *adev->gfx.mec.num_pipe *MEC_HPD_SIZE *2 ); +memset (hpd,0 , adev->gfx.mec.num_queue *MEC_HPD_SIZE );amdgpu_bo_kunmap (adev->gfx.mec.hpd_eop_obj);amdgpu_bo_unreserve (adev->gfx.mec.hpd_eop_obj);
@@ -2947,33 +2947,7 @@ static int gfx_v7_0_cp_compute_resume(struct amdgpu_device *adev) tmp |= (1 <<23 );WREG32 (mmCP_CPF_DEBUG, tmp); -/* init the pipes */ -mutex_lock (&adev->srbm_mutex); -for (i =0 ; i < (adev->gfx.mec.num_pipe * adev->gfx.mec.num_mec); i++) { -int me = (i <4 ) ?1 :2 ; -int pipe = (i <4 ) ? i : (i -4 ); - - eop_gpu_addr = adev->gfx.mec.hpd_eop_gpu_addr + (i *MEC_HPD_SIZE *2 ); - -cik_srbm_select (adev, me, pipe,0 ,0 ); - -/* write the EOP addr */ -WREG32 (mmCP_HPD_EOP_BASE_ADDR, eop_gpu_addr >>8 ); -WREG32 (mmCP_HPD_EOP_BASE_ADDR_HI,upper_32_bits (eop_gpu_addr) >>8 ); - -/* set the VMID assigned */ -WREG32 (mmCP_HPD_EOP_VMID,0 ); - -/* set the EOP size, register value is 2^(EOP_SIZE+1) dwords */ - tmp =RREG32 (mmCP_HPD_EOP_CONTROL); - tmp &= ~CP_HPD_EOP_CONTROL__EOP_SIZE_MASK ; - tmp |=order_base_2 (MEC_HPD_SIZE /8 ); -WREG32 (mmCP_HPD_EOP_CONTROL, tmp); - } -cik_srbm_select (adev,0 ,0 ,0 ,0 ); -mutex_unlock (&adev->srbm_mutex); - -/* init the queues. Just two for now. */ +/* init the queues. */ for (i =0 ; i < adev->gfx.num_compute_rings; i++) { ring = &adev->gfx.compute_ring[i];
@@ -3023,6 +2997,22 @@ static int gfx_v7_0_cp_compute_resume(struct amdgpu_device *adev) ring->pipe, ring->queue, 0); + eop_gpu_addr = adev->gfx.mec.hpd_eop_gpu_addr + (i *MEC_HPD_SIZE ); + eop_gpu_addr >>=8 ; + +/* write the EOP addr */ +WREG32 (mmCP_HPD_EOP_BASE_ADDR,lower_32_bits (eop_gpu_addr)); +WREG32 (mmCP_HPD_EOP_BASE_ADDR_HI,upper_32_bits (eop_gpu_addr)); + +/* set the VMID assigned */ +WREG32 (mmCP_HPD_EOP_VMID,0 ); + +/* set the EOP size, register value is 2^(EOP_SIZE+1) dwords */ + tmp =RREG32 (mmCP_HPD_EOP_CONTROL); + tmp &= ~CP_HPD_EOP_CONTROL__EOP_SIZE_MASK ; + tmp |=order_base_2 (MEC_HPD_SIZE /8 ); +WREG32 (mmCP_HPD_EOP_CONTROL, tmp); +/* disable wptr polling */ tmp =RREG32 (mmCP_PQ_WPTR_POLL_CNTL); tmp &= ~CP_PQ_WPTR_POLL_CNTL__EN_MASK ;
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1479932826-3362-2-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
Re: [PATCH] drm/amdgpu/gfx7: move eop programming per queue
Quoted 1 line · Alex Deucher
It's per queue not per pipe.
Are you sure? I was under the impression that EOP queeus were per-pipe on Gfx7 and per-queue on Gfx8 onwards (to support context save/restore). It's also hinted at by the register name (HPD == Hardware Pipe Descriptor, HQD == Hardware Queue Descriptor).
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1479942059.4125077.797525393.1034ADD9-2RFepEojUI2N1INw9kWLP6GC3tUn3ZHUQQ4Iyu8u01E@public.gmane.org
Re: [PATCH] drm/amdgpu/gfx7: move eop programming per queue
Quoted 7 lines · Jay Cornwall
Quoted 1 line · Alex Deucher
It's per queue not per pipe.
Are you sure? I was under the impression that EOP queeus were per-pipe on Gfx7 and per-queue on Gfx8 onwards (to support context save/restore). It's also hinted at by the register name (HPD == Hardware Pipe Descriptor, HQD == Hardware Queue Descriptor).
No, I'm not sure. I have a patch set for amdgpu to leave the fb_location as programmed by the vbios rather than reprogramming which resulted in vram not being at 0 in the GPU's address space. I then got ring failures on the compute queues until I made the eops per queue. It could be something else, but this seemed to fix it.
Alex
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): CADnq5_OVmdTJQpGqOdxvDVhSvGeX5eAgOmJdtA-K2jEDMWaYJg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Re: [PATCH] drm/amdgpu/gfx7: move eop programming per queue
Quoted 9 lines · Alex Deucher
Quoted 7 lines · Jay Cornwall
Quoted 1 line · Alex Deucher
It's per queue not per pipe.
Are you sure? I was under the impression that EOP queeus were per-pipe on Gfx7 and per-queue on Gfx8 onwards (to support context save/restore). It's also hinted at by the register name (HPD == Hardware Pipe Descriptor, HQD == Hardware Queue Descriptor).
Quoted 5 lines
No, I'm not sure. I have a patch set for amdgpu to leave the
fb_locationas programmed by the vbios rather than reprogramming which resulted in vram not being at 0 in the GPU's address space. I then got ring failures on the compute queues until I made the eops per queue. It could be something else, but this seemed to fix it.
Actually I've only tried this on gfx8, I just assumed gfx7 was also affected, but it's possible this is not needed for gfx 7.
Alex
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): CADnq5_Pxi=xkyVS0jUDMw9Ax5vmfJcS59N-SrfvY_JnnUUpcmg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Re: [PATCH] drm/amdgpu/gfx7: move eop programming per queue
Quoted 10 lines · Alex Deucher
Quoted 9 lines · Alex Deucher
Quoted 7 lines · Jay Cornwall
Quoted 1 line · Alex Deucher
It's per queue not per pipe.
Are you sure? I was under the impression that EOP queeus were per-pipe on Gfx7 and per-queue on Gfx8 onwards (to support context save/restore). It's also hinted at by the register name (HPD == Hardware Pipe Descriptor, HQD == Hardware Queue Descriptor).
Quoted 8 lines
Quoted 5 lines
No, I'm not sure. I have a patch set for amdgpu to leave the
fb_locationas programmed by the vbios rather than reprogramming which resulted in vram not being at 0 in the GPU's address space. I then got ring failures on the compute queues until I made the eops per queue. It could be something else, but this seemed to fix it.Actually I've only tried this on gfx8, I just assumed gfx7 was also affected, but it's possible this is not needed for gfx 7.
consider this patch withdrawn.
Alex
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 1/1 drm/amdgpu/cik_sdma: clean up rb address calculation
In reply to a message not in the archiveMake it clearer what we are doing.
--- drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/cik_sdma.c +5 -2
@@ -384,6 +384,7 @@ static int cik_sdma_gfx_resume(struct amdgpu_device *adev)u32 rb_cntl, ib_cntl;u32 rb_bufsz;u32 wb_offset; +u64 gpu_addr;int i, j, r;for (i =0 ; i < adev->sdma.num_instances; i++) {
@@ -430,8 +431,10 @@ static int cik_sdma_gfx_resume(struct amdgpu_device *adev) rb_cntl |=SDMA0_GFX_RB_CNTL__RPTR_WRITEBACK_ENABLE_MASK ; -WREG32 (mmSDMA0_GFX_RB_BASE + sdma_offsets[i], ring->gpu_addr >>8 ); -WREG32 (mmSDMA0_GFX_RB_BASE_HI + sdma_offsets[i], ring->gpu_addr >>40 ); + gpu_addr = ring->gpu_addr; + gpu_addr >>=8 ; +WREG32 (mmSDMA0_GFX_RB_BASE + sdma_offsets[i],lower_32_bits (gpu_addr)); +WREG32 (mmSDMA0_GFX_RB_BASE_HI + sdma_offsets[i],upper_32_bits (gpu_addr)); ring->wptr =0 ;WREG32 (mmSDMA0_GFX_RB_WPTR + sdma_offsets[i], ring->wptr <<2 );
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 1/1 drm/amdgpu/sdma2.4: clean up rb address calculation
In reply to a message not in the archiveMake it clearer what we are doing.
--- drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +5 -2
@@ -418,6 +418,7 @@ static int sdma_v2_4_gfx_resume(struct amdgpu_device *adev)u32 rb_cntl, ib_cntl;u32 rb_bufsz;u32 wb_offset; +u64 gpu_addr;int i, j, r;for (i =0 ; i < adev->sdma.num_instances; i++) {
@@ -464,8 +465,10 @@ static int sdma_v2_4_gfx_resume(struct amdgpu_device *adev) rb_cntl =REG_SET_FIELD (rb_cntl,SDMA0_GFX_RB_CNTL ,RPTR_WRITEBACK_ENABLE ,1 ); -WREG32 (mmSDMA0_GFX_RB_BASE + sdma_offsets[i], ring->gpu_addr >>8 ); -WREG32 (mmSDMA0_GFX_RB_BASE_HI + sdma_offsets[i], ring->gpu_addr >>40 ); + gpu_addr = ring->gpu_addr; + gpu_addr >>=8 ; +WREG32 (mmSDMA0_GFX_RB_BASE + sdma_offsets[i],lower_32_bits (gpu_addr)); +WREG32 (mmSDMA0_GFX_RB_BASE_HI + sdma_offsets[i],upper_32_bits (gpu_addr)); ring->wptr =0 ;WREG32 (mmSDMA0_GFX_RB_WPTR + sdma_offsets[i], ring->wptr <<2 );
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 1/1 drm/amdgpu/sdma3.0: clean up rb address calculation
In reply to a message not in the archiveMake it clearer what we are doing.
--- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +5 -2
@@ -605,6 +605,7 @@ static int sdma_v3_0_gfx_resume(struct amdgpu_device *adev)u32 rb_bufsz;u32 wb_offset;u32 doorbell; +u64 gpu_addr;int i, j, r;for (i =0 ; i < adev->sdma.num_instances; i++) {
@@ -651,8 +652,10 @@ static int sdma_v3_0_gfx_resume(struct amdgpu_device *adev) rb_cntl =REG_SET_FIELD (rb_cntl,SDMA0_GFX_RB_CNTL ,RPTR_WRITEBACK_ENABLE ,1 ); -WREG32 (mmSDMA0_GFX_RB_BASE + sdma_offsets[i], ring->gpu_addr >>8 ); -WREG32 (mmSDMA0_GFX_RB_BASE_HI + sdma_offsets[i], ring->gpu_addr >>40 ); + gpu_addr = ring->gpu_addr; + gpu_addr >>=8 ; +WREG32 (mmSDMA0_GFX_RB_BASE + sdma_offsets[i],lower_32_bits (gpu_addr)); +WREG32 (mmSDMA0_GFX_RB_BASE_HI + sdma_offsets[i],upper_32_bits (gpu_addr)); ring->wptr =0 ;WREG32 (mmSDMA0_GFX_RB_WPTR + sdma_offsets[i], ring->wptr <<2 );
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx