mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/amdgpu/userq: handle runtime pm

Browse source 
Take a reference when we create a queue and drop it
when we destroy the queue.  We need to keep the device
active while user queues are active.

v2: squash in fix from Sunil
v3: squash in fix from Prike

Reviewed-by: Prike Liang <Prike.Liang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Alex Deucher 2025-02-20 09:44:39 -05:00
parent 29adc5c2dd
commit 2a060b3ae9
1 changed files with 16 additions and 1 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/gpu/drm/amd/amdgpu/mes_userqueue.c
View file

@ -26,6 +26,7 @@
#include "mes_userqueue.h" #include "mes_userqueue.h"
#include "amdgpu_userq_fence.h" #include "amdgpu_userq_fence.h"
#include "v11_structs.h" #include "v11_structs.h"
#include <linux/pm_runtime.h>
#define AMDGPU_USERQ_PROC_CTX_SZ PAGE_SIZE #define AMDGPU_USERQ_PROC_CTX_SZ PAGE_SIZE
#define AMDGPU_USERQ_GANG_CTX_SZ PAGE_SIZE #define AMDGPU_USERQ_GANG_CTX_SZ PAGE_SIZE
@ -287,6 +288,12 @@ static int mes_userq_mqd_create(struct amdgpu_userq_mgr *uq_mgr,
queue->userq_prop = userq_props; queue->userq_prop = userq_props;
r = pm_runtime_get_sync(adev_to_drm(adev)->dev);
if (r < 0) {
dev_err(adev->dev, "pm_runtime_get_sync() failed for userqueue mqd create\n");
goto deference_pm;
}
r = mqd_hw_default->init_mqd(adev, (void *)queue->mqd.cpu_ptr, userq_props); r = mqd_hw_default->init_mqd(adev, (void *)queue->mqd.cpu_ptr, userq_props);
if (r) { if (r) {
DRM_ERROR("Failed to initialize MQD for userqueue\n"); DRM_ERROR("Failed to initialize MQD for userqueue\n");
@ -321,6 +328,9 @@ static int mes_userq_mqd_create(struct amdgpu_userq_mgr *uq_mgr,
free_mqd: free_mqd:
amdgpu_userqueue_destroy_object(uq_mgr, &queue->mqd); amdgpu_userqueue_destroy_object(uq_mgr, &queue->mqd);
pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);
deference_pm:
pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);
free_props: free_props:
kfree(userq_props); kfree(userq_props);
@ -330,14 +340,19 @@ static int mes_userq_mqd_create(struct amdgpu_userq_mgr *uq_mgr,
static void static void
mes_userq_mqd_destroy(struct amdgpu_userq_mgr *uq_mgr, mes_userq_mqd_destroy(struct amdgpu_userq_mgr *uq_mgr,
struct amdgpu_usermode_queue *queue) struct amdgpu_usermode_queue *queue)
{ {
struct amdgpu_device *adev = uq_mgr->adev;
if (queue->queue_active) if (queue->queue_active)
mes_userq_unmap(uq_mgr, queue); mes_userq_unmap(uq_mgr, queue);
amdgpu_userqueue_destroy_object(uq_mgr, &queue->fw_obj); amdgpu_userqueue_destroy_object(uq_mgr, &queue->fw_obj);
kfree(queue->userq_prop); kfree(queue->userq_prop);
amdgpu_userqueue_destroy_object(uq_mgr, &queue->mqd); amdgpu_userqueue_destroy_object(uq_mgr, &queue->mqd);
pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);
pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);
} }
static int mes_userq_suspend(struct amdgpu_userq_mgr *uq_mgr, static int mes_userq_suspend(struct amdgpu_userq_mgr *uq_mgr,