drm/amdgpu: Add kfd2kgd.set_compute_idle interface
Subsystems (3)
PATCH 1/2 drm/amdgpu: Add kfd2kgd.set_compute_idle interface
This allows automatic switching to the compute power profile depending on compute activity.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 ++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 3 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 3 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 3 ++- drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 5 +++++ 6 files changed, 20 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +8 -0
@@ -484,6 +484,14 @@ int amdgpu_amdkfd_submit_ib(struct kgd_dev *kgd, enum kgd_engine_type engine,return ret; } +void amdgpu_amdkfd_set_compute_idle (struct kgd_dev *kgd,bool idle) +{ +struct amdgpu_device *adev = (struct amdgpu_device *)kgd; + +amdgpu_dpm_switch_power_profile (adev, +PP_SMC_POWER_PROFILE_COMPUTE , !idle); +} +bool amdgpu_amdkfd_is_kfd_vmid (struct amdgpu_device *adev,u32 vmid) {if (adev->kfd) {
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +1 -0
@@ -119,6 +119,7 @@ int amdgpu_amdkfd_evict_userptr(struct kgd_mem *mem, struct mm_struct *mm);int amdgpu_amdkfd_submit_ib (struct kgd_dev *kgd,enum kgd_engine_type engine,uint32_t vmid,uint64_t gpu_addr,uint32_t *ib_cmd,uint32_t ib_len); +void amdgpu_amdkfd_set_compute_idle (struct kgd_dev *kgd,bool idle);struct kfd2kgd_calls *amdgpu_amdkfd_gfx_7_get_functions (void );struct kfd2kgd_calls *amdgpu_amdkfd_gfx_8_0_get_functions (void );
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c +2 -1
@@ -219,7 +219,8 @@ static const struct kfd2kgd_calls kfd2kgd = { .submit_ib = amdgpu_amdkfd_submit_ib, .get_vm_fault_info = amdgpu_amdkfd_gpuvm_get_vm_fault_info, .read_vmid_from_vmfault_reg = read_vmid_from_vmfault_reg, - .gpu_recover = amdgpu_amdkfd_gpu_reset + .gpu_recover = amdgpu_amdkfd_gpu_reset, + .set_compute_idle = amdgpu_amdkfd_set_compute_idle };struct kfd2kgd_calls *amdgpu_amdkfd_gfx_7_get_functions (void )
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c +2 -1
@@ -177,7 +177,8 @@ static const struct kfd2kgd_calls kfd2kgd = { .invalidate_tlbs_vmid = invalidate_tlbs_vmid, .submit_ib = amdgpu_amdkfd_submit_ib, .get_vm_fault_info = amdgpu_amdkfd_gpuvm_get_vm_fault_info, - .gpu_recover = amdgpu_amdkfd_gpu_reset + .gpu_recover = amdgpu_amdkfd_gpu_reset, + .set_compute_idle = amdgpu_amdkfd_set_compute_idle };struct kfd2kgd_calls *amdgpu_amdkfd_gfx_8_0_get_functions (void )
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +2 -1
@@ -213,7 +213,8 @@ static const struct kfd2kgd_calls kfd2kgd = { .invalidate_tlbs = invalidate_tlbs, .invalidate_tlbs_vmid = invalidate_tlbs_vmid, .submit_ib = amdgpu_amdkfd_submit_ib, - .gpu_recover = amdgpu_amdkfd_gpu_reset + .gpu_recover = amdgpu_amdkfd_gpu_reset, + .set_compute_idle = amdgpu_amdkfd_set_compute_idle };struct kfd2kgd_calls *amdgpu_amdkfd_gfx_9_0_get_functions (void )
drivers/gpu/drm/amd/include/kgd_kfd_interface.h +5 -0
@@ -282,6 +282,9 @@ struct tile_config {* * @gpu_recover: let kgd reset gpu after kfd detect CPC hang * +* @set_compute_idle: Indicates that compute is idle on a device. This +* can be used to change power profiles depending on compute activity. +* * This structure contains function pointers to services that the kgd driver * provides to amdkfd driver. *
@@ -403,6 +406,8 @@ struct kfd2kgd_calls {uint32_t (*read_vmid_from_vmfault_reg)(struct kgd_dev *kgd);void (*gpu_recover)(struct kgd_dev *kgd); + +void (*set_compute_idle)(struct kgd_dev *kgd,bool idle); };/**
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): 1531782637-7458-1-git-send-email-Felix.Kuehling-5C7GfCeVMHo@public.gmane.org
PATCH 2/2 drm/amdkfd: Call kfd2kgd.set_compute_idle
User mode queue submissions don't go through KFD. Therefore we don't know exactly when compute is idle or not idle. We use the existence of user mode queues on a device as an approximation.
register_process is called when the first queue of a process is created. Conversely unregister_process is called when the last queue is destroyed. The first process that is registered takes compute out of idle. The last process that is unregisters sets compute back to idle.
--- drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +5 -2
@@ -782,7 +782,8 @@ static int register_process(struct device_queue_manager *dqm, retval = dqm->asic_ops.update_qpd (dqm, qpd); - dqm->processes_count++; +if (dqm->processes_count++ ==0 ) + dqm->dev->kfd2kgd->set_compute_idle (dqm->dev->kgd, false);dqm_unlock (dqm);
@@ -805,7 +806,9 @@ static int unregister_process(struct device_queue_manager *dqm,if (qpd == cur->qpd) {list_del (&cur->list);kfree (cur); - dqm->processes_count--; +if (--dqm->processes_count ==0 ) + dqm->dev->kfd2kgd->set_compute_idle ( + dqm->dev->kgd, true); goto out; } }
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): 1531782637-7458-2-git-send-email-Felix.Kuehling-5C7GfCeVMHo@public.gmane.org
Alex Deucher
Reviewed-byRe: [PATCH 2/2] drm/amdkfd: Call kfd2kgd.set_compute_idle
Quoted 4 lines · Felix Kuehling
User mode queue submissions don't go through KFD. Therefore we don't know exactly when compute is idle or not idle. We use the existence of user mode queues on a device as an approximation.
Quoted 8 lines
register_processis called when the first queue of a process is created. Converselyunregister_processis called when the last queue is destroyed. The first process that is registered takes compute out of idle. The last process that is unregisters sets compute back to idle.Signed-off-by Felix Kuehling <[email protected]>Reviewed-by Eric Huang <[email protected]>
Series is:
Quoted 32 lines
--- drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +5
-3@@ -782,7 +782,8 @@ static int register_process(struct device_queue_manager *dqm, retval = dqm->asic_ops.update_qpd (dqm, qpd); - dqm->processes_count++; +if (dqm->processes_count++ ==0 ) + dqm->dev->kfd2kgd->set_compute_idle (dqm->dev->kgd, false);dqm_unlock (dqm);@@ -805,7 +806,9 @@ static int unregister_process(struct device_queue_manager *dqm,if (qpd == cur->qpd) {list_del (&cur->list);kfree (cur); - dqm->processes_count--; +if (--dqm->processes_count ==0 ) + dqm->dev->kfd2kgd->set_compute_idle ( + dqm->dev->kgd, true); goto out; } } --2.7.4
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
A message that is not in the archive (sent off-list or not yet received): CADnq5_OPpyw06o-3qqOGmVVgY54wgxwqEhMWrSNHcVk8=c5znw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Re: [PATCH 2/2] drm/amdkfd: Call kfd2kgd.set_compute_idle
Hi Felix,
Both patches applied to -next.
Oded
Quoted 50 lines · Alex Deucher
Quoted 4 lines · Felix Kuehling
User mode queue submissions don't go through KFD. Therefore we don't know exactly when compute is idle or not idle. We use the existence of user mode queues on a device as an approximation.
Quoted 8 lines
register_processis called when the first queue of a process is created. Converselyunregister_processis called when the last queue is destroyed. The first process that is registered takes compute out of idle. The last process that is unregisters sets compute back to idle.Signed-off-by Felix Kuehling <[email protected]>Reviewed-by Eric Huang <[email protected]>Series is:
Reviewed-by Alex Deucher <[email protected]>Quoted 32 lines
--- drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +5
-3@@ -782,7 +782,8 @@ static int register_process(struct device_queue_manager *dqm, retval = dqm->asic_ops.update_qpd (dqm, qpd); - dqm->processes_count++; +if (dqm->processes_count++ ==0 ) + dqm->dev->kfd2kgd->set_compute_idle (dqm->dev->kgd, false);dqm_unlock (dqm);@@ -805,7 +806,9 @@ static int unregister_process(struct device_queue_manager *dqm,if (qpd == cur->qpd) {list_del (&cur->list);kfree (cur); - dqm->processes_count--; +if (--dqm->processes_count ==0 ) + dqm->dev->kfd2kgd->set_compute_idle ( + dqm->dev->kgd, true); goto out; } } --2.7.4
Quoted 4 lines
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