diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4571-drm-amdkfd-add-kfd-missing-patch.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4571-drm-amdkfd-add-kfd-missing-patch.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4571-drm-amdkfd-add-kfd-missing-patch.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4571-drm-amdkfd-add-kfd-missing-patch.patch new file mode 100644 index 00000000..bb909a3b --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4571-drm-amdkfd-add-kfd-missing-patch.patch @@ -0,0 +1,65 @@ +From 2f88fdb683379b0f32e6e44aa034147cfb99046f Mon Sep 17 00:00:00 2001 +From: Flora Cui <flora.cui@amd.com> +Date: Mon, 25 Nov 2019 13:41:00 +0800 +Subject: [PATCH 4571/4736] drm/amdkfd: add kfd missing patch + +from commit 99ac52a3dd189 - Merge amd-staging-drm-next into +amd-kfd-staging + +Signed-off-by: Flora Cui <flora.cui@amd.com> +Acked-by: Feifei Xu <Feifei.Xu@amd.com> +--- + .../drm/amd/amdkfd/kfd_device_queue_manager.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 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 67a364ecf8c8..f2325e5f15ce 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +@@ -736,6 +736,10 @@ static int evict_process_queues_nocpsch(struct device_queue_manager *dqm, + q->properties.type)]; + q->properties.is_active = false; + dqm->queue_count--; ++ if (q->properties.is_gws) { ++ dqm->gws_queue_count--; ++ qpd->mapped_gws_queue = false; ++ } + + if (WARN_ONCE(!dqm->sched_running, "Evict when stopped\n")) + continue; +@@ -748,10 +752,6 @@ static int evict_process_queues_nocpsch(struct device_queue_manager *dqm, + * maintain a consistent eviction state + */ + ret = retval; +- if (q->properties.is_gws) { +- dqm->gws_queue_count--; +- qpd->mapped_gws_queue = false; +- } + } + + out: +@@ -858,6 +858,10 @@ static int restore_process_queues_nocpsch(struct device_queue_manager *dqm, + q->properties.type)]; + q->properties.is_active = true; + dqm->queue_count++; ++ if (q->properties.is_gws) { ++ dqm->gws_queue_count++; ++ qpd->mapped_gws_queue = true; ++ } + + if (WARN_ONCE(!dqm->sched_running, "Restore when stopped\n")) + continue; +@@ -869,10 +873,6 @@ static int restore_process_queues_nocpsch(struct device_queue_manager *dqm, + * maintain a consistent eviction state + */ + ret = retval; +- if (q->properties.is_gws) { +- dqm->gws_queue_count++; +- qpd->mapped_gws_queue = true; +- } + } + qpd->evicted = 0; + out: +-- +2.17.1 + |