Andrey Grodzovsky <andrey.grodzov...@amd.com> writes:

> If the ring is hanging for some reason allow to recover the waiting
> by sending fatal signal.
>
> Originally-by: David Panariti <david.panar...@amd.com>
> Signed-off-by: Andrey Grodzovsky <andrey.grodzov...@amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 14 ++++++++++----
>  1 file changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c 
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
> index eb80edf..37a36af 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
> @@ -421,10 +421,16 @@ int amdgpu_ctx_wait_prev_fence(struct amdgpu_ctx *ctx, 
> unsigned ring_id)
>  
>       if (other) {
>               signed long r;
> -             r = dma_fence_wait_timeout(other, false, MAX_SCHEDULE_TIMEOUT);
> -             if (r < 0) {
> -                     DRM_ERROR("Error (%ld) waiting for fence!\n", r);
> -                     return r;
> +
> +             while (true) {
> +                     if ((r = dma_fence_wait_timeout(other, true,
> +                                     MAX_SCHEDULE_TIMEOUT)) >= 0)
> +                             return 0;
> +
> +                     if (fatal_signal_pending(current)) {
> +                             DRM_ERROR("Error (%ld) waiting for fence!\n", 
> r);
> +                             return r;
> +                     }

It looks like if you make this code say:
                        if (fatal_signal_pending(current) ||
                            (current->flags & PF_EXITING)) {
                                DRM_ERROR("Error (%ld) waiting for fence!\n", 
r);
                                return r;
>               }
>       }

Than you would not need the horrible hack want_signal to deliver signals
to processes who have passed exit_signal() and don't expect to need
their signal handling mechanisms anymore.

Eric

Reply via email to