diff options
author | Christian König <christian.koenig@amd.com> | 2016-01-31 06:29:04 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-02-10 14:17:20 -0500 |
commit | b07c60c0652c497af0c42c1278941f7c5a187fe9 (patch) | |
tree | d19e6dfc68fe4b25032c19ceae0e5be0f7e9c25d /drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | |
parent | 9e5d53094c5366a9a14e0694e45e794902cc2c04 (diff) |
drm/amdgpu: move ring from IBs into job
We can't submit to multiple rings at the same time anyway.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index d0acc9c0fd7f..b68642b47b7b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | |||
@@ -355,7 +355,7 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev, | |||
355 | if (!ib) | 355 | if (!ib) |
356 | goto error; | 356 | goto error; |
357 | 357 | ||
358 | r = amdgpu_ib_get(ring, NULL, 64, ib); | 358 | r = amdgpu_ib_get(adev, NULL, 64, ib); |
359 | if (r) | 359 | if (r) |
360 | goto error_free; | 360 | goto error_free; |
361 | 361 | ||
@@ -448,7 +448,7 @@ int amdgpu_vm_update_page_directory(struct amdgpu_device *adev, | |||
448 | if (!ib) | 448 | if (!ib) |
449 | return -ENOMEM; | 449 | return -ENOMEM; |
450 | 450 | ||
451 | r = amdgpu_ib_get(ring, NULL, ndw * 4, ib); | 451 | r = amdgpu_ib_get(adev, NULL, ndw * 4, ib); |
452 | if (r) { | 452 | if (r) { |
453 | kfree(ib); | 453 | kfree(ib); |
454 | return r; | 454 | return r; |
@@ -737,7 +737,7 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev, | |||
737 | if (!ib) | 737 | if (!ib) |
738 | return -ENOMEM; | 738 | return -ENOMEM; |
739 | 739 | ||
740 | r = amdgpu_ib_get(ring, NULL, ndw * 4, ib); | 740 | r = amdgpu_ib_get(adev, NULL, ndw * 4, ib); |
741 | if (r) { | 741 | if (r) { |
742 | kfree(ib); | 742 | kfree(ib); |
743 | return r; | 743 | return r; |