From: Christian König Date: Thu, 1 Mar 2018 10:03:27 +0000 (+0100) Subject: drm/amdgpu: ignore changes of buffer function status because of GPU resets X-Git-Tag: v4.17-rc1~185^2~18^2~42 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=380383f23594790be97639ea220e8d3e86afff85;p=users%2Fjedix%2Flinux-maple.git drm/amdgpu: ignore changes of buffer function status because of GPU resets When we reset the GPU we also disable/enable the SDMA, but we don't want to change TTM idea of the VRAM size in the middle of that. Signed-off-by: Christian König Acked-by: Chunming zhou Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 46d7a690a287..2aa6823ef503 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -1540,7 +1540,7 @@ void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_device *adev, bool enable) struct ttm_mem_type_manager *man = &adev->mman.bdev.man[TTM_PL_VRAM]; uint64_t size; - if (!adev->mman.initialized) + if (!adev->mman.initialized || adev->in_gpu_reset) return; /* this just adjusts TTM size idea, which sets lpfn to the correct value */