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

Christian König ckoenig.leichtzumerken at gmail.com
Thu Dec 12 08:15:14 UTC 2019


Am 11.12.19 um 17:42 schrieb Alex Deucher:
> This reverts commit f2efc6e60089c99c342a6b7da47f1037e06c4296.
>
> This was fixed properly for 5.5, but came back via 5.4 merge
> into drm-next, so revert it again.
>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

Reviewed-by: Christian König <christian.koenig at amd.com>

> ---
>   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 2cdaf3b2a721..6614d8a6f4c8 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