drm/amdgpu: add userqueue suspend/resume functions

This patch adds userqueue suspend/resume functions at
core MES V11 IP level.

V2: use true/false for queue_active status (Christian)
    added Christian's R-B

V3: reset/set queue status in mqd.create and mqd.destroy

Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Christian Koenig <christian.koenig@amd.com>
Reviewed-by: Christian Koenig <christian.koenig@amd.com>
Signed-off-by: Shashank Sharma <shashank.sharma@amd.com>
Signed-off-by: Arvind Yadav <arvind.yadav@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v11_0_userqueue.c b/drivers/gpu/drm/amd/amdgpu/mes_v11_0_userqueue.c
index fe4efe5ba6acc1e117c49f90671812e412169842..ee0a757fcfa347815f39118a90cf8829fbbe522f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/mes_v11_0_userqueue.c
+++ b/drivers/gpu/drm/amd/amdgpu/mes_v11_0_userqueue.c
@@ -331,6 +331,7 @@ static int mes_v11_0_userq_mqd_create(struct amdgpu_userq_mgr *uq_mgr,
                goto free_ctx;
        }
 
+       queue->queue_active = true;
        return 0;
 
 free_ctx:
@@ -354,9 +355,41 @@ mes_v11_0_userq_mqd_destroy(struct amdgpu_userq_mgr *uq_mgr,
        amdgpu_userqueue_destroy_object(uq_mgr, &queue->fw_obj);
        kfree(queue->userq_prop);
        amdgpu_userqueue_destroy_object(uq_mgr, &queue->mqd);
+       queue->queue_active = false;
+}
+
+static int mes_v11_0_userq_suspend(struct amdgpu_userq_mgr *uq_mgr,
+                                  struct amdgpu_usermode_queue *queue)
+{
+       if (queue->queue_active) {
+               mes_v11_0_userq_unmap(uq_mgr, queue);
+               queue->queue_active = false;
+       }
+
+       return 0;
+}
+
+static int mes_v11_0_userq_resume(struct amdgpu_userq_mgr *uq_mgr,
+                                 struct amdgpu_usermode_queue *queue)
+{
+       int ret;
+
+       if (queue->queue_active)
+               return 0;
+
+       ret = mes_v11_0_userq_map(uq_mgr, queue, queue->userq_prop);
+       if (ret) {
+               DRM_ERROR("Failed to resume queue\n");
+               return ret;
+       }
+
+       queue->queue_active = true;
+       return 0;
 }
 
 const struct amdgpu_userq_funcs userq_mes_v11_0_funcs = {
        .mqd_create = mes_v11_0_userq_mqd_create,
        .mqd_destroy = mes_v11_0_userq_mqd_destroy,
+       .suspend = mes_v11_0_userq_suspend,
+       .resume = mes_v11_0_userq_resume,
 };

diff --git a/drivers/gpu/drm/amd/include/amdgpu_userqueue.h b/drivers/gpu/drm/amd/include/amdgpu_userqueue.h
index b942f3f5ea353c9269b13391a58e2df88bc6e086..ede0178e033209561f320b2cfdf293bc9d593b8d 100644 (file)
--- a/drivers/gpu/drm/amd/include/amdgpu_userqueue.h
+++ b/drivers/gpu/drm/amd/include/amdgpu_userqueue.h
@@ -37,6 +37,7 @@ struct amdgpu_userq_obj {
 
 struct amdgpu_usermode_queue {
        int                     queue_type;
+       uint8_t                 queue_active;
        uint64_t                doorbell_handle;
        uint64_t                doorbell_index;
        uint64_t                flags;
@@ -57,6 +58,10 @@ struct amdgpu_userq_funcs {
                          struct amdgpu_usermode_queue *queue);
        void (*mqd_destroy)(struct amdgpu_userq_mgr *uq_mgr,
                            struct amdgpu_usermode_queue *uq);
+       int (*suspend)(struct amdgpu_userq_mgr *uq_mgr,
+                      struct amdgpu_usermode_queue *queue);
+       int (*resume)(struct amdgpu_userq_mgr *uq_mgr,
+                     struct amdgpu_usermode_queue *queue);
 };
 
 /* Usermode queues for gfx */