From: Alex Xie Date: Mon, 24 Apr 2017 17:30:43 +0000 (-0400) Subject: drm/amdgpu: Fix use of interruptible waiting X-Git-Tag: v4.12-rc1~9^2~2^2~54 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8ab25b4f51ffd2f859afaffa191d50a1eda4128f;p=users%2Fhch%2Fblock.git drm/amdgpu: Fix use of interruptible waiting If amdgpu_bo_reserve function is interrupted by signal, amdgpu_bo_kunmap function is not called. Signed-off-by: Alex Xie Reviewed-by: Christian König Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index eadd6e0a4152..ebc0022a7ab4 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -349,7 +349,7 @@ static void amdgpu_vram_scratch_fini(struct amdgpu_device *adev) if (adev->vram_scratch.robj == NULL) { return; } - r = amdgpu_bo_reserve(adev->vram_scratch.robj, false); + r = amdgpu_bo_reserve(adev->vram_scratch.robj, true); if (likely(r == 0)) { amdgpu_bo_kunmap(adev->vram_scratch.robj); amdgpu_bo_unpin(adev->vram_scratch.robj);