diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c index 8ef4a5392112..7a5b40275e8e 100644 --- a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | |||
@@ -274,7 +274,7 @@ err: | |||
274 | */ | 274 | */ |
275 | static int uvd_v6_0_enc_get_destroy_msg(struct amdgpu_ring *ring, | 275 | static int uvd_v6_0_enc_get_destroy_msg(struct amdgpu_ring *ring, |
276 | uint32_t handle, | 276 | uint32_t handle, |
277 | bool direct, struct dma_fence **fence) | 277 | struct dma_fence **fence) |
278 | { | 278 | { |
279 | const unsigned ib_size_dw = 16; | 279 | const unsigned ib_size_dw = 16; |
280 | struct amdgpu_job *job; | 280 | struct amdgpu_job *job; |
@@ -310,11 +310,7 @@ static int uvd_v6_0_enc_get_destroy_msg(struct amdgpu_ring *ring, | |||
310 | for (i = ib->length_dw; i < ib_size_dw; ++i) | 310 | for (i = ib->length_dw; i < ib_size_dw; ++i) |
311 | ib->ptr[i] = 0x0; | 311 | ib->ptr[i] = 0x0; |
312 | 312 | ||
313 | if (direct) | 313 | r = amdgpu_job_submit_direct(job, ring, &f); |
314 | r = amdgpu_job_submit_direct(job, ring, &f); | ||
315 | else | ||
316 | r = amdgpu_job_submit(job, &ring->adev->vce.entity, | ||
317 | AMDGPU_FENCE_OWNER_UNDEFINED, &f); | ||
318 | if (r) | 314 | if (r) |
319 | goto err; | 315 | goto err; |
320 | 316 | ||
@@ -345,7 +341,7 @@ static int uvd_v6_0_enc_ring_test_ib(struct amdgpu_ring *ring, long timeout) | |||
345 | goto error; | 341 | goto error; |
346 | } | 342 | } |
347 | 343 | ||
348 | r = uvd_v6_0_enc_get_destroy_msg(ring, 1, true, &fence); | 344 | r = uvd_v6_0_enc_get_destroy_msg(ring, 1, &fence); |
349 | if (r) { | 345 | if (r) { |
350 | DRM_ERROR("amdgpu: failed to get destroy ib (%ld).\n", r); | 346 | DRM_ERROR("amdgpu: failed to get destroy ib (%ld).\n", r); |
351 | goto error; | 347 | goto error; |