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

Commit 0b021c58 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: use gart for DMA IB tests 



Use gart rather than vram to avoid having to deal with
the HDP cache.

Port of adfed2b0
(drm/radeon: use gart memory for DMA ring tests)
to the IB tests.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 8efe82ca

drivers/gpu/drm/radeon/cik_sdma.c

+12 −9
Original line number Diff line number Diff line
@@ -667,17 +667,20 @@ int cik_sdma_ib_test(struct radeon_device *rdev, struct radeon_ring *ring) 
{

	struct radeon_ib ib;

	unsigned i;

	unsigned index;

	int r;

	void __iomem *ptr = (void *)rdev->vram_scratch.ptr;

	u32 tmp = 0;

	u64 gpu_addr;



	if (!ptr) {

		DRM_ERROR("invalid vram scratch pointer\n");

		return -EINVAL;

	}

	if (ring->idx == R600_RING_TYPE_DMA_INDEX)

		index = R600_WB_DMA_RING_TEST_OFFSET;

	else

		index = CAYMAN_WB_DMA1_RING_TEST_OFFSET;



	gpu_addr = rdev->wb.gpu_addr + index;



	tmp = 0xCAFEDEAD;

	writel(tmp, ptr);

	rdev->wb.wb[index/4] = cpu_to_le32(tmp);



	r = radeon_ib_get(rdev, ring->idx, &ib, NULL, 256);

	if (r) {
@@ -686,8 +689,8 @@ int cik_sdma_ib_test(struct radeon_device *rdev, struct radeon_ring *ring) 
	}



	ib.ptr[0] = SDMA_PACKET(SDMA_OPCODE_WRITE, SDMA_WRITE_SUB_OPCODE_LINEAR, 0);

	ib.ptr[1] = rdev->vram_scratch.gpu_addr & 0xfffffffc;

	ib.ptr[2] = upper_32_bits(rdev->vram_scratch.gpu_addr);

	ib.ptr[1] = lower_32_bits(gpu_addr);

	ib.ptr[2] = upper_32_bits(gpu_addr);

	ib.ptr[3] = 1;

	ib.ptr[4] = 0xDEADBEEF;

	ib.length_dw = 5;
@@ -704,7 +707,7 @@ int cik_sdma_ib_test(struct radeon_device *rdev, struct radeon_ring *ring) 
		return r;

	}

	for (i = 0; i < rdev->usec_timeout; i++) {

		tmp = readl(ptr);

		tmp = le32_to_cpu(rdev->wb.wb[index/4]);

		if (tmp == 0xDEADBEEF)

			break;

		DRM_UDELAY(1);

drivers/gpu/drm/radeon/r600_dma.c

+10 −10
Original line number Diff line number Diff line
@@ -338,17 +338,17 @@ int r600_dma_ib_test(struct radeon_device *rdev, struct radeon_ring *ring) 
{

	struct radeon_ib ib;

	unsigned i;

	unsigned index;

	int r;

	void __iomem *ptr = (void *)rdev->vram_scratch.ptr;

	u32 tmp = 0;

	u64 gpu_addr;



	if (!ptr) {

		DRM_ERROR("invalid vram scratch pointer\n");

		return -EINVAL;

	}

	if (ring->idx == R600_RING_TYPE_DMA_INDEX)

		index = R600_WB_DMA_RING_TEST_OFFSET;

	else

		index = CAYMAN_WB_DMA1_RING_TEST_OFFSET;



	tmp = 0xCAFEDEAD;

	writel(tmp, ptr);

	gpu_addr = rdev->wb.gpu_addr + index;



	r = radeon_ib_get(rdev, ring->idx, &ib, NULL, 256);

	if (r) {
@@ -357,8 +357,8 @@ int r600_dma_ib_test(struct radeon_device *rdev, struct radeon_ring *ring) 
	}



	ib.ptr[0] = DMA_PACKET(DMA_PACKET_WRITE, 0, 0, 1);

	ib.ptr[1] = rdev->vram_scratch.gpu_addr & 0xfffffffc;

	ib.ptr[2] = upper_32_bits(rdev->vram_scratch.gpu_addr) & 0xff;

	ib.ptr[1] = lower_32_bits(gpu_addr);

	ib.ptr[2] = upper_32_bits(gpu_addr) & 0xff;

	ib.ptr[3] = 0xDEADBEEF;

	ib.length_dw = 4;
@@ -374,7 +374,7 @@ int r600_dma_ib_test(struct radeon_device *rdev, struct radeon_ring *ring) 
		return r;

	}

	for (i = 0; i < rdev->usec_timeout; i++) {

		tmp = readl(ptr);

		tmp = le32_to_cpu(rdev->wb.wb[index/4]);

		if (tmp == 0xDEADBEEF)

			break;

		DRM_UDELAY(1);