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

Commit 5ec92a76 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: cleanup fence queue init v2 



Move the fence related stuff into amdgpu_fence.c

v2: rework commit message, cause this is actually not a bug

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarChunming <Zhou&lt;david1.zhou@amd.com>
Reviewed-by: default avatarJunwei Zhang <Jerry.Zhang@amd.com>
parent 9b398fa5

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -625,6 +625,8 @@ void amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring) 
			amdgpu_fence_check_lockup);

			amdgpu_fence_check_lockup);

	ring->fence_drv.ring = ring;

	ring->fence_drv.ring = ring;





	init_waitqueue_head(&ring->fence_drv.fence_queue);



	if (amdgpu_enable_scheduler) {

	if (amdgpu_enable_scheduler) {

		ring->sched = amd_sched_create(&amdgpu_sched_ops,

		ring->sched = amd_sched_create(&amdgpu_sched_ops,

					       ring->idx,

					       ring->idx,

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -360,8 +360,6 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring, 
		amdgpu_fence_driver_init_ring(ring);

		amdgpu_fence_driver_init_ring(ring);

	}

	}





	init_waitqueue_head(&ring->fence_drv.fence_queue);



	r = amdgpu_wb_get(adev, &ring->rptr_offs);

	r = amdgpu_wb_get(adev, &ring->rptr_offs);

	if (r) {

	if (r) {

		dev_err(adev->dev, "(%d) ring rptr_offs wb alloc failed\n", r);

		dev_err(adev->dev, "(%d) ring rptr_offs wb alloc failed\n", r);