May 14, 2024 · Apr 7, 2024 · Apr 24, 2024 · May 7, 2024 · May 14, 2024 · May 10, 2024
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
 for (i = 0; i < kfd->num_nodes; i++) {
 node = kfd->nodes[i];
 kfd_smi_event_update_gpu_reset(node, false, reset_context);
 node->dqm->ops.pre_reset(node->dqm);
 }

 kgd2kfd_suspend(kfd, false, true);
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
 #include "cik_regs.h"
 #include "kfd_kernel_queue.h"
 #include "amdgpu_amdkfd.h"
 #include "amdgpu_reset.h"
 #include "mes_v11_api_def.h"
 #include "kfd_debug.h"

 /*
 * Issue a GPU reset if HWS is unresponsive
 */
 dqm->is_hws_hang = true;

 /* It's possible we're detecting a HWS hang in the
 * middle of a GPU reset. No need to schedule another
 * reset in this case.
 */
 if (!dqm->is_resetting)
 schedule_work(&dqm->hw_exception_work);
 schedule_work(&dqm->hw_exception_work);
 }

 static int convert_to_mes_queue_type(int queue_type)
 int r, queue_type;
 uint64_t wptr_addr_off;

 if (dqm->is_hws_hang)
 if (!down_read_trylock(&adev->reset_domain->sem))
 return -EIO;

 memset(&queue_input, 0x0, sizeof(struct mes_add_queue_input));
 amdgpu_mes_lock(&adev->mes);
 r = adev->mes.funcs->add_hw_queue(&adev->mes, &queue_input);
 amdgpu_mes_unlock(&adev->mes);
 up_read(&adev->reset_domain->sem);
 if (r) {
 dev_err(adev->dev, "failed to add hardware queue to MES, doorbell=0x%x\n",
 q->properties.doorbell_off);
 int r;
 struct mes_remove_queue_input queue_input;

 if (dqm->is_hws_hang)
 if (!down_read_trylock(&adev->reset_domain->sem))
 return -EIO;

 memset(&queue_input, 0x0, sizeof(struct mes_remove_queue_input));
 amdgpu_mes_lock(&adev->mes);
 r = adev->mes.funcs->remove_hw_queue(&adev->mes, &queue_input);
 amdgpu_mes_unlock(&adev->mes);
 up_read(&adev->reset_domain->sem);

 if (r) {
 dev_err(adev->dev, "failed to remove hardware queue from MES, doorbell=0x%x\n",
 }

 if (dqm->dev->adev->asic_type == CHIP_HAWAII)
 pm_uninit(&dqm->packet_mgr, false);
 pm_uninit(&dqm->packet_mgr);
 dqm->sched_running = false;
 dqm_unlock(dqm);

 return 0;
 }

 static void pre_reset(struct device_queue_manager *dqm)
 {
 dqm_lock(dqm);
 dqm->is_resetting = true;
 dqm_unlock(dqm);
 }

 static int allocate_sdma_queue(struct device_queue_manager *dqm,
 struct queue *q, const uint32_t *restore_sdma_id)
 {
 init_interrupts(dqm);

 /* clear hang status when driver try to start the hw scheduler */
 dqm->is_hws_hang = false;
 dqm->is_resetting = false;
 dqm->sched_running = true;

 if (!dqm->dev->kfd->shared_resources.enable_mes)
 fail_allocate_vidmem:
 fail_set_sched_resources:
 if (!dqm->dev->kfd->shared_resources.enable_mes)
 pm_uninit(&dqm->packet_mgr, false);
 pm_uninit(&dqm->packet_mgr);
 fail_packet_manager_init:
 dqm_unlock(dqm);
 return retval;
 }

 static int stop_cpsch(struct device_queue_manager *dqm)
 {
 bool hanging;

 dqm_lock(dqm);
 if (!dqm->sched_running) {
 dqm_unlock(dqm);
 return 0;
 }

 if (!dqm->is_hws_hang) {
 if (!dqm->dev->kfd->shared_resources.enable_mes)
 unmap_queues_cpsch(dqm, KFD_UNMAP_QUEUES_FILTER_ALL_QUEUES, 0, USE_DEFAULT_GRACE_PERIOD, false);
 else
 remove_all_queues_mes(dqm);
 }
 if (!dqm->dev->kfd->shared_resources.enable_mes)
 unmap_queues_cpsch(dqm, KFD_UNMAP_QUEUES_FILTER_ALL_QUEUES, 0, USE_DEFAULT_GRACE_PERIOD, false);
 else
 remove_all_queues_mes(dqm);

 hanging = dqm->is_hws_hang || dqm->is_resetting;
 dqm->sched_running = false;

 if (!dqm->dev->kfd->shared_resources.enable_mes)
 pm_release_ib(&dqm->packet_mgr);

 kfd_gtt_sa_free(dqm->dev, dqm->fence_mem);
 if (!dqm->dev->kfd->shared_resources.enable_mes)
 pm_uninit(&dqm->packet_mgr, hanging);
 pm_uninit(&dqm->packet_mgr);
 dqm_unlock(dqm);

 return 0;
 {
 struct device *dev = dqm->dev->adev->dev;
 struct mqd_manager *mqd_mgr;
 int retval = 0;
 int retval;

 if (!dqm->sched_running)
 return 0;
 if (dqm->is_hws_hang || dqm->is_resetting)
 return -EIO;
 if (!dqm->active_runlist)
 return retval;
 return 0;
 if (!down_read_trylock(&dqm->dev->adev->reset_domain->sem))
 return -EIO;

 if (grace_period != USE_DEFAULT_GRACE_PERIOD) {
 retval = pm_update_grace_period(&dqm->packet_mgr, grace_period);
 if (retval)
 return retval;
 goto out;
 }
 retval = pm_send_unmap_queue(&dqm->packet_mgr, filter, filter_param, reset);
 if (retval)
 return retval;
 goto out;

 *dqm->fence_addr = KFD_FENCE_INIT;
 pm_send_query_status(&dqm->packet_mgr, dqm->fence_gpu_addr,
 KFD_FENCE_COMPLETED);
 if (retval) {
 dev_err(dev, "The cp might be in an unrecoverable state due to an unsuccessful queues preemption\n");
 kfd_hws_hang(dqm);
 return retval;
 goto out;
 }

 /* In the current MEC firmware implementation, if compute queue
 while (halt_if_hws_hang)
 schedule();
 kfd_hws_hang(dqm);
 return -ETIME;
 retval = -ETIME;
 goto out;
 }

 /* We need to reset the grace period value for this device */
 pm_release_ib(&dqm->packet_mgr);
 dqm->active_runlist = false;

 out:
 up_read(&dqm->dev->adev->reset_domain->sem);
 return retval;
 }

 {
 int retval;

 if (dqm->is_hws_hang)
 if (!down_read_trylock(&dqm->dev->adev->reset_domain->sem))
 return -EIO;
 retval = unmap_queues_cpsch(dqm, filter, filter_param, grace_period, false);
 if (retval)
 returnretval;

 returnmap_queues_cpsch(dqm);
 if (!retval)
 retval = map_queues_cpsch(dqm);
 up_read(&dqm->dev->adev->reset_domain->sem);
 returnretval;
 }

 static int wait_on_destroy_queue(struct device_queue_manager *dqm,
 if (!dqm->dev->kfd->shared_resources.enable_mes)
 retval = execute_queues_cpsch(dqm, filter, 0, USE_DEFAULT_GRACE_PERIOD);

 if ((!dqm->is_hws_hang) && (retval || qpd->reset_wavefronts)) {
 if ((retval || qpd->reset_wavefronts) &&
    down_read_trylock(&dqm->dev->adev->reset_domain->sem)) {
 pr_warn("Resetting wave fronts (cpsch) on dev %p\n", dqm->dev);
 dbgdev_wave_reset_wavefronts(dqm->dev, qpd->pqm->process);
 qpd->reset_wavefronts = false;
 up_read(&dqm->dev->adev->reset_domain->sem);
 }

 /* Lastly, free mqd resources.
 dqm->ops.initialize = initialize_cpsch;
 dqm->ops.start = start_cpsch;
 dqm->ops.stop = stop_cpsch;
 dqm->ops.pre_reset = pre_reset;
 dqm->ops.destroy_queue = destroy_queue_cpsch;
 dqm->ops.update_queue = update_queue;
 dqm->ops.register_process = register_process;
 /* initialize dqm for no cp scheduling */
 dqm->ops.start = start_nocpsch;
 dqm->ops.stop = stop_nocpsch;
 dqm->ops.pre_reset = pre_reset;
 dqm->ops.create_queue = create_queue_nocpsch;
 dqm->ops.destroy_queue = destroy_queue_nocpsch;
 dqm->ops.update_queue = update_queue;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
 int(*initialize)(struct device_queue_manager *dqm);
 int(*start)(struct device_queue_manager *dqm);
 int(*stop)(struct device_queue_manager *dqm);
 void(*pre_reset)(struct device_queue_manager *dqm);
 void(*uninitialize)(struct device_queue_manager *dqm);
 int(*create_kernel_queue)(struct device_queue_manager *dqm,
 struct kernel_queue *kq,
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c
 #include "kfd_device_queue_manager.h"
 #include "kfd_pm4_headers.h"
 #include "kfd_pm4_opcodes.h"
 #include "amdgpu_reset.h"

 #define PM4_COUNT_ZERO (((1 << 15) - 1) << 16)

 }

 /* Uninitialize a kernel queue and free all its memory usages. */
 static void kq_uninitialize(struct kernel_queue *kq, bool hanging)
 static void kq_uninitialize(struct kernel_queue *kq)
 {
 if (kq->queue->properties.type == KFD_QUEUE_TYPE_HIQ &&!hanging)
 if (kq->queue->properties.type == KFD_QUEUE_TYPE_HIQ &&down_read_trylock(&kq->dev->adev->reset_domain->sem)) {
 kq->mqd_mgr->destroy_mqd(kq->mqd_mgr,
 kq->queue->mqd,
 KFD_PREEMPT_TYPE_WAVEFRONT_RESET,
 KFD_UNMAP_LATENCY_MS,
 kq->queue->pipe,
 kq->queue->queue);
 up_read(&kq->dev->adev->reset_domain->sem);
 }
 else if (kq->queue->properties.type == KFD_QUEUE_TYPE_DIQ)
 kfd_gtt_sa_free(kq->dev, kq->fence_mem_obj);

 return NULL;
 }

 void kernel_queue_uninit(struct kernel_queue *kq, bool hanging)
 void kernel_queue_uninit(struct kernel_queue *kq)
 {
 kq_uninitialize(kq, hanging);
 kq_uninitialize(kq);
 kfree(kq);
 }

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c
 return 0;
 }

 void pm_uninit(struct packet_manager *pm, bool hanging)
 void pm_uninit(struct packet_manager *pm)
 {
 mutex_destroy(&pm->lock);
 kernel_queue_uninit(pm->priv_queue, hanging);
 kernel_queue_uninit(pm->priv_queue);
 pm->priv_queue = NULL;
 }

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
 void device_queue_manager_uninit(struct device_queue_manager *dqm);
 struct kernel_queue *kernel_queue_init(struct kfd_node *dev,
 enum kfd_queue_type type);
 void kernel_queue_uninit(struct kernel_queue *kq, bool hanging);
 void kernel_queue_uninit(struct kernel_queue *kq);
 int kfd_dqm_evict_pasid(struct device_queue_manager *dqm, u32 pasid);

 /* Process Queue Manager */
 extern const struct packet_manager_funcs kfd_aldebaran_pm_funcs;

 int pm_init(struct packet_manager *pm, struct device_queue_manager *dqm);
 void pm_uninit(struct packet_manager *pm, bool hanging);
 void pm_uninit(struct packet_manager *pm);
 int pm_send_set_resources(struct packet_manager *pm,
 struct scheduling_resources *res);
 int pm_send_runlist(struct packet_manager *pm, struct list_head *dqm_queues);
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
 err_create_queue:
 uninit_queue(q);
 if (kq)
 kernel_queue_uninit(kq, false);
 kernel_queue_uninit(kq);
 kfree(pqn);
 err_allocate_pqn:
 /* check if queues list is empty unregister process from device */
 /* destroy kernel queue (DIQ) */
 dqm = pqn->kq->dev->dqm;
 dqm->ops.destroy_kernel_queue(dqm, pqn->kq, &pdd->qpd);
 kernel_queue_uninit(pqn->kq, false);
 kernel_queue_uninit(pqn->kq);
 }

 if (pqn->q) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -964,7 +964,6 @@ int kgd2kfd_pre_reset(struct kfd_dev *kfd,
		for (i = 0; i < kfd->num_nodes; i++) {
		node = kfd->nodes[i];
		kfd_smi_event_update_gpu_reset(node, false, reset_context);
		node->dqm->ops.pre_reset(node->dqm);
		}

		kgd2kfd_suspend(kfd, false, true);
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,6 +36,7 @@
		#include "cik_regs.h"
		#include "kfd_kernel_queue.h"
		#include "amdgpu_amdkfd.h"
		#include "amdgpu_reset.h"
		#include "mes_v11_api_def.h"
		#include "kfd_debug.h"

Expand DownExpand Up		@@ -181,14 +182,7 @@ static void kfd_hws_hang(struct device_queue_manager *dqm)
		/*
		* Issue a GPU reset if HWS is unresponsive
		*/
		dqm->is_hws_hang = true;

		/* It's possible we're detecting a HWS hang in the
		* middle of a GPU reset. No need to schedule another
		* reset in this case.
		*/
		if (!dqm->is_resetting)
		schedule_work(&dqm->hw_exception_work);
		schedule_work(&dqm->hw_exception_work);
		}

		static int convert_to_mes_queue_type(int queue_type)
Expand DownExpand Up		@@ -220,7 +214,7 @@ static int add_queue_mes(struct device_queue_manager dqm, struct queue q,
		int r, queue_type;
		uint64_t wptr_addr_off;

		if (dqm->is_hws_hang)
		if (!down_read_trylock(&adev->reset_domain->sem))
		return -EIO;

		memset(&queue_input, 0x0, sizeof(struct mes_add_queue_input));
Expand DownExpand Up		@@ -271,6 +265,7 @@ static int add_queue_mes(struct device_queue_manager dqm, struct queue q,
		amdgpu_mes_lock(&adev->mes);
		r = adev->mes.funcs->add_hw_queue(&adev->mes, &queue_input);
		amdgpu_mes_unlock(&adev->mes);
		up_read(&adev->reset_domain->sem);
		if (r) {
		dev_err(adev->dev, "failed to add hardware queue to MES, doorbell=0x%x\n",
		q->properties.doorbell_off);
Expand All		@@ -288,7 +283,7 @@ static int remove_queue_mes(struct device_queue_manager dqm, struct queue q,
		int r;
		struct mes_remove_queue_input queue_input;

		if (dqm->is_hws_hang)
		if (!down_read_trylock(&adev->reset_domain->sem))
		return -EIO;

		memset(&queue_input, 0x0, sizeof(struct mes_remove_queue_input));
Expand All		@@ -298,6 +293,7 @@ static int remove_queue_mes(struct device_queue_manager dqm, struct queue q,
		amdgpu_mes_lock(&adev->mes);
		r = adev->mes.funcs->remove_hw_queue(&adev->mes, &queue_input);
		amdgpu_mes_unlock(&adev->mes);
		up_read(&adev->reset_domain->sem);

		if (r) {
		dev_err(adev->dev, "failed to remove hardware queue from MES, doorbell=0x%x\n",
Expand DownExpand Up		@@ -1494,20 +1490,13 @@ static int stop_nocpsch(struct device_queue_manager *dqm)
		}

		if (dqm->dev->adev->asic_type == CHIP_HAWAII)
		pm_uninit(&dqm->packet_mgr, false);
		pm_uninit(&dqm->packet_mgr);
		dqm->sched_running = false;
		dqm_unlock(dqm);

		return 0;
		}

		static void pre_reset(struct device_queue_manager *dqm)
		{
		dqm_lock(dqm);
		dqm->is_resetting = true;
		dqm_unlock(dqm);
		}

		static int allocate_sdma_queue(struct device_queue_manager *dqm,
		struct queue q, const uint32_t restore_sdma_id)
		{
Expand DownExpand Up		@@ -1696,8 +1685,6 @@ static int start_cpsch(struct device_queue_manager *dqm)
		init_interrupts(dqm);

		/* clear hang status when driver try to start the hw scheduler */
		dqm->is_hws_hang = false;
		dqm->is_resetting = false;
		dqm->sched_running = true;

		if (!dqm->dev->kfd->shared_resources.enable_mes)
Expand DownExpand Up		@@ -1727,38 +1714,33 @@ static int start_cpsch(struct device_queue_manager *dqm)
		fail_allocate_vidmem:
		fail_set_sched_resources:
		if (!dqm->dev->kfd->shared_resources.enable_mes)
		pm_uninit(&dqm->packet_mgr, false);
		pm_uninit(&dqm->packet_mgr);
		fail_packet_manager_init:
		dqm_unlock(dqm);
		return retval;
		}

		static int stop_cpsch(struct device_queue_manager *dqm)
		{
		bool hanging;

		dqm_lock(dqm);
		if (!dqm->sched_running) {
		dqm_unlock(dqm);
		return 0;
		}

		if (!dqm->is_hws_hang) {
		if (!dqm->dev->kfd->shared_resources.enable_mes)
		unmap_queues_cpsch(dqm, KFD_UNMAP_QUEUES_FILTER_ALL_QUEUES, 0, USE_DEFAULT_GRACE_PERIOD, false);
		else
		remove_all_queues_mes(dqm);
		}
		if (!dqm->dev->kfd->shared_resources.enable_mes)
		unmap_queues_cpsch(dqm, KFD_UNMAP_QUEUES_FILTER_ALL_QUEUES, 0, USE_DEFAULT_GRACE_PERIOD, false);
		else
		remove_all_queues_mes(dqm);

		hanging = dqm->is_hws_hang \|\| dqm->is_resetting;
		dqm->sched_running = false;

		if (!dqm->dev->kfd->shared_resources.enable_mes)
		pm_release_ib(&dqm->packet_mgr);

		kfd_gtt_sa_free(dqm->dev, dqm->fence_mem);
		if (!dqm->dev->kfd->shared_resources.enable_mes)
		pm_uninit(&dqm->packet_mgr, hanging);
		pm_uninit(&dqm->packet_mgr);
		dqm_unlock(dqm);

		return 0;
Expand DownExpand Up		@@ -1984,23 +1966,24 @@ static int unmap_queues_cpsch(struct device_queue_manager *dqm,
		{
		struct device *dev = dqm->dev->adev->dev;
		struct mqd_manager *mqd_mgr;
		int retval = 0;
		int retval;

		if (!dqm->sched_running)
		return 0;
		if (dqm->is_hws_hang \|\| dqm->is_resetting)
		return -EIO;
		if (!dqm->active_runlist)
		return retval;
		return 0;
		if (!down_read_trylock(&dqm->dev->adev->reset_domain->sem))
		return -EIO;

		if (grace_period != USE_DEFAULT_GRACE_PERIOD) {
		retval = pm_update_grace_period(&dqm->packet_mgr, grace_period);
		if (retval)
		return retval;
		goto out;
		}
		retval = pm_send_unmap_queue(&dqm->packet_mgr, filter, filter_param, reset);
		if (retval)
		return retval;
		goto out;

		*dqm->fence_addr = KFD_FENCE_INIT;
		pm_send_query_status(&dqm->packet_mgr, dqm->fence_gpu_addr,
		KFD_FENCE_COMPLETED);
Expand All		@@ -2010,7 +1993,7 @@ static int unmap_queues_cpsch(struct device_queue_manager *dqm,
		if (retval) {
		dev_err(dev, "The cp might be in an unrecoverable state due to an unsuccessful queues preemption\n");
		kfd_hws_hang(dqm);
		return retval;
		goto out;
		}

		/* In the current MEC firmware implementation, if compute queue
Expand All		@@ -2026,7 +2009,8 @@ static int unmap_queues_cpsch(struct device_queue_manager *dqm,
		while (halt_if_hws_hang)
		schedule();
		kfd_hws_hang(dqm);
		return -ETIME;
		retval = -ETIME;
		goto out;
		}

		/* We need to reset the grace period value for this device */
Expand All		@@ -2039,6 +2023,8 @@ static int unmap_queues_cpsch(struct device_queue_manager *dqm,
		pm_release_ib(&dqm->packet_mgr);
		dqm->active_runlist = false;

		out:
		up_read(&dqm->dev->adev->reset_domain->sem);
		return retval;
		}

Expand All		@@ -2065,13 +2051,13 @@ static int execute_queues_cpsch(struct device_queue_manager *dqm,
		{
		int retval;

		if (dqm->is_hws_hang)
		if (!down_read_trylock(&dqm->dev->adev->reset_domain->sem))
		return -EIO;
		retval = unmap_queues_cpsch(dqm, filter, filter_param, grace_period, false);
		if (retval)
		returnretval;

		returnmap_queues_cpsch(dqm);
		if (!retval)
		retval = map_queues_cpsch(dqm);
		up_read(&dqm->dev->adev->reset_domain->sem);
		returnretval;
		}

		static int wait_on_destroy_queue(struct device_queue_manager *dqm,
Expand DownExpand Up		@@ -2452,10 +2438,12 @@ static int process_termination_cpsch(struct device_queue_manager *dqm,
		if (!dqm->dev->kfd->shared_resources.enable_mes)
		retval = execute_queues_cpsch(dqm, filter, 0, USE_DEFAULT_GRACE_PERIOD);

		if ((!dqm->is_hws_hang) && (retval \|\| qpd->reset_wavefronts)) {
		if ((retval \|\| qpd->reset_wavefronts) &&
		down_read_trylock(&dqm->dev->adev->reset_domain->sem)) {
		pr_warn("Resetting wave fronts (cpsch) on dev %p\n", dqm->dev);
		dbgdev_wave_reset_wavefronts(dqm->dev, qpd->pqm->process);
		qpd->reset_wavefronts = false;
		up_read(&dqm->dev->adev->reset_domain->sem);
		}

		/* Lastly, free mqd resources.
Expand DownExpand Up		@@ -2562,7 +2550,6 @@ struct device_queue_manager device_queue_manager_init(struct kfd_node dev)
		dqm->ops.initialize = initialize_cpsch;
		dqm->ops.start = start_cpsch;
		dqm->ops.stop = stop_cpsch;
		dqm->ops.pre_reset = pre_reset;
		dqm->ops.destroy_queue = destroy_queue_cpsch;
		dqm->ops.update_queue = update_queue;
		dqm->ops.register_process = register_process;
Expand All		@@ -2583,7 +2570,6 @@ struct device_queue_manager device_queue_manager_init(struct kfd_node dev)
		/* initialize dqm for no cp scheduling */
		dqm->ops.start = start_nocpsch;
		dqm->ops.stop = stop_nocpsch;
		dqm->ops.pre_reset = pre_reset;
		dqm->ops.create_queue = create_queue_nocpsch;
		dqm->ops.destroy_queue = destroy_queue_nocpsch;
		dqm->ops.update_queue = update_queue;
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -152,7 +152,6 @@ struct device_queue_manager_ops {
		int(initialize)(struct device_queue_manager dqm);
		int(start)(struct device_queue_manager dqm);
		int(stop)(struct device_queue_manager dqm);
		void(pre_reset)(struct device_queue_manager dqm);
		void(uninitialize)(struct device_queue_manager dqm);
		int(create_kernel_queue)(struct device_queue_manager dqm,
		struct kernel_queue *kq,
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,6 +32,7 @@
		#include "kfd_device_queue_manager.h"
		#include "kfd_pm4_headers.h"
		#include "kfd_pm4_opcodes.h"
		#include "amdgpu_reset.h"

		#define PM4_COUNT_ZERO (((1 << 15) - 1) << 16)

Expand DownExpand Up		@@ -196,15 +197,17 @@ static bool kq_initialize(struct kernel_queue kq, struct kfd_node dev,
		}

		/* Uninitialize a kernel queue and free all its memory usages. */
		static void kq_uninitialize(struct kernel_queue *kq, bool hanging)
		static void kq_uninitialize(struct kernel_queue *kq)
		{
		if (kq->queue->properties.type == KFD_QUEUE_TYPE_HIQ &&!hanging)
		if (kq->queue->properties.type == KFD_QUEUE_TYPE_HIQ &&down_read_trylock(&kq->dev->adev->reset_domain->sem)) {
		kq->mqd_mgr->destroy_mqd(kq->mqd_mgr,
		kq->queue->mqd,
		KFD_PREEMPT_TYPE_WAVEFRONT_RESET,
		KFD_UNMAP_LATENCY_MS,
		kq->queue->pipe,
		kq->queue->queue);
		up_read(&kq->dev->adev->reset_domain->sem);
		}
		else if (kq->queue->properties.type == KFD_QUEUE_TYPE_DIQ)
		kfd_gtt_sa_free(kq->dev, kq->fence_mem_obj);

Expand DownExpand Up		@@ -344,9 +347,9 @@ struct kernel_queue kernel_queue_init(struct kfd_node dev,
		return NULL;
		}

		void kernel_queue_uninit(struct kernel_queue *kq, bool hanging)
		void kernel_queue_uninit(struct kernel_queue *kq)
		{
		kq_uninitialize(kq, hanging);
		kq_uninitialize(kq);
		kfree(kq);
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -263,10 +263,10 @@ int pm_init(struct packet_manager pm, struct device_queue_manager dqm)
		return 0;
		}

		void pm_uninit(struct packet_manager *pm, bool hanging)
		void pm_uninit(struct packet_manager *pm)
		{
		mutex_destroy(&pm->lock);
		kernel_queue_uninit(pm->priv_queue, hanging);
		kernel_queue_uninit(pm->priv_queue);
		pm->priv_queue = NULL;
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1434,7 +1434,7 @@ struct device_queue_manager device_queue_manager_init(struct kfd_node dev);
		void device_queue_manager_uninit(struct device_queue_manager *dqm);
		struct kernel_queue kernel_queue_init(struct kfd_node dev,
		enum kfd_queue_type type);
		void kernel_queue_uninit(struct kernel_queue *kq, bool hanging);
		void kernel_queue_uninit(struct kernel_queue *kq);
		int kfd_dqm_evict_pasid(struct device_queue_manager *dqm, u32 pasid);

		/* Process Queue Manager */
Expand DownExpand Up		@@ -1540,7 +1540,7 @@ extern const struct packet_manager_funcs kfd_v9_pm_funcs;
		extern const struct packet_manager_funcs kfd_aldebaran_pm_funcs;

		int pm_init(struct packet_manager pm, struct device_queue_manager dqm);
		void pm_uninit(struct packet_manager *pm, bool hanging);
		void pm_uninit(struct packet_manager *pm);
		int pm_send_set_resources(struct packet_manager *pm,
		struct scheduling_resources *res);
		int pm_send_runlist(struct packet_manager pm, struct list_head dqm_queues);
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -434,7 +434,7 @@ int pqm_create_queue(struct process_queue_manager *pqm,
		err_create_queue:
		uninit_queue(q);
		if (kq)
		kernel_queue_uninit(kq, false);
		kernel_queue_uninit(kq);
		kfree(pqn);
		err_allocate_pqn:
		/* check if queues list is empty unregister process from device */
Expand DownExpand Up		@@ -481,7 +481,7 @@ int pqm_destroy_queue(struct process_queue_manager *pqm, unsigned int qid)
		/* destroy kernel queue (DIQ) */
		dqm = pqn->kq->dev->dqm;
		dqm->ops.destroy_kernel_queue(dqm, pqn->kq, &pdd->qpd);
		kernel_queue_uninit(pqn->kq, false);
		kernel_queue_uninit(pqn->kq);
		}

		if (pqn->q) {
Expand Down