diff options
| author | Jonathan Gray <jsg@jsg.id.au> | 2013-06-03 16:28:45 +1000 |
|---|---|---|
| committer | Jonathan Gray <jsg@jsg.id.au> | 2013-08-12 10:41:44 +1000 |
| commit | 1de17862719d5c5b1768240bf1a0e78066474436 (patch) | |
| tree | 237840794141d1c0ad59eda3c6289605faa0679a /sys | |
| parent | 5036a1d13409425f58aeef5ea236c23f81e6adec (diff) | |
unstub r600_dma_ib_test
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/drm/radeon/r600.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sys/dev/pci/drm/radeon/r600.c b/sys/dev/pci/drm/radeon/r600.c index 3284a3c4bf2..5c4b982d381 100644 --- a/sys/dev/pci/drm/radeon/r600.c +++ b/sys/dev/pci/drm/radeon/r600.c @@ -3114,13 +3114,10 @@ free_scratch: */ int r600_dma_ib_test(struct radeon_device *rdev, struct radeon_ring *ring) { - printf("%s stub\n", __func__); - return -ENOSYS; -#ifdef notyet struct radeon_ib ib; unsigned i; int r; - void __iomem *ptr = (void *)rdev->vram_scratch.ptr; + volatile uint32_t *ptr = rdev->vram_scratch.ptr; u32 tmp = 0; if (!ptr) { @@ -3129,7 +3126,7 @@ int r600_dma_ib_test(struct radeon_device *rdev, struct radeon_ring *ring) } tmp = 0xCAFEDEAD; - writel(tmp, ptr); + *ptr = tmp; r = radeon_ib_get(rdev, ring->idx, &ib, NULL, 256); if (r) { @@ -3155,7 +3152,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 = *ptr; if (tmp == 0xDEADBEEF) break; DRM_UDELAY(1); @@ -3168,7 +3165,6 @@ int r600_dma_ib_test(struct radeon_device *rdev, struct radeon_ring *ring) } radeon_ib_free(rdev, &ib); return r; -#endif } /** |