aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/r600.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/radeon/r600.c')
-rw-r--r--drivers/gpu/drm/radeon/r600.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 00b22385e3f8..4c0d8c96a0ec 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -2681,7 +2681,7 @@ void r600_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib)
2681 2681
2682int r600_ib_test(struct radeon_device *rdev, struct radeon_ring *ring) 2682int r600_ib_test(struct radeon_device *rdev, struct radeon_ring *ring)
2683{ 2683{
2684 struct radeon_ib *ib; 2684 struct radeon_ib ib;
2685 uint32_t scratch; 2685 uint32_t scratch;
2686 uint32_t tmp = 0; 2686 uint32_t tmp = 0;
2687 unsigned i; 2687 unsigned i;
@@ -2699,18 +2699,18 @@ int r600_ib_test(struct radeon_device *rdev, struct radeon_ring *ring)
2699 DRM_ERROR("radeon: failed to get ib (%d).\n", r); 2699 DRM_ERROR("radeon: failed to get ib (%d).\n", r);
2700 return r; 2700 return r;
2701 } 2701 }
2702 ib->ptr[0] = PACKET3(PACKET3_SET_CONFIG_REG, 1); 2702 ib.ptr[0] = PACKET3(PACKET3_SET_CONFIG_REG, 1);
2703 ib->ptr[1] = ((scratch - PACKET3_SET_CONFIG_REG_OFFSET) >> 2); 2703 ib.ptr[1] = ((scratch - PACKET3_SET_CONFIG_REG_OFFSET) >> 2);
2704 ib->ptr[2] = 0xDEADBEEF; 2704 ib.ptr[2] = 0xDEADBEEF;
2705 ib->length_dw = 3; 2705 ib.length_dw = 3;
2706 r = radeon_ib_schedule(rdev, ib); 2706 r = radeon_ib_schedule(rdev, &ib);
2707 if (r) { 2707 if (r) {
2708 radeon_scratch_free(rdev, scratch); 2708 radeon_scratch_free(rdev, scratch);
2709 radeon_ib_free(rdev, &ib); 2709 radeon_ib_free(rdev, &ib);
2710 DRM_ERROR("radeon: failed to schedule ib (%d).\n", r); 2710 DRM_ERROR("radeon: failed to schedule ib (%d).\n", r);
2711 return r; 2711 return r;
2712 } 2712 }
2713 r = radeon_fence_wait(ib->fence, false); 2713 r = radeon_fence_wait(ib.fence, false);
2714 if (r) { 2714 if (r) {
2715 DRM_ERROR("radeon: fence wait failed (%d).\n", r); 2715 DRM_ERROR("radeon: fence wait failed (%d).\n", r);
2716 return r; 2716 return r;
@@ -2722,7 +2722,7 @@ int r600_ib_test(struct radeon_device *rdev, struct radeon_ring *ring)
2722 DRM_UDELAY(1); 2722 DRM_UDELAY(1);
2723 } 2723 }
2724 if (i < rdev->usec_timeout) { 2724 if (i < rdev->usec_timeout) {
2725 DRM_INFO("ib test on ring %d succeeded in %u usecs\n", ib->fence->ring, i); 2725 DRM_INFO("ib test on ring %d succeeded in %u usecs\n", ib.fence->ring, i);
2726 } else { 2726 } else {
2727 DRM_ERROR("radeon: ib test failed (scratch(0x%04X)=0x%08X)\n", 2727 DRM_ERROR("radeon: ib test failed (scratch(0x%04X)=0x%08X)\n",
2728 scratch, tmp); 2728 scratch, tmp);