[PATCH 3/4] drm/amdgpu: give warning before sleep in kiq_r/wreg

[Christian König]

Am 06.03.2018 um 04:15 schrieb Monk Liu:
> to catch error that may schedule in atomic context early on
>
> Change-Id: I49dec7c55470011729b7fa7d3e1ecfe1f38ed89f
> Signed-off-by: Monk Liu <Monk.Liu at amd.com>

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

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 7 +++++++
>   1 file changed, 7 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> index 42c1401..21adb1b6 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> @@ -167,6 +167,9 @@ uint32_t amdgpu_virt_kiq_rreg(struct amdgpu_device *adev, uint32_t reg)
>   	if (r < 1 && (adev->in_gpu_reset || in_interrupt()))
>   		goto failed_kiq_read;
>   
> +	if (in_interrupt())
> +		might_sleep();
> +
>   	while (r < 1 && cnt++ < MAX_KIQ_REG_TRY) {
>   		msleep(MAX_KIQ_REG_BAILOUT_INTERVAL);
>   		r = amdgpu_fence_wait_polling(ring, seq, MAX_KIQ_REG_WAIT);
> @@ -212,7 +215,11 @@ void amdgpu_virt_kiq_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v)
>   	if (r < 1 && (adev->in_gpu_reset || in_interrupt()))
>   		goto failed_kiq_write;
>   
> +	if (in_interrupt())
> +		might_sleep();
> +
>   	while (r < 1 && cnt++ < MAX_KIQ_REG_TRY) {
> +
>   		msleep(MAX_KIQ_REG_BAILOUT_INTERVAL);
>   		r = amdgpu_fence_wait_polling(ring, seq, MAX_KIQ_REG_WAIT);
>   	}