From 4095ec6ab17d5b368d86a4a68c0b4473809ae246 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Thu, 18 Oct 2018 18:11:45 +0800 Subject: [PATCH 0676/2940] drm/amdgpu: add ring test for page queue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We add page queue for sdma to update page table. So here it also needs ring test to verify it workable during the initialization. Signed-off-by: Huang Rui Reviewed-by: Christian König Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c index 6367a8133168..dc0e8053a477 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c @@ -1150,6 +1150,15 @@ static int sdma_v4_0_start(struct amdgpu_device *adev) return r; } + if (adev->sdma.has_page_queue) { + ring = &adev->sdma.instance[i].page; + r = amdgpu_ring_test_ring(ring); + if (r) { + ring->ready = false; + return r; + } + } + if (adev->mman.buffer_funcs_ring == ring) amdgpu_ttm_set_buffer_funcs_status(adev, true); } -- 2.17.1