drm/amdgpu: use amdgpu_ring_test_helper when possible (c6fc97f9) · Commits · 戴 / test

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -477,7 +477,7 @@ int amdgpu_gfx_disable_kcq(struct amdgpu_device *adev)
		kiq->pmf->kiq_unmap_queues(kiq_ring, &adev->gfx.compute_ring[i],
		RESET_QUEUES, 0, 0);

		return amdgpu_ring_test_ring(kiq_ring);
		return amdgpu_ring_test_helper(kiq_ring);
		}

		int amdgpu_gfx_enable_kcq(struct amdgpu_device *adev)

+2 −7

Original line number	Diff line number	Diff line
		@@ -3164,12 +3164,7 @@ static int gfx_v10_0_kiq_enable_kgq(struct amdgpu_device *adev)
		for (i = 0; i < adev->gfx.num_gfx_rings; i++)
		kiq->pmf->kiq_map_queues(kiq_ring, &adev->gfx.gfx_ring[i]);

		r = amdgpu_ring_test_ring(kiq_ring);
		if (r) {
		DRM_ERROR("kfq enable failed\n");
		kiq_ring->sched.ready = false;
		}
		return r;
		return amdgpu_ring_test_helper(kiq_ring);
		}
		#endif

		@@ -3785,7 +3780,7 @@ static int gfx_v10_0_kiq_disable_kgq(struct amdgpu_device *adev)
		kiq->pmf->kiq_unmap_queues(kiq_ring, &adev->gfx.gfx_ring[i],
		PREEMPT_QUEUES, 0, 0);

		return amdgpu_ring_test_ring(kiq_ring);
		return amdgpu_ring_test_helper(kiq_ring);
		}
		#endif

+2 −4

Original line number	Diff line number	Diff line
		@@ -746,11 +746,9 @@ static int sdma_v5_0_gfx_resume(struct amdgpu_device *adev)
		sdma_v5_0_enable(adev, true);
		}

		r = amdgpu_ring_test_ring(ring);
		if (r) {
		ring->sched.ready = false;
		r = amdgpu_ring_test_helper(ring);
		if (r)
		return r;
		}

		if (adev->mman.buffer_funcs_ring == ring)
		amdgpu_ttm_set_buffer_funcs_status(adev, true);