diff options
author | Zhenyu Wang <zhenyuw@linux.intel.com> | 2018-04-16 22:43:57 -0400 |
---|---|---|
committer | Zhenyu Wang <zhenyuw@linux.intel.com> | 2018-04-16 22:45:23 -0400 |
commit | 30596ec32e2cd141d73ee8701386887def9e98c0 (patch) | |
tree | c8b0d725c46fd8fa504ec0bf41c92c6ff680b406 /drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | |
parent | d54e79340ff8d65b6c63ac278158add2fe211fd0 (diff) | |
parent | 60cc43fc888428bb2f18f08997432d426a243338 (diff) |
Back merge 'drm-intel-fixes' into gvt-fixes
Need for 4.17-rc1
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c index 63ec1e1bb6aa..02b849be083b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | |||
@@ -80,8 +80,8 @@ static void amdgpu_benchmark_move(struct amdgpu_device *adev, unsigned size, | |||
80 | int time; | 80 | int time; |
81 | 81 | ||
82 | n = AMDGPU_BENCHMARK_ITERATIONS; | 82 | n = AMDGPU_BENCHMARK_ITERATIONS; |
83 | r = amdgpu_bo_create(adev, size, PAGE_SIZE, true, sdomain, 0, NULL, | 83 | r = amdgpu_bo_create(adev, size, PAGE_SIZE,sdomain, 0, |
84 | NULL, 0, &sobj); | 84 | ttm_bo_type_kernel, NULL, &sobj); |
85 | if (r) { | 85 | if (r) { |
86 | goto out_cleanup; | 86 | goto out_cleanup; |
87 | } | 87 | } |
@@ -93,8 +93,8 @@ static void amdgpu_benchmark_move(struct amdgpu_device *adev, unsigned size, | |||
93 | if (r) { | 93 | if (r) { |
94 | goto out_cleanup; | 94 | goto out_cleanup; |
95 | } | 95 | } |
96 | r = amdgpu_bo_create(adev, size, PAGE_SIZE, true, ddomain, 0, NULL, | 96 | r = amdgpu_bo_create(adev, size, PAGE_SIZE, ddomain, 0, |
97 | NULL, 0, &dobj); | 97 | ttm_bo_type_kernel, NULL, &dobj); |
98 | if (r) { | 98 | if (r) { |
99 | goto out_cleanup; | 99 | goto out_cleanup; |
100 | } | 100 | } |