Commit ec442fd3 authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amdgpu: Refine uvd_v6/7_0_enc_get_destroy_msg 



1. make uvd_v7_0_enc_get_destroy_msg static
2. drop a function variable that always true

Reviewed-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 717276b9

drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c

+3 −7
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ err: 
 */

static int uvd_v6_0_enc_get_destroy_msg(struct amdgpu_ring *ring,

					uint32_t handle,

					bool direct, struct dma_fence **fence)

					struct dma_fence **fence)

{

	const unsigned ib_size_dw = 16;

	struct amdgpu_job *job;
@@ -310,11 +310,7 @@ static int uvd_v6_0_enc_get_destroy_msg(struct amdgpu_ring *ring, 
	for (i = ib->length_dw; i < ib_size_dw; ++i)

		ib->ptr[i] = 0x0;



	if (direct)

	r = amdgpu_job_submit_direct(job, ring, &f);

	else

		r = amdgpu_job_submit(job, &ring->adev->vce.entity,

				      AMDGPU_FENCE_OWNER_UNDEFINED, &f);

	if (r)

		goto err;
@@ -345,7 +341,7 @@ static int uvd_v6_0_enc_ring_test_ib(struct amdgpu_ring *ring, long timeout) 
		goto error;

	}



	r = uvd_v6_0_enc_get_destroy_msg(ring, 1, true, &fence);

	r = uvd_v6_0_enc_get_destroy_msg(ring, 1, &fence);

	if (r) {

		DRM_ERROR("amdgpu: failed to get destroy ib (%ld).\n", r);

		goto error;

drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c

+4 −8
Original line number Diff line number Diff line
@@ -280,8 +280,8 @@ err: 
 *

 * Close up a stream for HW test or if userspace failed to do so

 */

int uvd_v7_0_enc_get_destroy_msg(struct amdgpu_ring *ring, uint32_t handle,

				 bool direct, struct dma_fence **fence)

static int uvd_v7_0_enc_get_destroy_msg(struct amdgpu_ring *ring, uint32_t handle,

				struct dma_fence **fence)

{

	const unsigned ib_size_dw = 16;

	struct amdgpu_job *job;
@@ -317,11 +317,7 @@ int uvd_v7_0_enc_get_destroy_msg(struct amdgpu_ring *ring, uint32_t handle, 
	for (i = ib->length_dw; i < ib_size_dw; ++i)

		ib->ptr[i] = 0x0;



	if (direct)

	r = amdgpu_job_submit_direct(job, ring, &f);

	else

		r = amdgpu_job_submit(job, &ring->adev->vce.entity,

				      AMDGPU_FENCE_OWNER_UNDEFINED, &f);

	if (r)

		goto err;
@@ -352,7 +348,7 @@ static int uvd_v7_0_enc_ring_test_ib(struct amdgpu_ring *ring, long timeout) 
		goto error;

	}



	r = uvd_v7_0_enc_get_destroy_msg(ring, 1, true, &fence);

	r = uvd_v7_0_enc_get_destroy_msg(ring, 1, &fence);

	if (r) {

		DRM_ERROR("amdgpu: (%d)failed to get destroy ib (%ld).\n", ring->me, r);

		goto error;

CRA Git | Maintained and supported by SUSTech CRA and CCSE