drm/amdgpu/gfx8: fix spelling typo in mqd allocation
Subsystems (3)
PATCH 1/3 drm/amdgpu/gfx8: fix spelling typo in mqd allocation
--- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 12 ++++++------ drivers/gpu/drm/amd/include/vi_structs.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +6 -6
@@ -4578,9 +4578,9 @@ static int gfx_v8_0_mqd_init(struct amdgpu_ring *ring) mqd->compute_misc_reserved =0x00000003 ;if (!(adev->flags &AMD_IS_APU )) { mqd->dynamic_cu_mask_addr_lo =lower_32_bits (ring->mqd_gpu_addr - + offsetof(struct vi_mqd_allocation , dyamic_cu_mask)); + + offsetof(struct vi_mqd_allocation , dynamic_cu_mask)); mqd->dynamic_cu_mask_addr_hi =upper_32_bits (ring->mqd_gpu_addr - + offsetof(struct vi_mqd_allocation , dyamic_cu_mask)); + + offsetof(struct vi_mqd_allocation , dynamic_cu_mask)); } eop_base_addr = ring->eop_gpu_addr >>8 ; mqd->cp_hqd_eop_base_addr_lo = eop_base_addr;
@@ -4767,8 +4767,8 @@ static int gfx_v8_0_kiq_init_queue(struct amdgpu_ring *ring)mutex_unlock (&adev->srbm_mutex); }else {memset ((void *)mqd,0 ,sizeof (struct vi_mqd_allocation )); - ((struct vi_mqd_allocation *)mqd)->dyamic_cu_mask =0xFFFFFFFF ; - ((struct vi_mqd_allocation *)mqd)->dyamic_rb_mask =0xFFFFFFFF ; + ((struct vi_mqd_allocation *)mqd)->dynamic_cu_mask =0xFFFFFFFF ; + ((struct vi_mqd_allocation *)mqd)->dynamic_rb_mask =0xFFFFFFFF ;mutex_lock (&adev->srbm_mutex);vi_srbm_select (adev, ring->me, ring->pipe, ring->queue,0 );gfx_v8_0_mqd_init (ring);
@@ -4791,8 +4791,8 @@ static int gfx_v8_0_kcq_init_queue(struct amdgpu_ring *ring)if (!adev->gfx.in_reset && !adev->gfx.in_suspend) {memset ((void *)mqd,0 ,sizeof (struct vi_mqd_allocation )); - ((struct vi_mqd_allocation *)mqd)->dyamic_cu_mask =0xFFFFFFFF ; - ((struct vi_mqd_allocation *)mqd)->dyamic_rb_mask =0xFFFFFFFF ; + ((struct vi_mqd_allocation *)mqd)->dynamic_cu_mask =0xFFFFFFFF ; + ((struct vi_mqd_allocation *)mqd)->dynamic_rb_mask =0xFFFFFFFF ;mutex_lock (&adev->srbm_mutex);vi_srbm_select (adev, ring->me, ring->pipe, ring->queue,0 );gfx_v8_0_mqd_init (ring);
drivers/gpu/drm/amd/include/vi_structs.h +2 -2
@@ -419,8 +419,8 @@ struct vi_mqd_allocation {struct vi_mqd mqd;uint32_t wptr_poll_mem;uint32_t rptr_report_mem; -uint32_t dyamic_cu_mask; -uint32_t dyamic_rb_mask; +uint32_t dynamic_cu_mask; +uint32_t dynamic_rb_mask; };struct cz_mqd {
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): 1503115071-19075-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
PATCH 2/3 drm/amdgpu/gfx9: update mqd to include dynamic CU mask
Necessary for proper operation with KIQ.
--- drivers/gpu/drm/amd/include/v9_structs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/include/v9_structs.h +2 -2
@@ -284,8 +284,8 @@ struct v9_mqd {uint32_t gds_save_mask_hi;uint32_t ctx_save_base_addr_lo;uint32_t ctx_save_base_addr_hi; -uint32_t reserved_126; -uint32_t reserved_127; +uint32_t dynamic_cu_mask_addr_lo; +uint32_t dynamic_cu_mask_addr_hi;uint32_t cp_mqd_base_addr_lo;uint32_t cp_mqd_base_addr_hi;uint32_t cp_hqd_active;
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/3 drm/amdgpu/gfx9: adjust mqd allocation size
In reply to a message not in the archiveto allocate additional space for the dynamic cu masks.
--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 25 ++++++++++++++++++------- drivers/gpu/drm/amd/include/v9_structs.h | 8 ++++++++ 2 files changed, 26 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +18 -7
@@ -1346,7 +1346,7 @@ static int gfx_v9_0_sw_init(void *handle)return r;/* create MQD for all compute queues as wel as KIQ for SRIOV case */ - r =amdgpu_gfx_compute_mqd_sw_init (adev,sizeof (struct v9_mqd )); + r =amdgpu_gfx_compute_mqd_sw_init (adev,sizeof (struct v9_mqd_allocation ));if (r)return r;
@@ -2463,6 +2463,13 @@ static int gfx_v9_0_mqd_init(struct amdgpu_ring *ring) mqd->compute_static_thread_mgmt_se3 =0xffffffff ; mqd->compute_misc_reserved =0x00000003 ; + mqd->dynamic_cu_mask_addr_lo = +lower_32_bits (ring->mqd_gpu_addr + + offsetof(struct v9_mqd_allocation , dynamic_cu_mask)); + mqd->dynamic_cu_mask_addr_hi = +upper_32_bits (ring->mqd_gpu_addr + + offsetof(struct v9_mqd_allocation , dynamic_cu_mask)); + eop_base_addr = ring->eop_gpu_addr >>8 ; mqd->cp_hqd_eop_base_addr_lo = eop_base_addr; mqd->cp_hqd_eop_base_addr_hi =upper_32_bits (eop_base_addr);
@@ -2695,7 +2702,7 @@ static int gfx_v9_0_kiq_init_queue(struct amdgpu_ring *ring)if (adev->gfx.in_reset) {/* for GPU_RESET case */ /* reset MQD to a clean status */ if (adev->gfx.mec.mqd_backup[mqd_idx]) -memcpy (mqd, adev->gfx.mec.mqd_backup[mqd_idx],sizeof (*mqd)); +memcpy (mqd, adev->gfx.mec.mqd_backup[mqd_idx],sizeof (struct v9_mqd_allocation ));/* reset ring buffer */ ring->wptr =0 ;
@@ -2707,7 +2714,9 @@ static int gfx_v9_0_kiq_init_queue(struct amdgpu_ring *ring)soc15_grbm_select (adev,0 ,0 ,0 ,0 );mutex_unlock (&adev->srbm_mutex); }else { -memset ((void *)mqd,0 ,sizeof (*mqd)); +memset ((void *)mqd,0 ,sizeof (struct v9_mqd_allocation )); + ((struct v9_mqd_allocation *)mqd)->dynamic_cu_mask =0xFFFFFFFF ; + ((struct v9_mqd_allocation *)mqd)->dynamic_rb_mask =0xFFFFFFFF ;mutex_lock (&adev->srbm_mutex);soc15_grbm_select (adev, ring->me, ring->pipe, ring->queue,0 );gfx_v9_0_mqd_init (ring);
@@ -2716,7 +2725,7 @@ static int gfx_v9_0_kiq_init_queue(struct amdgpu_ring *ring)mutex_unlock (&adev->srbm_mutex);if (adev->gfx.mec.mqd_backup[mqd_idx]) -memcpy (adev->gfx.mec.mqd_backup[mqd_idx], mqd,sizeof (*mqd)); +memcpy (adev->gfx.mec.mqd_backup[mqd_idx], mqd,sizeof (struct v9_mqd_allocation )); }return 0 ;
@@ -2729,7 +2738,9 @@ static int gfx_v9_0_kcq_init_queue(struct amdgpu_ring *ring)int mqd_idx = ring - &adev->gfx.compute_ring[0 ];if (!adev->gfx.in_reset && !adev->gfx.in_suspend) { -memset ((void *)mqd,0 ,sizeof (*mqd)); +memset ((void *)mqd,0 ,sizeof (struct v9_mqd_allocation )); + ((struct v9_mqd_allocation *)mqd)->dynamic_cu_mask =0xFFFFFFFF ; + ((struct v9_mqd_allocation *)mqd)->dynamic_rb_mask =0xFFFFFFFF ;mutex_lock (&adev->srbm_mutex);soc15_grbm_select (adev, ring->me, ring->pipe, ring->queue,0 );gfx_v9_0_mqd_init (ring);
@@ -2737,11 +2748,11 @@ static int gfx_v9_0_kcq_init_queue(struct amdgpu_ring *ring)mutex_unlock (&adev->srbm_mutex);if (adev->gfx.mec.mqd_backup[mqd_idx]) -memcpy (adev->gfx.mec.mqd_backup[mqd_idx], mqd,sizeof (*mqd)); +memcpy (adev->gfx.mec.mqd_backup[mqd_idx], mqd,sizeof (struct v9_mqd_allocation )); }else if (adev->gfx.in_reset) {/* for GPU_RESET case */ /* reset MQD to a clean status */ if (adev->gfx.mec.mqd_backup[mqd_idx]) -memcpy (mqd, adev->gfx.mec.mqd_backup[mqd_idx],sizeof (*mqd)); +memcpy (mqd, adev->gfx.mec.mqd_backup[mqd_idx],sizeof (struct v9_mqd_allocation ));/* reset ring buffer */ ring->wptr =0 ;
drivers/gpu/drm/amd/include/v9_structs.h +8 -0
@@ -672,6 +672,14 @@ struct v9_mqd {uint32_t reserved_511; }; +struct v9_mqd_allocation { +struct v9_mqd mqd; +uint32_t wptr_poll_mem; +uint32_t rptr_report_mem; +uint32_t dynamic_cu_mask; +uint32_t dynamic_rb_mask; +}; +/* from vega10 all CSA format is shifted to chain ib compatible mode */ struct v9_ce_ib_state {/* section of non chained ib part */
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): 1503115071-19075-3-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 3/3] drm/amdgpu/gfx9: adjust mqd allocation size
I'm not sure how dynamic CU masking works. But on a GPU with 64 CUs, a 32-bit CU mask (in struct v9_mqd_allocation) seems too small.
Regards,
Felix
________________________________________
From: amd-gfx <[email protected]> on behalf of Alex Deucher <[email protected]>
Sent: Friday, August 18, 2017 11:57:51 PM
To: [email protected]
Cc: Deucher, Alexander
Subject: [PATCH 3/3] drm/amdgpu/gfx9: adjust mqd allocation size
to allocate additional space for the dynamic cu masks.
--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 25 ++++++++++++++++++------- drivers/gpu/drm/amd/include/v9_structs.h | 8 ++++++++ 2 files changed, 26 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +18 -7
@@ -1346,7 +1346,7 @@ static int gfx_v9_0_sw_init(void *handle)return r;/* create MQD for all compute queues as wel as KIQ for SRIOV case */ - r =amdgpu_gfx_compute_mqd_sw_init (adev,sizeof (struct v9_mqd )); + r =amdgpu_gfx_compute_mqd_sw_init (adev,sizeof (struct v9_mqd_allocation ));if (r)return r;
@@ -2463,6 +2463,13 @@ static int gfx_v9_0_mqd_init(struct amdgpu_ring *ring) mqd->compute_static_thread_mgmt_se3 =0xffffffff ; mqd->compute_misc_reserved =0x00000003 ; + mqd->dynamic_cu_mask_addr_lo = +lower_32_bits (ring->mqd_gpu_addr + + offsetof(struct v9_mqd_allocation , dynamic_cu_mask)); + mqd->dynamic_cu_mask_addr_hi = +upper_32_bits (ring->mqd_gpu_addr + + offsetof(struct v9_mqd_allocation , dynamic_cu_mask)); + eop_base_addr = ring->eop_gpu_addr >>8 ; mqd->cp_hqd_eop_base_addr_lo = eop_base_addr; mqd->cp_hqd_eop_base_addr_hi =upper_32_bits (eop_base_addr);
@@ -2695,7 +2702,7 @@ static int gfx_v9_0_kiq_init_queue(struct amdgpu_ring *ring)if (adev->gfx.in_reset) {/* for GPU_RESET case */ /* reset MQD to a clean status */ if (adev->gfx.mec.mqd_backup[mqd_idx]) -memcpy (mqd, adev->gfx.mec.mqd_backup[mqd_idx],sizeof (*mqd)); +memcpy (mqd, adev->gfx.mec.mqd_backup[mqd_idx],sizeof (struct v9_mqd_allocation ));/* reset ring buffer */ ring->wptr =0 ;
@@ -2707,7 +2714,9 @@ static int gfx_v9_0_kiq_init_queue(struct amdgpu_ring *ring)soc15_grbm_select (adev,0 ,0 ,0 ,0 );mutex_unlock (&adev->srbm_mutex); }else { -memset ((void *)mqd,0 ,sizeof (*mqd)); +memset ((void *)mqd,0 ,sizeof (struct v9_mqd_allocation )); + ((struct v9_mqd_allocation *)mqd)->dynamic_cu_mask =0xFFFFFFFF ; + ((struct v9_mqd_allocation *)mqd)->dynamic_rb_mask =0xFFFFFFFF ;mutex_lock (&adev->srbm_mutex);soc15_grbm_select (adev, ring->me, ring->pipe, ring->queue,0 );gfx_v9_0_mqd_init (ring);
@@ -2716,7 +2725,7 @@ static int gfx_v9_0_kiq_init_queue(struct amdgpu_ring *ring)mutex_unlock (&adev->srbm_mutex);if (adev->gfx.mec.mqd_backup[mqd_idx]) -memcpy (adev->gfx.mec.mqd_backup[mqd_idx], mqd,sizeof (*mqd)); +memcpy (adev->gfx.mec.mqd_backup[mqd_idx], mqd,sizeof (struct v9_mqd_allocation )); }return 0 ;
@@ -2729,7 +2738,9 @@ static int gfx_v9_0_kcq_init_queue(struct amdgpu_ring *ring)int mqd_idx = ring - &adev->gfx.compute_ring[0 ];if (!adev->gfx.in_reset && !adev->gfx.in_suspend) { -memset ((void *)mqd,0 ,sizeof (*mqd)); +memset ((void *)mqd,0 ,sizeof (struct v9_mqd_allocation )); + ((struct v9_mqd_allocation *)mqd)->dynamic_cu_mask =0xFFFFFFFF ; + ((struct v9_mqd_allocation *)mqd)->dynamic_rb_mask =0xFFFFFFFF ;mutex_lock (&adev->srbm_mutex);soc15_grbm_select (adev, ring->me, ring->pipe, ring->queue,0 );gfx_v9_0_mqd_init (ring);
@@ -2737,11 +2748,11 @@ static int gfx_v9_0_kcq_init_queue(struct amdgpu_ring *ring)mutex_unlock (&adev->srbm_mutex);if (adev->gfx.mec.mqd_backup[mqd_idx]) -memcpy (adev->gfx.mec.mqd_backup[mqd_idx], mqd,sizeof (*mqd)); +memcpy (adev->gfx.mec.mqd_backup[mqd_idx], mqd,sizeof (struct v9_mqd_allocation )); }else if (adev->gfx.in_reset) {/* for GPU_RESET case */ /* reset MQD to a clean status */ if (adev->gfx.mec.mqd_backup[mqd_idx]) -memcpy (mqd, adev->gfx.mec.mqd_backup[mqd_idx],sizeof (*mqd)); +memcpy (mqd, adev->gfx.mec.mqd_backup[mqd_idx],sizeof (struct v9_mqd_allocation ));/* reset ring buffer */ ring->wptr =0 ;
drivers/gpu/drm/amd/include/v9_structs.h +8 -0
@@ -672,6 +672,14 @@ struct v9_mqd {uint32_t reserved_511; }; +struct v9_mqd_allocation { +struct v9_mqd mqd; +uint32_t wptr_poll_mem; +uint32_t rptr_report_mem; +uint32_t dynamic_cu_mask; +uint32_t dynamic_rb_mask; +}; +/* from vega10 all CSA format is shifted to chain ib compatible mode */ struct v9_ce_ib_state {/* section of non chained ib part */
--
2.5.5
_______________________________________________
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
A message that is not in the archive (sent off-list or not yet received): DM5PR1201MB02359627AD0922D0F705C39092810-grEf7a3NxMBd8L2jMOIKKmrFom/aUZj6nBOFsp37pqbUKgpGm//BTAC/[email protected]
Re: [PATCH 3/3] drm/amdgpu/gfx9: adjust mqd allocation size
Quoted 1 line · Felix
I'm not sure how dynamic CU masking works. But on a GPU with 64 CUs, a 32-bit CU mask (in struct
v9_mqd_allocation) seems too small.
Good question even on gfx8. I've got a request out to the hw team.
Alex
Quoted 121 lines
Regards,
Felix
________________________________________
From: amd-gfx <[email protected]> on behalf of Alex Deucher <[email protected]>
Sent: Friday, August 18, 2017 11:57:51 PM
To: [email protected]
Cc: Deucher, Alexander
Subject: [PATCH 3/3] drm/amdgpu/gfx9: adjust mqd allocation sizeto allocate additional space for the dynamic cu masks.
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 25 ++++++++++++++++++------- drivers/gpu/drm/amd/include/v9_structs.h | 8 ++++++++ 2 files changed, 26 insertions(+), 7 deletions(-)drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +18
-7@@ -1346,7 +1346,7 @@ static int gfx_v9_0_sw_init(void *handle)return r;/* create MQD for all compute queues as wel as KIQ for SRIOV case */ - r =amdgpu_gfx_compute_mqd_sw_init (adev,sizeof (struct v9_mqd )); + r =amdgpu_gfx_compute_mqd_sw_init (adev,sizeof (struct v9_mqd_allocation ));if (r)return r;@@ -2463,6 +2463,13 @@ static int gfx_v9_0_mqd_init(struct amdgpu_ring *ring) mqd->compute_static_thread_mgmt_se3 =0xffffffff ; mqd->compute_misc_reserved =0x00000003 ; + mqd->dynamic_cu_mask_addr_lo = +lower_32_bits (ring->mqd_gpu_addr + + offsetof(struct v9_mqd_allocation , dynamic_cu_mask)); + mqd->dynamic_cu_mask_addr_hi = +upper_32_bits (ring->mqd_gpu_addr + + offsetof(struct v9_mqd_allocation , dynamic_cu_mask)); + eop_base_addr = ring->eop_gpu_addr >>8 ; mqd->cp_hqd_eop_base_addr_lo = eop_base_addr; mqd->cp_hqd_eop_base_addr_hi =upper_32_bits (eop_base_addr);@@ -2695,7 +2702,7 @@ static int gfx_v9_0_kiq_init_queue(struct amdgpu_ring *ring)if (adev->gfx.in_reset) {/* for GPU_RESET case */ /* reset MQD to a clean status */ if (adev->gfx.mec.mqd_backup[mqd_idx]) -memcpy (mqd, adev->gfx.mec.mqd_backup[mqd_idx],sizeof (*mqd)); +memcpy (mqd, adev->gfx.mec.mqd_backup[mqd_idx],sizeof (struct v9_mqd_allocation ));/* reset ring buffer */ ring->wptr =0 ;@@ -2707,7 +2714,9 @@ static int gfx_v9_0_kiq_init_queue(struct amdgpu_ring *ring)soc15_grbm_select (adev,0 ,0 ,0 ,0 );mutex_unlock (&adev->srbm_mutex); }else { -memset ((void *)mqd,0 ,sizeof (*mqd)); +memset ((void *)mqd,0 ,sizeof (struct v9_mqd_allocation )); + ((struct v9_mqd_allocation *)mqd)->dynamic_cu_mask =0xFFFFFFFF ; + ((struct v9_mqd_allocation *)mqd)->dynamic_rb_mask =0xFFFFFFFF ;mutex_lock (&adev->srbm_mutex);soc15_grbm_select (adev, ring->me, ring->pipe, ring->queue,0 );gfx_v9_0_mqd_init (ring);@@ -2716,7 +2725,7 @@ static int gfx_v9_0_kiq_init_queue(struct amdgpu_ring *ring)mutex_unlock (&adev->srbm_mutex);if (adev->gfx.mec.mqd_backup[mqd_idx]) -memcpy (adev->gfx.mec.mqd_backup[mqd_idx], mqd,sizeof (*mqd)); +memcpy (adev->gfx.mec.mqd_backup[mqd_idx], mqd,sizeof (struct v9_mqd_allocation )); }return 0 ;@@ -2729,7 +2738,9 @@ static int gfx_v9_0_kcq_init_queue(struct amdgpu_ring *ring)int mqd_idx = ring - &adev->gfx.compute_ring[0 ];if (!adev->gfx.in_reset && !adev->gfx.in_suspend) { -memset ((void *)mqd,0 ,sizeof (*mqd)); +memset ((void *)mqd,0 ,sizeof (struct v9_mqd_allocation )); + ((struct v9_mqd_allocation *)mqd)->dynamic_cu_mask =0xFFFFFFFF ; + ((struct v9_mqd_allocation *)mqd)->dynamic_rb_mask =0xFFFFFFFF ;mutex_lock (&adev->srbm_mutex);soc15_grbm_select (adev, ring->me, ring->pipe, ring->queue,0 );gfx_v9_0_mqd_init (ring);@@ -2737,11 +2748,11 @@ static int gfx_v9_0_kcq_init_queue(struct amdgpu_ring *ring)mutex_unlock (&adev->srbm_mutex);if (adev->gfx.mec.mqd_backup[mqd_idx]) -memcpy (adev->gfx.mec.mqd_backup[mqd_idx], mqd,sizeof (*mqd)); +memcpy (adev->gfx.mec.mqd_backup[mqd_idx], mqd,sizeof (struct v9_mqd_allocation )); }else if (adev->gfx.in_reset) {/* for GPU_RESET case */ /* reset MQD to a clean status */ if (adev->gfx.mec.mqd_backup[mqd_idx]) -memcpy (mqd, adev->gfx.mec.mqd_backup[mqd_idx],sizeof (*mqd)); +memcpy (mqd, adev->gfx.mec.mqd_backup[mqd_idx],sizeof (struct v9_mqd_allocation ));/* reset ring buffer */ ring->wptr =0 ;drivers/gpu/drm/amd/include/v9_structs.h +8
-1@@ -672,6 +672,14 @@ struct v9_mqd {uint32_t reserved_511; }; +struct v9_mqd_allocation { +struct v9_mqd mqd; +uint32_t wptr_poll_mem; +uint32_t rptr_report_mem; +uint32_t dynamic_cu_mask; +uint32_t dynamic_rb_mask; +}; +/* from vega10 all CSA format is shifted to chain ib compatible mode */ struct v9_ce_ib_state {/* section of non chained ib part */ --2.5.5
Quoted 4 lines
_______________________________________________
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
Christian König
Acked-byAm 19.08.2017 um 05:57 schrieb Alex Deucher:
Quoted 1 line
Signed-off-by Alex Deucher <[email protected]>
Quoted 48 lines
--- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 12 ++++++------ drivers/gpu/drm/amd/include/vi_structs.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-)drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +6
-6@@ -4578,9 +4578,9 @@ static int gfx_v8_0_mqd_init(struct amdgpu_ring *ring) mqd->compute_misc_reserved =0x00000003 ;if (!(adev->flags &AMD_IS_APU )) { mqd->dynamic_cu_mask_addr_lo =lower_32_bits (ring->mqd_gpu_addr - + offsetof(struct vi_mqd_allocation , dyamic_cu_mask)); + + offsetof(struct vi_mqd_allocation , dynamic_cu_mask)); mqd->dynamic_cu_mask_addr_hi =upper_32_bits (ring->mqd_gpu_addr - + offsetof(struct vi_mqd_allocation , dyamic_cu_mask)); + + offsetof(struct vi_mqd_allocation , dynamic_cu_mask)); } eop_base_addr = ring->eop_gpu_addr >>8 ; mqd->cp_hqd_eop_base_addr_lo = eop_base_addr;@@ -4767,8 +4767,8 @@ static int gfx_v8_0_kiq_init_queue(struct amdgpu_ring *ring)mutex_unlock (&adev->srbm_mutex); }else {memset ((void *)mqd,0 ,sizeof (struct vi_mqd_allocation )); - ((struct vi_mqd_allocation *)mqd)->dyamic_cu_mask =0xFFFFFFFF ; - ((struct vi_mqd_allocation *)mqd)->dyamic_rb_mask =0xFFFFFFFF ; + ((struct vi_mqd_allocation *)mqd)->dynamic_cu_mask =0xFFFFFFFF ; + ((struct vi_mqd_allocation *)mqd)->dynamic_rb_mask =0xFFFFFFFF ;mutex_lock (&adev->srbm_mutex);vi_srbm_select (adev, ring->me, ring->pipe, ring->queue,0 );gfx_v8_0_mqd_init (ring);@@ -4791,8 +4791,8 @@ static int gfx_v8_0_kcq_init_queue(struct amdgpu_ring *ring)if (!adev->gfx.in_reset && !adev->gfx.in_suspend) {memset ((void *)mqd,0 ,sizeof (struct vi_mqd_allocation )); - ((struct vi_mqd_allocation *)mqd)->dyamic_cu_mask =0xFFFFFFFF ; - ((struct vi_mqd_allocation *)mqd)->dyamic_rb_mask =0xFFFFFFFF ; + ((struct vi_mqd_allocation *)mqd)->dynamic_cu_mask =0xFFFFFFFF ; + ((struct vi_mqd_allocation *)mqd)->dynamic_rb_mask =0xFFFFFFFF ;mutex_lock (&adev->srbm_mutex);vi_srbm_select (adev, ring->me, ring->pipe, ring->queue,0 );gfx_v8_0_mqd_init (ring);drivers/gpu/drm/amd/include/vi_structs.h +0
-0
drivers/gpu/drm/amd/include/vi_structs.h struct vi_mqd_allocation { · line 426
Quoted 10 lines
drivers/gpu/drm/amd/include/vi_structs.h +2
-2@@ -419,8 +419,8 @@ struct vi_mqd_allocation {struct vi_mqd mqd;uint32_t wptr_poll_mem;uint32_t rptr_report_mem; -uint32_t dyamic_cu_mask; -uint32_t dyamic_rb_mask; +uint32_t dynamic_cu_mask; +uint32_t dynamic_rb_mask; };struct cz_mqd {
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx