From: Chunming Zhou Date: Mon, 3 Aug 2015 05:19:43 +0000 (+0800) Subject: drm/amdgpu: use kernel fence for gfx ib test X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ab3cb0ce9e865c53f2027068f49a0edb40666f3f;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git drm/amdgpu: use kernel fence for gfx ib test Signed-off-by: Chunming Zhou Reviewed-by: Christian K?nig Reviewed-by: Jammy Zhou --- diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c index 5fc104bd9c02..521d811996f9 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c @@ -2674,7 +2674,7 @@ static int gfx_v7_0_ring_test_ib(struct amdgpu_ring *ring) if (r) goto err2; - r = amdgpu_fence_wait(ib.fence, false); + r = fence_wait(&ib.fence->base, false); if (r) { DRM_ERROR("amdgpu: fence wait failed (%d).\n", r); goto err2; diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c index 81fa592cc77a..59eae93804c3 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c @@ -636,7 +636,7 @@ static int gfx_v8_0_ring_test_ib(struct amdgpu_ring *ring) if (r) goto err2; - r = amdgpu_fence_wait(ib.fence, false); + r = fence_wait(&ib.fence->base, false); if (r) { DRM_ERROR("amdgpu: fence wait failed (%d).\n", r); goto err2;