drm/amdgpu: cleanup uvd_v6_0_ring_test_ring (725b2611) · Commits · 戴 / test

Accidentially missed during the last cleanup. Signed-off-by:

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

+5 −12

Original line number	Diff line number	Diff line
		@@ -947,11 +947,9 @@ static int uvd_v6_0_ring_test_ring(struct amdgpu_ring *ring)

		WREG32(mmUVD_CONTEXT_ID, 0xCAFEDEAD);
		r = amdgpu_ring_alloc(ring, 3);
		if (r) {
		DRM_ERROR("amdgpu: cp failed to lock ring %d (%d).\n",
		ring->idx, r);
		if (r)
		return r;
		}

		amdgpu_ring_write(ring, PACKET0(mmUVD_CONTEXT_ID, 0));
		amdgpu_ring_write(ring, 0xDEADBEEF);
		amdgpu_ring_commit(ring);
		@@ -962,14 +960,9 @@ static int uvd_v6_0_ring_test_ring(struct amdgpu_ring *ring)
		DRM_UDELAY(1);
		}

		if (i < adev->usec_timeout) {
		DRM_DEBUG("ring test on %d succeeded in %d usecs\n",
		ring->idx, i);
		} else {
		DRM_ERROR("amdgpu: ring %d test failed (0x%08X)\n",
		ring->idx, tmp);
		r = -EINVAL;
		}
		if (i >= adev->usec_timeout)
		r = -ETIMEDOUT;

		return r;
		}