Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33d5bd07 authored by Emily Deng's avatar Emily Deng Committed by Alex Deucher
Browse files

drm/amdgpu/uvd: UVD entity initialization relys on ring initialization 



Entity init should after ring init, as the entity's sched_rq's initialization
is in ring init.

SWDEV-161495

Signed-off-by: default avatarEmily Deng <Emily.Deng@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4d77c0f6

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

+23 −9
Original line number Original line Diff line number Diff line
@@ -122,8 +122,6 @@ static void amdgpu_uvd_idle_work_handler(struct work_struct *work); 




int amdgpu_uvd_sw_init(struct amdgpu_device *adev)

int amdgpu_uvd_sw_init(struct amdgpu_device *adev)

{

{

	struct amdgpu_ring *ring;

	struct drm_sched_rq *rq;

	unsigned long bo_size;

	unsigned long bo_size;

	const char *fw_name;

	const char *fw_name;

	const struct common_firmware_header *hdr;

	const struct common_firmware_header *hdr;
@@ -266,13 +264,6 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev) 
		}

		}

	}

	}





	ring = &adev->uvd.inst[0].ring;

	rq = &ring->sched.sched_rq[DRM_SCHED_PRIORITY_NORMAL];

	r = drm_sched_entity_init(&adev->uvd.entity, &rq, 1, NULL);

	if (r) {

		DRM_ERROR("Failed setting up UVD kernel entity.\n");

		return r;

	}

	for (i = 0; i < adev->uvd.max_handles; ++i) {

	for (i = 0; i < adev->uvd.max_handles; ++i) {

		atomic_set(&adev->uvd.handles[i], 0);

		atomic_set(&adev->uvd.handles[i], 0);

		adev->uvd.filp[i] = NULL;

		adev->uvd.filp[i] = NULL;
@@ -327,6 +318,29 @@ int amdgpu_uvd_sw_fini(struct amdgpu_device *adev) 
	return 0;

	return 0;

}

}





/**

 * amdgpu_uvd_entity_init - init entity

 *

 * @adev: amdgpu_device pointer

 *

 */

int amdgpu_uvd_entity_init(struct amdgpu_device *adev)

{

	struct amdgpu_ring *ring;

	struct drm_sched_rq *rq;

	int r;



	ring = &adev->uvd.inst[0].ring;

	rq = &ring->sched.sched_rq[DRM_SCHED_PRIORITY_NORMAL];

	r = drm_sched_entity_init(&adev->uvd.entity, &rq, 1, NULL);

	if (r) {

		DRM_ERROR("Failed setting up UVD kernel entity.\n");

		return r;

	}



	return 0;

}



int amdgpu_uvd_suspend(struct amdgpu_device *adev)

int amdgpu_uvd_suspend(struct amdgpu_device *adev)

{

{

	unsigned size;

	unsigned size;

drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -69,6 +69,7 @@ struct amdgpu_uvd { 




int amdgpu_uvd_sw_init(struct amdgpu_device *adev);

int amdgpu_uvd_sw_init(struct amdgpu_device *adev);

int amdgpu_uvd_sw_fini(struct amdgpu_device *adev);

int amdgpu_uvd_sw_fini(struct amdgpu_device *adev);

int amdgpu_uvd_entity_init(struct amdgpu_device *adev);

int amdgpu_uvd_suspend(struct amdgpu_device *adev);

int amdgpu_uvd_suspend(struct amdgpu_device *adev);

int amdgpu_uvd_resume(struct amdgpu_device *adev);

int amdgpu_uvd_resume(struct amdgpu_device *adev);

int amdgpu_uvd_get_create_msg(struct amdgpu_ring *ring, uint32_t handle,

int amdgpu_uvd_get_create_msg(struct amdgpu_ring *ring, uint32_t handle,

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -123,6 +123,10 @@ static int uvd_v4_2_sw_init(void *handle) 
	ring = &adev->uvd.inst->ring;

	ring = &adev->uvd.inst->ring;

	sprintf(ring->name, "uvd");

	sprintf(ring->name, "uvd");

	r = amdgpu_ring_init(adev, ring, 512, &adev->uvd.inst->irq, 0);

	r = amdgpu_ring_init(adev, ring, 512, &adev->uvd.inst->irq, 0);

	if (r)

		return r;



	r = amdgpu_uvd_entity_init(adev);





	return r;

	return r;

}

}

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -120,6 +120,10 @@ static int uvd_v5_0_sw_init(void *handle) 
	ring = &adev->uvd.inst->ring;

	ring = &adev->uvd.inst->ring;

	sprintf(ring->name, "uvd");

	sprintf(ring->name, "uvd");

	r = amdgpu_ring_init(adev, ring, 512, &adev->uvd.inst->irq, 0);

	r = amdgpu_ring_init(adev, ring, 512, &adev->uvd.inst->irq, 0);

	if (r)

		return r;



	r = amdgpu_uvd_entity_init(adev);





	return r;

	return r;

}

}

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -440,6 +440,8 @@ static int uvd_v6_0_sw_init(void *handle) 
		}

		}

	}

	}





	r = amdgpu_uvd_entity_init(adev);



	return r;

	return r;

}

}