[PATCH 1/2] drm/amdkfd: remove unneeded unmap single queue option

[PATCH 1/2] drm/amdkfd: remove unneeded unmap single queue option

[Jonathan Kim]

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>
---
 .../drm/amd/amdkfd/kfd_device_queue_manager.c |  3 +-
 .../gpu/drm/amd/amdkfd/kfd_packet_manager.c   |  8 ++--
 .../drm/amd/amdkfd/kfd_packet_manager_v9.c    | 40 +++----------------
 .../drm/amd/amdkfd/kfd_packet_manager_vi.c    | 26 ++----------
 drivers/gpu/drm/amd/amdkfd/kfd_priv.h         |  9 ++---
 5 files changed, 16 insertions(+), 70 deletions(-)

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 7f6f1a842b0b..c8201638fca5 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -1554,8 +1554,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 1439420925a0..9a44b34abaed 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c
@@ -368,10 +368,9 @@ int pm_send_query_status(struct packet_manager *pm, uint64_t fence_address,
 	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;
@@ -386,8 +385,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 7ea3f671b325..ed4f2d3c6dcc 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c
@@ -246,10 +246,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;
 
@@ -258,31 +256,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 =
@@ -292,12 +270,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 3c0658e32e93..131f685acf41 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_vi.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_vi.c
@@ -197,10 +197,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;
 
@@ -209,21 +207,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 =
@@ -233,12 +219,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 b6790a637f5c..5989b5df8402 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@ -1246,10 +1246,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);
@@ -1276,10 +1274,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);
 
-- 
2.25.1

[PATCH 2/2] drm/amdkfd: navi2x requires extended engines to map and unmap sdma queues

[Jonathan Kim]

SDMA 5.2.x queues are required to be mapped and unmapped from the extended
engines.

Signed-off-by: Jonathan Kim <jonathan.kim@amd.com>
---
 drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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 ed4f2d3c6dcc..645d42af8849 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c
