diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1310-drm-amd-Add-mqd-as-parameter-in-kfd2kgd.hqd_destroy-.patch')
-rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1310-drm-amd-Add-mqd-as-parameter-in-kfd2kgd.hqd_destroy-.patch | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1310-drm-amd-Add-mqd-as-parameter-in-kfd2kgd.hqd_destroy-.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1310-drm-amd-Add-mqd-as-parameter-in-kfd2kgd.hqd_destroy-.patch new file mode 100644 index 00000000..f9cc3774 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1310-drm-amd-Add-mqd-as-parameter-in-kfd2kgd.hqd_destroy-.patch @@ -0,0 +1,70 @@ +From 1f33da991e375d86cacd2bcfa86889ab55baae83 Mon Sep 17 00:00:00 2001 +From: Shaoyun Liu <Shaoyun.Liu@amd.com> +Date: Tue, 18 Jul 2017 17:34:13 -0400 +Subject: [PATCH 1310/4131] drm/amd: Add mqd as parameter in + kfd2kgd.hqd_destroy interface + +Change-Id: I11522965287622bf577fca2aa5dee2aaf791a77f +Signed-off-by: Shaoyun Liu <Shaoyun.Liu@amd.com> +--- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c +index 34099e2..fb8c859 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c +@@ -181,7 +181,7 @@ static void uninitialize(struct kernel_queue *kq) + { + if (kq->queue->properties.type == KFD_QUEUE_TYPE_HIQ) + kq->mqd->destroy_mqd(kq->mqd, +- NULL, ++ kq->queue->mqd, + KFD_PREEMPT_TYPE_WAVEFRONT_RESET, + QUEUE_PREEMPT_DEFAULT_TIMEOUT_MS, + kq->queue->pipe, +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c +index 4b4de78..0399f3a 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c +@@ -327,7 +327,7 @@ static int destroy_mqd(struct mqd_manager *mm, void *mqd, + unsigned int timeout, uint32_t pipe_id, + uint32_t queue_id) + { +- return mm->dev->kfd2kgd->hqd_destroy(mm->dev->kgd, type, timeout, ++ return mm->dev->kfd2kgd->hqd_destroy(mm->dev->kgd, mqd, type, timeout, + pipe_id, queue_id); + } + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c +index 3b1c231..d603ce9 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c +@@ -267,7 +267,7 @@ static int destroy_mqd(struct mqd_manager *mm, void *mqd, + uint32_t queue_id) + { + return mm->dev->kfd2kgd->hqd_destroy +- (mm->dev->kgd, type, timeout, ++ (mm->dev->kgd, mqd, type, timeout, + pipe_id, queue_id); + } + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c +index 670bbba9..58dbd85 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c +@@ -290,7 +290,7 @@ static int destroy_mqd(struct mqd_manager *mm, void *mqd, + uint32_t queue_id) + { + return mm->dev->kfd2kgd->hqd_destroy +- (mm->dev->kgd, type, timeout, ++ (mm->dev->kgd, mqd, type, timeout, + pipe_id, queue_id); + } + +-- +2.7.4 + |