Re: [PATCH 2/2] drm/amdkfd: avoid calling execute_queues_cpsch() when destroying an unactive queue

2018-01-10 Thread Oded Gabbay
On Tue, Jan 2, 2018 at 8:10 PM, Yong Zhao  wrote:
> Signed-off-by: Yong Zhao 
> Reviewed-by: Oak Zeng 
> ---
>  drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 10 +-
>  1 file changed, 5 insertions(+), 5 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 acfb121..b21285a 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
> @@ -1013,13 +1013,13 @@ static int destroy_queue_cpsch(struct 
> device_queue_manager *dqm,
>
> list_del(>list);
> qpd->queue_count--;
> -   if (q->properties.is_active)
> +   if (q->properties.is_active) {
> dqm->queue_count--;
> -
> -   retval = execute_queues_cpsch(dqm,
> +   retval = execute_queues_cpsch(dqm,
> KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES, 0);
> -   if (retval == -ETIME)
> -   qpd->reset_wavefronts = true;
> +   if (retval == -ETIME)
> +   qpd->reset_wavefronts = true;
> +   }
>
> mqd->uninit_mqd(mqd, q->mqd, q->mqd_mem_obj);
>
> --
> 2.7.4
>

Both patches applied to next.
Thanks,
Oded.
___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx


[PATCH 2/2] drm/amdkfd: avoid calling execute_queues_cpsch() when destroying an unactive queue

2018-01-02 Thread Yong Zhao
Signed-off-by: Yong Zhao 
Reviewed-by: Oak Zeng 
---
 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 10 +-
 1 file changed, 5 insertions(+), 5 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 acfb121..b21285a 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -1013,13 +1013,13 @@ static int destroy_queue_cpsch(struct 
device_queue_manager *dqm,
 
list_del(>list);
qpd->queue_count--;
-   if (q->properties.is_active)
+   if (q->properties.is_active) {
dqm->queue_count--;
-
-   retval = execute_queues_cpsch(dqm,
+   retval = execute_queues_cpsch(dqm,
KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES, 0);
-   if (retval == -ETIME)
-   qpd->reset_wavefronts = true;
+   if (retval == -ETIME)
+   qpd->reset_wavefronts = true;
+   }
 
mqd->uninit_mqd(mqd, q->mqd, q->mqd_mem_obj);
 
-- 
2.7.4

___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx