KFD SDMA support for GFX7 and GFX8
Subsystems (3)
cover KFD SDMA support for GFX7 and GFX8
This patch series fixes SDMA user mode queue support for GFX7 and adds support for GFX8.
Felix Kuehling (5):
drm/amdgpu: Correct SDMA load/unload sequence on HWS disabled mode drm/amdkfd: Fix SDMA oversubsription handling
drm/amd: Update kgd_kfd interface for resuming SDMA queues drm/amdgpu: Add support for resuming SDMA queues w/o HWS drm/amdkfd: Use ASIC-specific SDMA MQD type
Philip Cox (2):
drm/amdgpu: Implement amdgpu SDMA functions for VI drm/amdkfd: Implement amdkfd SDMA functions for VI
shaoyunl (1):
drm/amdkfd: Correct SDMA ring buffer size
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 73 ++++++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 100 +++++++++++++++---- drivers/gpu/drm/amd/amdgpu/vid.h | 2 + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 21 ++-- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 108 ++++++++++++++++++++- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 - .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 18 ++++ drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 3 +- drivers/gpu/drm/amd/include/vi_structs.h | 2 + drivers/gpu/drm/radeon/radeon_kfd.c | 6 +- 10 files changed, 281 insertions(+), 54 deletions(-)
Signature · 6 lines
2.7.4 _______________________________________________ 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): 1509410611-4883-1-git-send-email-Felix.Kuehling-5C7GfCeVMHo@public.gmane.org
PATCH 1/8 drm/amdgpu: Correct SDMA load/unload sequence on HWS disabled mode
Fix the SDMA load and unload sequence as suggested by HW document.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 47 ++++++++++++++++------- 1 file changed, 34 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c +34 -13
@@ -379,29 +379,50 @@ static int kgd_hqd_sdma_load(struct kgd_dev *kgd, void *mqd) {struct amdgpu_device *adev =get_amdgpu_device (kgd);struct cik_sdma_rlc_registers *m; +unsigned long end_jiffies;uint32_t sdma_base_addr; +uint32_t data; m =get_sdma_mqd (mqd); sdma_base_addr =get_sdma_base_addr (m); -WREG32 (sdma_base_addr + mmSDMA0_RLC0_VIRTUAL_ADDR, - m->sdma_rlc_virtual_addr); +WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_CNTL, + m->sdma_rlc_rb_cntl & (~SDMA0_RLC0_RB_CNTL__RB_ENABLE_MASK )); -WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_BASE, - m->sdma_rlc_rb_base); + end_jiffies =msecs_to_jiffies (2000 ) + jiffies; +while (true) { + data =RREG32 (sdma_base_addr + mmSDMA0_RLC0_CONTEXT_STATUS); +if (data &SDMA0_RLC0_CONTEXT_STATUS__IDLE_MASK ) +break ; +if (time_after (jiffies, end_jiffies)) +return -ETIME ; +usleep_range (500 ,1000 ); + } +if (m->sdma_engine_id) { + data =RREG32 (mmSDMA1_GFX_CONTEXT_CNTL); + data =REG_SET_FIELD (data,SDMA1_GFX_CONTEXT_CNTL , +RESUME_CTX ,0 ); +WREG32 (mmSDMA1_GFX_CONTEXT_CNTL, data); + }else { + data =RREG32 (mmSDMA0_GFX_CONTEXT_CNTL); + data =REG_SET_FIELD (data,SDMA0_GFX_CONTEXT_CNTL , +RESUME_CTX ,0 ); +WREG32 (mmSDMA0_GFX_CONTEXT_CNTL, data); + } +WREG32 (sdma_base_addr + mmSDMA0_RLC0_DOORBELL, + m->sdma_rlc_doorbell); +WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_RPTR,0 ); +WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_WPTR,0 ); +WREG32 (sdma_base_addr + mmSDMA0_RLC0_VIRTUAL_ADDR, + m->sdma_rlc_virtual_addr); +WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_BASE, m->sdma_rlc_rb_base);WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_BASE_HI, m->sdma_rlc_rb_base_hi); -WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_RPTR_ADDR_LO, m->sdma_rlc_rb_rptr_addr_lo); -WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_RPTR_ADDR_HI, m->sdma_rlc_rb_rptr_addr_hi); - -WREG32 (sdma_base_addr + mmSDMA0_RLC0_DOORBELL, - m->sdma_rlc_doorbell); -WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_CNTL, m->sdma_rlc_rb_cntl);
@@ -574,9 +595,9 @@ static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd, }WREG32 (sdma_base_addr + mmSDMA0_RLC0_DOORBELL,0 ); -WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_RPTR,0 ); -WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_WPTR,0 ); -WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_BASE,0 ); +WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_CNTL, +RREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_CNTL) | +SDMA0_RLC0_RB_CNTL__RB_ENABLE_MASK );return 0 ; }
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/8 drm/amdkfd: Correct SDMA ring buffer size
In reply to a message not in the archiveFrom: shaoyunl <[email protected]>
ffs function return the position of the first bit set on 1 based. (bit zero returns 1).
--- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c +2 -2
@@ -202,8 +202,8 @@ static int update_mqd_sdma(struct mqd_manager *mm, void *mqd,struct cik_sdma_rlc_registers *m; m =get_sdma_mqd (mqd); - m->sdma_rlc_rb_cntl =ffs (q->queue_size /sizeof (unsigned int )) << -SDMA0_RLC0_RB_CNTL__RB_SIZE__SHIFT | + m->sdma_rlc_rb_cntl = (ffs (q->queue_size /sizeof (unsigned int )) -1 ) + <<SDMA0_RLC0_RB_CNTL__RB_SIZE__SHIFT | q->vmid <<SDMA0_RLC0_RB_CNTL__RB_VMID__SHIFT |1 <<SDMA0_RLC0_RB_CNTL__RPTR_WRITEBACK_ENABLE__SHIFT |6 <<SDMA0_RLC0_RB_CNTL__RPTR_WRITEBACK_TIMER__SHIFT ;
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/8 drm/amdkfd: Fix SDMA oversubsription handling
In reply to a message not in the archiveSDMA only supports a fixed number of queues. HWS cannot handle oversubscription.
--- drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +18 -0
@@ -191,6 +191,24 @@ int pqm_create_queue(struct process_queue_manager *pqm,switch (type) {case KFD_QUEUE_TYPE_SDMA : +if (dev->dqm->queue_count >= +CIK_SDMA_QUEUES_PER_ENGINE *CIK_SDMA_ENGINE_NUM ) { +pr_err ("Over-subscription is not allowed for SDMA.\n" ); + retval = -EPERM ; + goto err_create_queue; + } + + retval =create_cp_queue (pqm, dev, &q, properties, f, *qid); +if (retval !=0 ) + goto err_create_queue; + pqn->q = q; + pqn->kq =NULL ; + retval = dev->dqm->ops.create_queue (dev->dqm, q, &pdd->qpd, + &q->properties.vmid); +pr_debug ("DQM returned %d for create_queue\n" , retval); +print_queue (q); +break ; +case KFD_QUEUE_TYPE_COMPUTE :/* check if there is over subscription */ if ((sched_policy == KFD_SCHED_POLICY_HWS_NO_OVERSUBSCRIPTION) &&
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/8 drm/amd: Update kgd_kfd interface for resuming SDMA queues
In reply to a message not in the archiveAdd wptr and mm parameters to hqd_sdma_load and pass these parameters from device_queue_manager through the mqd_manager.
SDMA doesn't support polling while the engine believes it's idle. The driver must update the wptr. The new parameters will be used for looking up the updated value from the specified mm when SDMA queues are resumed after being disabled.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 6 ++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 6 ++++-- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 4 +++- drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 3 ++- drivers/gpu/drm/radeon/radeon_kfd.c | 6 ++++-- 5 files changed, 17 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c +4 -2
@@ -105,7 +105,8 @@ static int kgd_hqd_load(struct kgd_dev *kgd, void *mqd, uint32_t pipe_id, uint32_t queue_id, uint32_t __user *wptr, uint32_t wptr_shift, uint32_t wptr_mask, struct mm_struct *mm); -static int kgd_hqd_sdma_load (struct kgd_dev *kgd,void *mqd); +static int kgd_hqd_sdma_load (struct kgd_dev *kgd,void *mqd, +uint32_t __user *wptr,struct mm_struct *mm);static bool kgd_hqd_is_occupied (struct kgd_dev *kgd,uint64_t queue_address,uint32_t pipe_id,uint32_t queue_id);
@@ -375,7 +376,8 @@ static int kgd_hqd_load(struct kgd_dev *kgd, void *mqd, uint32_t pipe_id,return 0 ; } -static int kgd_hqd_sdma_load (struct kgd_dev *kgd,void *mqd) +static int kgd_hqd_sdma_load (struct kgd_dev *kgd,void *mqd, +uint32_t __user *wptr,struct mm_struct *mm) {struct amdgpu_device *adev =get_amdgpu_device (kgd);struct cik_sdma_rlc_registers *m;
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c +4 -2
@@ -64,7 +64,8 @@ static int kgd_hqd_load(struct kgd_dev *kgd, void *mqd, uint32_t pipe_id, uint32_t queue_id, uint32_t __user *wptr, uint32_t wptr_shift, uint32_t wptr_mask, struct mm_struct *mm); -static int kgd_hqd_sdma_load (struct kgd_dev *kgd,void *mqd); +static int kgd_hqd_sdma_load (struct kgd_dev *kgd,void *mqd, +uint32_t __user *wptr,struct mm_struct *mm);static bool kgd_hqd_is_occupied (struct kgd_dev *kgd,uint64_t queue_address,uint32_t pipe_id,uint32_t queue_id);static bool kgd_hqd_sdma_is_occupied (struct kgd_dev *kgd,void *mqd);
@@ -358,7 +359,8 @@ static int kgd_hqd_load(struct kgd_dev *kgd, void *mqd, uint32_t pipe_id,return 0 ; } -static int kgd_hqd_sdma_load (struct kgd_dev *kgd,void *mqd) +static int kgd_hqd_sdma_load (struct kgd_dev *kgd,void *mqd, +uint32_t __user *wptr,struct mm_struct *mm) {return 0 ; }
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c +3 -1
@@ -160,7 +160,9 @@ static int load_mqd_sdma(struct mqd_manager *mm, void *mqd, uint32_t pipe_id, uint32_t queue_id, struct queue_properties *p, struct mm_struct *mms) { - return mm->dev->kfd2kgd->hqd_sdma_load(mm->dev->kgd, mqd); + return mm->dev->kfd2kgd->hqd_sdma_load(mm->dev->kgd, mqd, + (uint32_t __user *)p->write_ptr, + mms); } static int update_mqd(struct mqd_manager *mm, void *mqd,
drivers/gpu/drm/amd/include/kgd_kfd_interface.h +2 -1
@@ -184,7 +184,8 @@ struct kfd2kgd_calls { uint32_t wptr_shift, uint32_t wptr_mask, struct mm_struct *mm); -int (*hqd_sdma_load)(struct kgd_dev *kgd,void *mqd); +int (*hqd_sdma_load)(struct kgd_dev *kgd,void *mqd, +uint32_t __user *wptr,struct mm_struct *mm);bool (*hqd_is_occupied)(struct kgd_dev *kgd,uint64_t queue_address,uint32_t pipe_id,uint32_t queue_id);
drivers/gpu/drm/radeon/radeon_kfd.c +4 -2
@@ -82,7 +82,8 @@ static int kgd_hqd_load(struct kgd_dev *kgd, void *mqd, uint32_t pipe_id, uint32_t queue_id, uint32_t __user *wptr, uint32_t wptr_shift, uint32_t wptr_mask, struct mm_struct *mm); -static int kgd_hqd_sdma_load (struct kgd_dev *kgd,void *mqd); +static int kgd_hqd_sdma_load (struct kgd_dev *kgd,void *mqd, +uint32_t __user *wptr,struct mm_struct *mm);static bool kgd_hqd_is_occupied (struct kgd_dev *kgd,uint64_t queue_address,uint32_t pipe_id,uint32_t queue_id);
@@ -593,7 +594,8 @@ static int kgd_hqd_load(struct kgd_dev *kgd, void *mqd, uint32_t pipe_id,return 0 ; } -static int kgd_hqd_sdma_load (struct kgd_dev *kgd,void *mqd) +static int kgd_hqd_sdma_load (struct kgd_dev *kgd,void *mqd, +uint32_t __user *wptr,struct mm_struct *mm) {struct cik_sdma_rlc_registers *m;uint32_t sdma_base_addr;
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/8 drm/amdgpu: Add support for resuming SDMA queues w/o HWS
In reply to a message not in the archiveSave wptr in hqd_sdma_destroy, restore it in hqd_sdma_load. Also read updated wptr from user mode when resuming an SDMA queue.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 30 +++++++++++++++-------- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 9 ++++--- 2 files changed, 25 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c +20 -10
@@ -412,10 +412,17 @@ static int kgd_hqd_sdma_load(struct kgd_dev *kgd, void *mqd,WREG32 (mmSDMA0_GFX_CONTEXT_CNTL, data); } -WREG32 (sdma_base_addr + mmSDMA0_RLC0_DOORBELL, - m->sdma_rlc_doorbell); -WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_RPTR,0 ); -WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_WPTR,0 ); + data =REG_SET_FIELD (m->sdma_rlc_doorbell,SDMA0_RLC0_DOORBELL , +ENABLE ,1 ); +WREG32 (sdma_base_addr + mmSDMA0_RLC0_DOORBELL, data); +WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_RPTR, m->sdma_rlc_rb_rptr); + +if (read_user_wptr (mm, wptr, data)) +WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_WPTR, data); +else +WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_WPTR, + m->sdma_rlc_rb_rptr); +WREG32 (sdma_base_addr + mmSDMA0_RLC0_VIRTUAL_ADDR, m->sdma_rlc_virtual_addr);WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_BASE, m->sdma_rlc_rb_base);
@@ -425,8 +432,10 @@ static int kgd_hqd_sdma_load(struct kgd_dev *kgd, void *mqd, m->sdma_rlc_rb_rptr_addr_lo);WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_RPTR_ADDR_HI, m->sdma_rlc_rb_rptr_addr_hi); -WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_CNTL, - m->sdma_rlc_rb_cntl); + + data =REG_SET_FIELD (m->sdma_rlc_rb_cntl,SDMA0_RLC0_RB_CNTL , +RB_ENABLE ,1 ); +WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_CNTL, data);return 0 ; }
@@ -577,7 +586,7 @@ static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd,struct cik_sdma_rlc_registers *m;uint32_t sdma_base_addr;uint32_t temp; -int timeout = utimeout; +unsigned long end_jiffies = (utimeout *HZ /1000 ) + jiffies; m =get_sdma_mqd (mqd); sdma_base_addr =get_sdma_base_addr (m);
@@ -590,10 +599,9 @@ static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd, temp =RREG32 (sdma_base_addr + mmSDMA0_RLC0_CONTEXT_STATUS);if (temp &SDMA0_STATUS_REG__RB_CMD_IDLE__SHIFT )break ; -if (timeout <=0 ) +if (time_after (jiffies, end_jiffies))return -ETIME ; -msleep (20 ); - timeout -=20 ; +usleep_range (500 ,1000 ); }WREG32 (sdma_base_addr + mmSDMA0_RLC0_DOORBELL,0 );
@@ -601,6 +609,8 @@ static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd,RREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_CNTL) | SDMA0_RLC0_RB_CNTL__RB_ENABLE_MASK); + m->sdma_rlc_rb_rptr =RREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_RPTR); +return 0 ; }
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c +5 -4
@@ -514,7 +514,7 @@ static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd,struct cik_sdma_rlc_registers *m;uint32_t sdma_base_addr;uint32_t temp; -int timeout = utimeout; +unsigned long end_jiffies = (utimeout *HZ /1000 ) + jiffies; m =get_sdma_mqd (mqd); sdma_base_addr =get_sdma_base_addr (m);
@@ -527,10 +527,9 @@ static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd, temp =RREG32 (sdma_base_addr + mmSDMA0_RLC0_CONTEXT_STATUS);if (temp &SDMA0_STATUS_REG__RB_CMD_IDLE__SHIFT )break ; -if (timeout <=0 ) +if (time_after (jiffies, end_jiffies))return -ETIME ; -msleep (20 ); - timeout -=20 ; +usleep_range (500 ,1000 ); }WREG32 (sdma_base_addr + mmSDMA0_RLC0_DOORBELL,0 );
@@ -538,6 +537,8 @@ static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd,WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_WPTR,0 );WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_BASE,0 ); + m->sdmax_rlcx_rb_rptr =RREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_RPTR); +return 0 ; }
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/8 drm/amdgpu: Implement amdgpu SDMA functions for VI
In reply to a message not in the archiveFrom: Philip Cox <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 85 ++++++++++++++++++++--- drivers/gpu/drm/amd/amdgpu/vid.h | 2 + drivers/gpu/drm/amd/include/vi_structs.h | 2 + 3 files changed, 78 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c +74 -11
@@ -45,7 +45,7 @@ enum hqd_dequeue_request_type { RESET_WAVES }; -struct cik_sdma_rlc_registers ; +struct vi_sdma_mqd ;/* * Register access functions
@@ -269,9 +269,15 @@ static int kgd_init_interrupts(struct kgd_dev *kgd, uint32_t pipe_id)return 0 ; } -static inline uint32_t get_sdma_base_addr (struct cik_sdma_rlc_registers *m) +static inline uint32_t get_sdma_base_addr (struct vi_sdma_mqd *m) { -return 0 ; +uint32_t retval; + + retval = m->sdma_engine_id *SDMA1_REGISTER_OFFSET + + m->sdma_queue_id *KFD_VI_SDMA_QUEUE_OFFSET ; +pr_debug ("kfd: sdma base address: 0x%x\n" , retval); + +return retval; }static inline struct vi_mqd *get_mqd (void *mqd)
@@ -279,9 +285,9 @@ static inline struct vi_mqd *get_mqd(void *mqd)return (struct vi_mqd *)mqd; } -static inline struct cik_sdma_rlc_registers *get_sdma_mqd (void *mqd) +static inline struct vi_sdma_mqd *get_sdma_mqd (void *mqd) { -return (struct cik_sdma_rlc_registers *)mqd; +return (struct vi_sdma_mqd *)mqd; } static int kgd_hqd_load(struct kgd_dev *kgd, void *mqd, uint32_t pipe_id,
@@ -362,6 +368,63 @@ static int kgd_hqd_load(struct kgd_dev *kgd, void *mqd, uint32_t pipe_id,static int kgd_hqd_sdma_load (struct kgd_dev *kgd,void *mqd,uint32_t __user *wptr,struct mm_struct *mm) { +struct amdgpu_device *adev =get_amdgpu_device (kgd); +struct vi_sdma_mqd *m; +unsigned long end_jiffies; +uint32_t sdma_base_addr; +uint32_t data; + + m =get_sdma_mqd (mqd); + sdma_base_addr =get_sdma_base_addr (m); +WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_CNTL, + m->sdmax_rlcx_rb_cntl & (~SDMA0_RLC0_RB_CNTL__RB_ENABLE_MASK )); + + end_jiffies =msecs_to_jiffies (2000 ) + jiffies; +while (true) { + data =RREG32 (sdma_base_addr + mmSDMA0_RLC0_CONTEXT_STATUS); +if (data &SDMA0_RLC0_CONTEXT_STATUS__IDLE_MASK ) +break ; +if (time_after (jiffies, end_jiffies)) +return -ETIME ; +usleep_range (500 ,1000 ); + } +if (m->sdma_engine_id) { + data =RREG32 (mmSDMA1_GFX_CONTEXT_CNTL); + data =REG_SET_FIELD (data,SDMA1_GFX_CONTEXT_CNTL , +RESUME_CTX ,0 ); +WREG32 (mmSDMA1_GFX_CONTEXT_CNTL, data); + }else { + data =RREG32 (mmSDMA0_GFX_CONTEXT_CNTL); + data =REG_SET_FIELD (data,SDMA0_GFX_CONTEXT_CNTL , +RESUME_CTX ,0 ); +WREG32 (mmSDMA0_GFX_CONTEXT_CNTL, data); + } + + data =REG_SET_FIELD (m->sdmax_rlcx_doorbell,SDMA0_RLC0_DOORBELL , +ENABLE ,1 ); +WREG32 (sdma_base_addr + mmSDMA0_RLC0_DOORBELL, data); +WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_RPTR, m->sdmax_rlcx_rb_rptr); + +if (read_user_wptr (mm, wptr, data)) +WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_WPTR, data); +else +WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_WPTR, + m->sdmax_rlcx_rb_rptr); + +WREG32 (sdma_base_addr + mmSDMA0_RLC0_VIRTUAL_ADDR, + m->sdmax_rlcx_virtual_addr); +WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_BASE, m->sdmax_rlcx_rb_base); +WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_BASE_HI, + m->sdmax_rlcx_rb_base_hi); +WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_RPTR_ADDR_LO, + m->sdmax_rlcx_rb_rptr_addr_lo); +WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_RPTR_ADDR_HI, + m->sdmax_rlcx_rb_rptr_addr_hi); + + data =REG_SET_FIELD (m->sdmax_rlcx_rb_cntl,SDMA0_RLC0_RB_CNTL , +RB_ENABLE ,1 ); +WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_CNTL, data); +return 0 ; }
@@ -390,7 +453,7 @@ static bool kgd_hqd_is_occupied(struct kgd_dev *kgd, uint64_t queue_address,static bool kgd_hqd_sdma_is_occupied (struct kgd_dev *kgd,void *mqd) {struct amdgpu_device *adev =get_amdgpu_device (kgd); -struct cik_sdma_rlc_registers *m; +struct vi_sdma_mqd *m;uint32_t sdma_base_addr;uint32_t sdma_rlc_rb_cntl;
@@ -511,7 +574,7 @@ static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd, unsigned int utimeout) {struct amdgpu_device *adev =get_amdgpu_device (kgd); -struct cik_sdma_rlc_registers *m; +struct vi_sdma_mqd *m;uint32_t sdma_base_addr;uint32_t temp;unsigned long end_jiffies = (utimeout *HZ /1000 ) + jiffies;
@@ -525,7 +588,7 @@ static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd,while (true) { temp =RREG32 (sdma_base_addr + mmSDMA0_RLC0_CONTEXT_STATUS); -if (temp &SDMA0_STATUS_REG__RB_CMD_IDLE__SHIFT ) +if (temp &SDMA0_RLC0_CONTEXT_STATUS__IDLE_MASK )break ;if (time_after (jiffies, end_jiffies))return -ETIME ;
@@ -533,9 +596,9 @@ static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd, }WREG32 (sdma_base_addr + mmSDMA0_RLC0_DOORBELL,0 ); -WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_RPTR,0 ); -WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_WPTR,0 ); -WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_BASE,0 ); +WREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_CNTL, +RREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_CNTL) | +SDMA0_RLC0_RB_CNTL__RB_ENABLE_MASK ); m->sdmax_rlcx_rb_rptr =RREG32 (sdma_base_addr + mmSDMA0_RLC0_RB_RPTR);
drivers/gpu/drm/amd/amdgpu/vid.h +2 -0
@@ -27,6 +27,8 @@#define SDMA1_REGISTER_OFFSET 0x200/* not a register */ #define SDMA_MAX_INSTANCE 2 +#define KFD_VI_SDMA_QUEUE_OFFSET 0x80/* not a register */ +/* crtc instance offsets */ #define CRTC0_REGISTER_OFFSET (0x1b9c - 0x1b9c)#define CRTC1_REGISTER_OFFSET (0x1d9c - 0x1b9c)
drivers/gpu/drm/amd/include/vi_structs.h +2 -0
@@ -153,6 +153,8 @@ struct vi_sdma_mqd {uint32_t reserved_125;uint32_t reserved_126;uint32_t reserved_127; +uint32_t sdma_engine_id; +uint32_t sdma_queue_id; };struct vi_mqd {
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 7/8 drm/amdkfd: Use ASIC-specific SDMA MQD type
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 13 +++++-------- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 5 +++++ drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 -- 3 files changed, 10 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c +5 -8
@@ -36,6 +36,11 @@ static inline struct cik_mqd *get_mqd(void *mqd)return (struct cik_mqd *)mqd; } +static inline struct cik_sdma_rlc_registers *get_sdma_mqd (void *mqd) +{ +return (struct cik_sdma_rlc_registers *)mqd; +} +static int init_mqd (struct mqd_manager *mm,void **mqd,struct kfd_mem_obj **mqd_mem_obj,uint64_t *gart_addr,struct queue_properties *q)
@@ -362,14 +367,6 @@ static int update_mqd_hiq(struct mqd_manager *mm, void *mqd,return 0 ; } -struct cik_sdma_rlc_registers *get_sdma_mqd (void *mqd) -{ -struct cik_sdma_rlc_registers *m; - - m = (struct cik_sdma_rlc_registers *)mqd; - -return m; -}struct mqd_manager *mqd_manager_init_cik (enum KFD_MQD_TYPE type,struct kfd_dev *dev)
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c +5 -0
@@ -38,6 +38,11 @@ static inline struct vi_mqd *get_mqd(void *mqd)return (struct vi_mqd *)mqd; } +static inline struct vi_sdma_mqd *get_sdma_mqd (void *mqd) +{ +return (struct vi_sdma_mqd *)mqd; +} +static int init_mqd (struct mqd_manager *mm,void **mqd,struct kfd_mem_obj **mqd_mem_obj,uint64_t *gart_addr,struct queue_properties *q)
drivers/gpu/drm/amd/amdkfd/kfd_priv.h +0 -2
@@ -643,8 +643,6 @@ int kgd2kfd_resume(struct kfd_dev *kfd);int kfd_init_apertures (struct kfd_process *process);/* Queue Context Management */ -struct cik_sdma_rlc_registers *get_sdma_mqd (void *mqd); -int init_queue (struct queue **q,const struct queue_properties *properties);void uninit_queue (struct queue *q);void print_queue_properties (struct queue_properties *q);
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 8/8 drm/amdkfd: Implement amdkfd SDMA functions for VI
In reply to a message not in the archiveFrom: Philip Cox <[email protected]>
--- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 103 +++++++++++++++++++++++- 1 file changed, 102 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c +102 -1
@@ -30,7 +30,7 @@#include "vi_structs.h" #include "gca/gfx_8_0_sh_mask.h" #include "gca/gfx_8_0_enum.h" - +#include "oss/oss_3_0_sh_mask.h" #define CP_MQD_CONTROL__PRIV_STATE__SHIFT 0x8static inline struct vi_mqd *get_mqd (void *mqd)
@@ -239,6 +239,101 @@ static int update_mqd_hiq(struct mqd_manager *mm, void *mqd,return retval; } +static int init_mqd_sdma (struct mqd_manager *mm,void **mqd, +struct kfd_mem_obj **mqd_mem_obj,uint64_t *gart_addr, +struct queue_properties *q) +{ +int retval; +struct vi_sdma_mqd *m; + + + retval =kfd_gtt_sa_allocate (mm->dev, +sizeof (struct vi_sdma_mqd ), + mqd_mem_obj); + +if (retval !=0 ) +return -ENOMEM ; + + m = (struct vi_sdma_mqd *) (*mqd_mem_obj)->cpu_ptr; + +memset (m,0 ,sizeof (struct vi_sdma_mqd )); + + *mqd = m; +if (gart_addr !=NULL ) + *gart_addr = (*mqd_mem_obj)->gpu_addr; + + retval = mm->update_mqd (mm, m, q); + +return retval; +} + +static void uninit_mqd_sdma (struct mqd_manager *mm,void *mqd, +struct kfd_mem_obj *mqd_mem_obj) +{ +kfd_gtt_sa_free (mm->dev, mqd_mem_obj); +} + +static int load_mqd_sdma (struct mqd_manager *mm,void *mqd, +uint32_t pipe_id,uint32_t queue_id, +struct queue_properties *p,struct mm_struct *mms) +{ +return mm->dev->kfd2kgd->hqd_sdma_load (mm->dev->kgd, mqd, + (uint32_t __user *)p->write_ptr, + mms); +} + +static int update_mqd_sdma (struct mqd_manager *mm,void *mqd, +struct queue_properties *q) +{ +struct vi_sdma_mqd *m; + + m =get_sdma_mqd (mqd); + m->sdmax_rlcx_rb_cntl = (ffs (q->queue_size /sizeof (unsigned int )) -1 ) + <<SDMA0_RLC0_RB_CNTL__RB_SIZE__SHIFT | + q->vmid <<SDMA0_RLC0_RB_CNTL__RB_VMID__SHIFT | +1 <<SDMA0_RLC0_RB_CNTL__RPTR_WRITEBACK_ENABLE__SHIFT | +6 <<SDMA0_RLC0_RB_CNTL__RPTR_WRITEBACK_TIMER__SHIFT ; + + m->sdmax_rlcx_rb_base =lower_32_bits (q->queue_address >>8 ); + m->sdmax_rlcx_rb_base_hi =upper_32_bits (q->queue_address >>8 ); + m->sdmax_rlcx_rb_rptr_addr_lo =lower_32_bits ((uint64_t )q->read_ptr); + m->sdmax_rlcx_rb_rptr_addr_hi =upper_32_bits ((uint64_t )q->read_ptr); + m->sdmax_rlcx_doorbell = + q->doorbell_off <<SDMA0_RLC0_DOORBELL__OFFSET__SHIFT ; + + m->sdmax_rlcx_virtual_addr = q->sdma_vm_addr; + + m->sdma_engine_id = q->sdma_engine_id; + m->sdma_queue_id = q->sdma_queue_id; + + q->is_active = (q->queue_size >0 && + q->queue_address !=0 && + q->queue_percent >0 ); + +return 0 ; +} + +/* +* * preempt type here is ignored because there is only one way +* * to preempt sdma queue +*/ +static int destroy_mqd_sdma (struct mqd_manager *mm,void *mqd, +enum kfd_preempt_type type, +unsigned int timeout,uint32_t pipe_id, +uint32_t queue_id) +{ +return mm->dev->kfd2kgd->hqd_sdma_destroy (mm->dev->kgd, mqd, timeout); +} + +static bool is_occupied_sdma (struct mqd_manager *mm,void *mqd, +uint64_t queue_address,uint32_t pipe_id, +uint32_t queue_id) +{ +return mm->dev->kfd2kgd->hqd_sdma_is_occupied (mm->dev->kgd, mqd); +} + + +struct mqd_manager *mqd_manager_init_vi (enum KFD_MQD_TYPE type,struct kfd_dev *dev) {
@@ -272,6 +367,12 @@ struct mqd_manager *mqd_manager_init_vi(enum KFD_MQD_TYPE type, mqd->is_occupied = is_occupied;break ;case KFD_MQD_TYPE_SDMA : + mqd->init_mqd = init_mqd_sdma; + mqd->uninit_mqd = uninit_mqd_sdma; + mqd->load_mqd = load_mqd_sdma; + mqd->update_mqd = update_mqd_sdma; + mqd->destroy_mqd = destroy_mqd_sdma; + mqd->is_occupied = is_occupied_sdma;break ;default :kfree (mqd);
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx