drm/amdkfd: remove unneeded unmap single queue option

The KFD only unmaps all queues, all dynamics queues or all process queues
since RUN_LIST is mapped with all KFD queues.

There's no need to provide a single type unmap so remove this option.

Signed-off-by: Jonathan Kim <jonathan.kim@amd.com>
Reviewed-by: Felix Kuehling <felix.kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
index ac5f2e628f007bcdfde7b7b0022bb6b041afa0b2..1cd2ea536bd0f52ebea4465a14eba8cdca592df7 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -1555,8 +1555,7 @@ static int unmap_queues_cpsch(struct device_queue_manager *dqm,
        if (!dqm->active_runlist)
                return retval;
 
-       retval = pm_send_unmap_queue(&dqm->packet_mgr, KFD_QUEUE_TYPE_COMPUTE,
-                       filter, filter_param, reset, 0);
+       retval = pm_send_unmap_queue(&dqm->packet_mgr, filter, filter_param, reset);
        if (retval)
                return retval;
 

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c
index a8a1ac5aff485266153449004fffbd31f02723ea..ed02b6d8bf6355d0e7d40f93458a5647846e5462 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c
@@ -369,10 +369,9 @@ out:
        return retval;
 }
 
-int pm_send_unmap_queue(struct packet_manager *pm, enum kfd_queue_type type,
+int pm_send_unmap_queue(struct packet_manager *pm,
                        enum kfd_unmap_queues_filter filter,
-                       uint32_t filter_param, bool reset,
-                       unsigned int sdma_engine)
+                       uint32_t filter_param, bool reset)
 {
        uint32_t *buffer, size;
        int retval = 0;
@@ -387,8 +386,7 @@ int pm_send_unmap_queue(struct packet_manager *pm, enum kfd_queue_type type,
                goto out;
        }
 
-       retval = pm->pmf->unmap_queues(pm, buffer, type, filter, filter_param,
-                                      reset, sdma_engine);
+       retval = pm->pmf->unmap_queues(pm, buffer, filter, filter_param, reset);
        if (!retval)
                kq_submit_packet(pm->priv_queue);
        else

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c
index fee1c91bff15901c7493d506d65be67f4adab909..9e933afe90c24adb4876a6fe1cc13dc34fa12383 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c
@@ -247,10 +247,8 @@ static int pm_map_queues_v9(struct packet_manager *pm, uint32_t *buffer,
 }
 
 static int pm_unmap_queues_v9(struct packet_manager *pm, uint32_t *buffer,
-                       enum kfd_queue_type type,
                        enum kfd_unmap_queues_filter filter,
-                       uint32_t filter_param, bool reset,
-                       unsigned int sdma_engine)
+                       uint32_t filter_param, bool reset)
 {
        struct pm4_mes_unmap_queues *packet;
 
@@ -259,31 +257,11 @@ static int pm_unmap_queues_v9(struct packet_manager *pm, uint32_t *buffer,
 
        packet->header.u32All = pm_build_pm4_header(IT_UNMAP_QUEUES,
                                        sizeof(struct pm4_mes_unmap_queues));
-       switch (type) {
-       case KFD_QUEUE_TYPE_COMPUTE:
-       case KFD_QUEUE_TYPE_DIQ:
-               packet->bitfields2.extended_engine_sel =
-                       extended_engine_sel__mes_unmap_queues__legacy_engine_sel;
-               packet->bitfields2.engine_sel =
-                       engine_sel__mes_unmap_queues__compute;
-               break;
-       case KFD_QUEUE_TYPE_SDMA:
-       case KFD_QUEUE_TYPE_SDMA_XGMI:
-               if (sdma_engine < 2) {
-                       packet->bitfields2.extended_engine_sel =
-                               extended_engine_sel__mes_unmap_queues__legacy_engine_sel;
-                       packet->bitfields2.engine_sel =
-                               engine_sel__mes_unmap_queues__sdma0 + sdma_engine;
-               } else {
-                       packet->bitfields2.extended_engine_sel =
-                               extended_engine_sel__mes_unmap_queues__sdma0_to_7_sel;
-                       packet->bitfields2.engine_sel = sdma_engine;
-               }
-               break;
-       default:
-               WARN(1, "queue type %d", type);
-               return -EINVAL;
-       }
+
+       packet->bitfields2.extended_engine_sel =
+               extended_engine_sel__mes_unmap_queues__legacy_engine_sel;
+       packet->bitfields2.engine_sel =
+               engine_sel__mes_unmap_queues__compute;
 
        if (reset)
                packet->bitfields2.action =
@@ -293,12 +271,6 @@ static int pm_unmap_queues_v9(struct packet_manager *pm, uint32_t *buffer,
                        action__mes_unmap_queues__preempt_queues;
 
        switch (filter) {
-       case KFD_UNMAP_QUEUES_FILTER_SINGLE_QUEUE:
-               packet->bitfields2.queue_sel =
-                       queue_sel__mes_unmap_queues__perform_request_on_specified_queues;
-               packet->bitfields2.num_queues = 1;
-               packet->bitfields3b.doorbell_offset0 = filter_param;
-               break;
        case KFD_UNMAP_QUEUES_FILTER_BY_PASID:
                packet->bitfields2.queue_sel =
                        queue_sel__mes_unmap_queues__perform_request_on_pasid_queues;

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_vi.c b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_vi.c
index 324624a8537c308d66a88c9d623e22aebb6405c6..4f951eaa6ee854c2bdca252d99ae9849b6e9b368 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_vi.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_vi.c
@@ -198,10 +198,8 @@ static int pm_map_queues_vi(struct packet_manager *pm, uint32_t *buffer,
 }
 
 static int pm_unmap_queues_vi(struct packet_manager *pm, uint32_t *buffer,
-                       enum kfd_queue_type type,
                        enum kfd_unmap_queues_filter filter,
-                       uint32_t filter_param, bool reset,
-                       unsigned int sdma_engine)
+                       uint32_t filter_param, bool reset)
 {
        struct pm4_mes_unmap_queues *packet;
 
@@ -210,21 +208,9 @@ static int pm_unmap_queues_vi(struct packet_manager *pm, uint32_t *buffer,
 
        packet->header.u32All = pm_build_pm4_header(IT_UNMAP_QUEUES,
                                        sizeof(struct pm4_mes_unmap_queues));
-       switch (type) {
-       case KFD_QUEUE_TYPE_COMPUTE:
-       case KFD_QUEUE_TYPE_DIQ:
-               packet->bitfields2.engine_sel =
+
+       packet->bitfields2.engine_sel =
                        engine_sel__mes_unmap_queues__compute;
-               break;
-       case KFD_QUEUE_TYPE_SDMA:
-       case KFD_QUEUE_TYPE_SDMA_XGMI:
-               packet->bitfields2.engine_sel =
-                       engine_sel__mes_unmap_queues__sdma0 + sdma_engine;
-               break;
-       default:
-               WARN(1, "queue type %d", type);
-               return -EINVAL;
-       }
 
        if (reset)
                packet->bitfields2.action =
@@ -234,12 +220,6 @@ static int pm_unmap_queues_vi(struct packet_manager *pm, uint32_t *buffer,
                        action__mes_unmap_queues__preempt_queues;
 
        switch (filter) {
-       case KFD_UNMAP_QUEUES_FILTER_SINGLE_QUEUE:
-               packet->bitfields2.queue_sel =
-                       queue_sel__mes_unmap_queues__perform_request_on_specified_queues;
-               packet->bitfields2.num_queues = 1;
-               packet->bitfields3b.doorbell_offset0 = filter_param;
-               break;
        case KFD_UNMAP_QUEUES_FILTER_BY_PASID:
                packet->bitfields2.queue_sel =
                        queue_sel__mes_unmap_queues__perform_request_on_pasid_queues;

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
index 16ae6eb3ac7d23f36637a268e61e7bf61825268b..3e44c045d4aae94ea4099403dd626c89ff687b24 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@ -360,20 +360,20 @@ struct device *kfd_chardev(void);
 /**
  * enum kfd_unmap_queues_filter - Enum for queue filters.
  *
- * @KFD_UNMAP_QUEUES_FILTER_SINGLE_QUEUE: Preempts single queue.
- *
  * @KFD_UNMAP_QUEUES_FILTER_ALL_QUEUES: Preempts all queues in the
  *                                             running queues list.
  *
+ * @KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES: Preempts all non-static queues
+ *                                             in the run list.
+ *
  * @KFD_UNMAP_QUEUES_FILTER_BY_PASID: Preempts queues that belongs to
  *                                             specific process.
  *
  */
 enum kfd_unmap_queues_filter {
-       KFD_UNMAP_QUEUES_FILTER_SINGLE_QUEUE,
-       KFD_UNMAP_QUEUES_FILTER_ALL_QUEUES,
-       KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES,
-       KFD_UNMAP_QUEUES_FILTER_BY_PASID
+       KFD_UNMAP_QUEUES_FILTER_ALL_QUEUES = 1,
+       KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES = 2,
+       KFD_UNMAP_QUEUES_FILTER_BY_PASID = 3
 };
 
 /**
@@ -1247,10 +1247,8 @@ struct packet_manager_funcs {
        int (*map_queues)(struct packet_manager *pm, uint32_t *buffer,
                        struct queue *q, bool is_static);
        int (*unmap_queues)(struct packet_manager *pm, uint32_t *buffer,
-                       enum kfd_queue_type type,
                        enum kfd_unmap_queues_filter mode,
-                       uint32_t filter_param, bool reset,
-                       unsigned int sdma_engine);
+                       uint32_t filter_param, bool reset);
        int (*query_status)(struct packet_manager *pm, uint32_t *buffer,
                        uint64_t fence_address, uint64_t fence_value);
        int (*release_mem)(uint64_t gpu_addr, uint32_t *buffer);
@@ -1277,10 +1275,9 @@ int pm_send_runlist(struct packet_manager *pm, struct list_head *dqm_queues);
 int pm_send_query_status(struct packet_manager *pm, uint64_t fence_address,
                                uint64_t fence_value);
 
-int pm_send_unmap_queue(struct packet_manager *pm, enum kfd_queue_type type,
+int pm_send_unmap_queue(struct packet_manager *pm,
                        enum kfd_unmap_queues_filter mode,
-                       uint32_t filter_param, bool reset,
-                       unsigned int sdma_engine);
+                       uint32_t filter_param, bool reset);
 
 void pm_release_ib(struct packet_manager *pm);