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_vce.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_vce.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c index 66b7bfafca24..bcbe4167d7b1 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | |||
@@ -377,7 +377,7 @@ int amdgpu_vce_get_create_msg(struct amdgpu_ring *ring, uint32_t handle, | |||
377 | ib = kzalloc(sizeof(struct amdgpu_ib), GFP_KERNEL); | 377 | ib = kzalloc(sizeof(struct amdgpu_ib), GFP_KERNEL); |
378 | if (!ib) | 378 | if (!ib) |
379 | return -ENOMEM; | 379 | return -ENOMEM; |
380 | r = amdgpu_ib_get(ring, NULL, ib_size_dw * 4, ib); | 380 | r = amdgpu_ib_get(adev, NULL, ib_size_dw * 4, ib); |
381 | if (r) { | 381 | if (r) { |
382 | DRM_ERROR("amdgpu: failed to get ib (%d).\n", r); | 382 | DRM_ERROR("amdgpu: failed to get ib (%d).\n", r); |
383 | kfree(ib); | 383 | kfree(ib); |
@@ -463,7 +463,7 @@ int amdgpu_vce_get_destroy_msg(struct amdgpu_ring *ring, uint32_t handle, | |||
463 | if (!ib) | 463 | if (!ib) |
464 | return -ENOMEM; | 464 | return -ENOMEM; |
465 | 465 | ||
466 | r = amdgpu_ib_get(ring, NULL, ib_size_dw * 4, ib); | 466 | r = amdgpu_ib_get(adev, NULL, ib_size_dw * 4, ib); |
467 | if (r) { | 467 | if (r) { |
468 | kfree(ib); | 468 | kfree(ib); |
469 | DRM_ERROR("amdgpu: failed to get ib (%d).\n", r); | 469 | DRM_ERROR("amdgpu: failed to get ib (%d).\n", r); |