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

[oded.gabbay@xxxxxxxxx (Oded Gabbay)]

On Tue, Jan 2, 2018 at 8:10 PM, Yong Zhao <yong.zhao at amd.com> wrote:
> Signed-off-by: Yong Zhao <yong.zhao at amd.com>
> Reviewed-by: Oak Zeng <oak.zeng at amd.com>
> ---
>  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(&q->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.