diff options
author | Christian König <christian.koenig@amd.com> | 2016-07-05 15:07:17 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-07-29 14:37:04 -0400 |
commit | bbec97aae660adafa5208c5defc54e3cbbe6b129 (patch) | |
tree | deb3ede843224998cbb28f895b6f26828583770d /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
parent | 8de190c9f44204810440e26ac09913a1fa40aa36 (diff) |
drm/amdgpu: add a fence timeout for the IB tests v2
10ms should be enough for now.
v2: fix some typos in CIK code
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 02a0d19ce54c..9d1909f08d43 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -306,7 +306,7 @@ struct amdgpu_ring_funcs { | |||
306 | uint32_t oa_base, uint32_t oa_size); | 306 | uint32_t oa_base, uint32_t oa_size); |
307 | /* testing functions */ | 307 | /* testing functions */ |
308 | int (*test_ring)(struct amdgpu_ring *ring); | 308 | int (*test_ring)(struct amdgpu_ring *ring); |
309 | int (*test_ib)(struct amdgpu_ring *ring); | 309 | int (*test_ib)(struct amdgpu_ring *ring, long timeout); |
310 | /* insert NOP packets */ | 310 | /* insert NOP packets */ |
311 | void (*insert_nop)(struct amdgpu_ring *ring, uint32_t count); | 311 | void (*insert_nop)(struct amdgpu_ring *ring, uint32_t count); |
312 | /* pad the indirect buffer to the necessary number of dw */ | 312 | /* pad the indirect buffer to the necessary number of dw */ |
@@ -2245,7 +2245,7 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) | |||
2245 | #define amdgpu_vm_set_pte_pde(adev, ib, pe, addr, count, incr, flags) ((adev)->vm_manager.vm_pte_funcs->set_pte_pde((ib), (pe), (addr), (count), (incr), (flags))) | 2245 | #define amdgpu_vm_set_pte_pde(adev, ib, pe, addr, count, incr, flags) ((adev)->vm_manager.vm_pte_funcs->set_pte_pde((ib), (pe), (addr), (count), (incr), (flags))) |
2246 | #define amdgpu_ring_parse_cs(r, p, ib) ((r)->funcs->parse_cs((p), (ib))) | 2246 | #define amdgpu_ring_parse_cs(r, p, ib) ((r)->funcs->parse_cs((p), (ib))) |
2247 | #define amdgpu_ring_test_ring(r) (r)->funcs->test_ring((r)) | 2247 | #define amdgpu_ring_test_ring(r) (r)->funcs->test_ring((r)) |
2248 | #define amdgpu_ring_test_ib(r) (r)->funcs->test_ib((r)) | 2248 | #define amdgpu_ring_test_ib(r, t) (r)->funcs->test_ib((r), (t)) |
2249 | #define amdgpu_ring_get_rptr(r) (r)->funcs->get_rptr((r)) | 2249 | #define amdgpu_ring_get_rptr(r) (r)->funcs->get_rptr((r)) |
2250 | #define amdgpu_ring_get_wptr(r) (r)->funcs->get_wptr((r)) | 2250 | #define amdgpu_ring_get_wptr(r) (r)->funcs->get_wptr((r)) |
2251 | #define amdgpu_ring_set_wptr(r) (r)->funcs->set_wptr((r)) | 2251 | #define amdgpu_ring_set_wptr(r) (r)->funcs->set_wptr((r)) |