@@ -183,6 +183,7 @@ static int pm_map_queues_v9(struct packet_manager *pm, uint32_t *buffer,
 {
 	struct pm4_mes_map_queues *packet;
 	bool use_static = is_static;
+	bool use_ext_eng = q->device->adev->ip_versions[SDMA0_HWIP][0] >= IP_VERSION(5, 2, 0);
 
 	packet = (struct pm4_mes_map_queues *)buffer;
 	memset(buffer, 0, sizeof(struct pm4_mes_map_queues));
@@ -214,7 +215,7 @@ static int pm_map_queues_v9(struct packet_manager *pm, uint32_t *buffer,
 	case KFD_QUEUE_TYPE_SDMA:
 	case KFD_QUEUE_TYPE_SDMA_XGMI:
 		use_static = false; /* no static queues under SDMA */
-		if (q->properties.sdma_engine_id < 2)
+		if (q->properties.sdma_engine_id < 2 && !use_ext_eng)
 			packet->bitfields2.engine_sel = q->properties.sdma_engine_id +
 				engine_sel__mes_map_queues__sdma0_vi;
 		else {
@@ -250,6 +251,7 @@ static int pm_unmap_queues_v9(struct packet_manager *pm, uint32_t *buffer,
 			uint32_t filter_param, bool reset)
 {
 	struct pm4_mes_unmap_queues *packet;
+	bool use_ext_eng = pm->dqm->dev->adev->ip_versions[SDMA0_HWIP][0] >= IP_VERSION(5, 2, 0);
 
 	packet = (struct pm4_mes_unmap_queues *)buffer;
 	memset(buffer, 0, sizeof(struct pm4_mes_unmap_queues));
@@ -257,8 +259,10 @@ 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));
 
-	packet->bitfields2.extended_engine_sel =
+	packet->bitfields2.extended_engine_sel = use_ext_eng ?
+		extended_engine_sel__mes_map_queues__sdma0_to_7_sel :
 		extended_engine_sel__mes_unmap_queues__legacy_engine_sel;
+
 	packet->bitfields2.engine_sel =
 		engine_sel__mes_unmap_queues__compute;
 
-- 
2.25.1

Re: [PATCH 2/2] drm/amdkfd: navi2x requires extended engines to map and unmap sdma queues

[Felix Kuehling]

Am 2022-02-11 um 12:15 schrieb Jonathan Kim:
> SDMA 5.2.x queues are required to be mapped and unmapped from the extended
> engines.
>
> Signed-off-by: Jonathan Kim <jonathan.kim@amd.com>
> ---
>   drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 8 ++++++--
>   1 file changed, 6 insertions(+), 2 deletions(-)
>
> 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 ed4f2d3c6dcc..645d42af8849 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c
> @@ -183,6 +183,7 @@ static int pm_map_queues_v9(struct packet_manager *pm, uint32_t *buffer,
>   {
>   	struct pm4_mes_map_queues *packet;
>   	bool use_static = is_static;
> +	bool use_ext_eng = q->device->adev->ip_versions[SDMA0_HWIP][0] >= IP_VERSION(5, 2, 0);

I'd put this in a macro or helper function to avoid duplicating the 
condition in case we ever need to update it. With that fixed, the patch is

Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>


>   
>   	packet = (struct pm4_mes_map_queues *)buffer;
>   	memset(buffer, 0, sizeof(struct pm4_mes_map_queues));
> @@ -214,7 +215,7 @@ static int pm_map_queues_v9(struct packet_manager *pm, uint32_t *buffer,
>   	case KFD_QUEUE_TYPE_SDMA:
>   	case KFD_QUEUE_TYPE_SDMA_XGMI:
>   		use_static = false; /* no static queues under SDMA */
> -		if (q->properties.sdma_engine_id < 2)
> +		if (q->properties.sdma_engine_id < 2 && !use_ext_eng)
>   			packet->bitfields2.engine_sel = q->properties.sdma_engine_id +
>   				engine_sel__mes_map_queues__sdma0_vi;
>   		else {
> @@ -250,6 +251,7 @@ static int pm_unmap_queues_v9(struct packet_manager *pm, uint32_t *buffer,
>   			uint32_t filter_param, bool reset)
>   {
>   	struct pm4_mes_unmap_queues *packet;
> +	bool use_ext_eng = pm->dqm->dev->adev->ip_versions[SDMA0_HWIP][0] >= IP_VERSION(5, 2, 0);
>   
>   	packet = (struct pm4_mes_unmap_queues *)buffer;
>   	memset(buffer, 0, sizeof(struct pm4_mes_unmap_queues));
> @@ -257,8 +259,10 @@ 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));
>   
> -	packet->bitfields2.extended_engine_sel =
> +	packet->bitfields2.extended_engine_sel = use_ext_eng ?
> +		extended_engine_sel__mes_map_queues__sdma0_to_7_sel :
>   		extended_engine_sel__mes_unmap_queues__legacy_engine_sel;
> +
>   	packet->bitfields2.engine_sel =
>   		engine_sel__mes_unmap_queues__compute;
>   

Re: [PATCH 1/2] drm/amdkfd: remove unneeded unmap single queue option

[Felix Kuehling]

Am 2022-02-11 um 12:15 schrieb Jonathan Kim:
> 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.

You should also remove KFD_UNMAP_QUEUES_FILTER_SINGLE_QUEUE from the enum.

Other than that, this patch is

Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>


>
> Signed-off-by: Jonathan Kim <jonathan.kim@amd.com>
> ---
>   .../drm/amd/amdkfd/kfd_device_queue_manager.c |  3 +-
>   .../gpu/drm/amd/amdkfd/kfd_packet_manager.c   |  8 ++--
>   .../drm/amd/amdkfd/kfd_packet_manager_v9.c    | 40 +++----------------
>   .../drm/amd/amdkfd/kfd_packet_manager_vi.c    | 26 ++----------
>   drivers/gpu/drm/amd/amdkfd/kfd_priv.h         |  9 ++---
>   5 files changed, 16 insertions(+), 70 deletions(-)
>
> 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 7f6f1a842b0b..c8201638fca5 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
> @@ -1554,8 +1554,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 1439420925a0..9a44b34abaed 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c
> @@ -368,10 +368,9 @@ int pm_send_query_status(struct packet_manager *pm, uint64_t fence_address,
>   	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;
> @@ -386,8 +385,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 7ea3f671b325..ed4f2d3c6dcc 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c
> @@ -246,10 +246,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;
>   
> @@ -258,31 +256,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 =
> @@ -292,12 +270,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 3c0658e32e93..131f685acf41 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_vi.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_vi.c
> @@ -197,10 +197,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;
>   
> @@ -209,21 +207,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 =
> @@ -233,12 +219,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 b6790a637f5c..5989b5df8402 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
> @@ -1246,10 +1246,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);
> @@ -1276,10 +1274,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);
>