diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_test.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c index 2dbe87591f81..d167e8ab76d3 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | |||
@@ -33,6 +33,7 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev) | |||
33 | struct amdgpu_ring *ring = adev->mman.buffer_funcs_ring; | 33 | struct amdgpu_ring *ring = adev->mman.buffer_funcs_ring; |
34 | struct amdgpu_bo *vram_obj = NULL; | 34 | struct amdgpu_bo *vram_obj = NULL; |
35 | struct amdgpu_bo **gtt_obj = NULL; | 35 | struct amdgpu_bo **gtt_obj = NULL; |
36 | struct amdgpu_bo_param bp; | ||
36 | uint64_t gart_addr, vram_addr; | 37 | uint64_t gart_addr, vram_addr; |
37 | unsigned n, size; | 38 | unsigned n, size; |
38 | int i, r; | 39 | int i, r; |
@@ -58,9 +59,15 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev) | |||
58 | r = 1; | 59 | r = 1; |
59 | goto out_cleanup; | 60 | goto out_cleanup; |
60 | } | 61 | } |
61 | 62 | memset(&bp, 0, sizeof(bp)); | |
62 | r = amdgpu_bo_create(adev, size, PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM, 0, | 63 | bp.size = size; |
63 | ttm_bo_type_kernel, NULL, &vram_obj); | 64 | bp.byte_align = PAGE_SIZE; |
65 | bp.domain = AMDGPU_GEM_DOMAIN_VRAM; | ||
66 | bp.flags = 0; | ||
67 | bp.type = ttm_bo_type_kernel; | ||
68 | bp.resv = NULL; | ||
69 | |||
70 | r = amdgpu_bo_create(adev, &bp, &vram_obj); | ||
64 | if (r) { | 71 | if (r) { |
65 | DRM_ERROR("Failed to create VRAM object\n"); | 72 | DRM_ERROR("Failed to create VRAM object\n"); |
66 | goto out_cleanup; | 73 | goto out_cleanup; |
@@ -79,9 +86,8 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev) | |||
79 | void **vram_start, **vram_end; | 86 | void **vram_start, **vram_end; |
80 | struct dma_fence *fence = NULL; | 87 | struct dma_fence *fence = NULL; |
81 | 88 | ||
82 | r = amdgpu_bo_create(adev, size, PAGE_SIZE, | 89 | bp.domain = AMDGPU_GEM_DOMAIN_GTT; |
83 | AMDGPU_GEM_DOMAIN_GTT, 0, | 90 | r = amdgpu_bo_create(adev, &bp, gtt_obj + i); |
84 | ttm_bo_type_kernel, NULL, gtt_obj + i); | ||
85 | if (r) { | 91 | if (r) { |
86 | DRM_ERROR("Failed to create GTT object %d\n", i); | 92 | DRM_ERROR("Failed to create GTT object %d\n", i); |
87 | goto out_lclean; | 93 | goto out_lclean; |