[PATCH 1/4] Revert "drm/amdgpu: dont schedule jobs while in reset"

Koenig, Christian Christian.Koenig at amd.com
Thu Nov 7 09:24:25 UTC 2019


Am 06.11.19 um 18:51 schrieb Andrey Grodzovsky:
> This reverts commit 3cdf9bd0089723c468d5f6240e54d1afa52e9a04.
>
> We will do a proper fix in next patch.
>
> Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky at amd.com>

The order of this one and patch #2 needs to be swapped, or otherwise we 
have the bug in between those two commits again.

Apart from that the series is Reviewed-by: Christian König 
<christian.koenig at amd.com>.

Thanks,
Christian.

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 5 +----
>   1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
> index 2cdaf3b..6614d8a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
> @@ -604,11 +604,8 @@ void amdgpu_ctx_mgr_entity_fini(struct amdgpu_ctx_mgr *mgr)
>   			continue;
>   		}
>   
> -		for (i = 0; i < num_entities; i++) {
> -			mutex_lock(&ctx->adev->lock_reset);
> +		for (i = 0; i < num_entities; i++)
>   			drm_sched_entity_fini(&ctx->entities[0][i].entity);
> -			mutex_unlock(&ctx->adev->lock_reset);
> -		}
>   	}
>   }
>   



More information about the amd-gfx mailing list