Commit 7b9ef16b authored by Christian König's avatar Christian König Committed by Dave Airlie
Browse files

drm/radeon: make forcing ring activity a common function 



Nothing chipset or ring specific with it,
so also move it to radon_ring.

Signed-off-by: default avatarChristian König <deathsimple@vodafone.de>
Reviewed-by: default avatarJerome Glisse <jglisse@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 67e3c787

drivers/gpu/drm/radeon/evergreen.c

+1 −9
Original line number Diff line number Diff line
@@ -2424,7 +2424,6 @@ bool evergreen_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *rin 
	u32 srbm_status;

	u32 grbm_status;

	u32 grbm_status_se0, grbm_status_se1;

	int r;



	srbm_status = RREG32(SRBM_STATUS);

	grbm_status = RREG32(GRBM_STATUS);
@@ -2435,14 +2434,7 @@ bool evergreen_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *rin 
		return false;

	}

	/* force CP activities */

	r = radeon_ring_lock(rdev, ring, 2);

	if (!r) {

		/* PACKET2 NOP */

		radeon_ring_write(ring, 0x80000000);

		radeon_ring_write(ring, 0x80000000);

		radeon_ring_unlock_commit(rdev, ring);

	}

	ring->rptr = RREG32(CP_RB_RPTR);

	radeon_ring_force_activity(rdev, ring);

	return radeon_ring_test_lockup(rdev, ring);

}

drivers/gpu/drm/radeon/ni.c

+1 −10
Original line number Diff line number Diff line
@@ -1397,7 +1397,6 @@ bool cayman_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring) 
	u32 srbm_status;

	u32 grbm_status;

	u32 grbm_status_se0, grbm_status_se1;

	int r;



	srbm_status = RREG32(SRBM_STATUS);

	grbm_status = RREG32(GRBM_STATUS);
@@ -1408,15 +1407,7 @@ bool cayman_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring) 
		return false;

	}

	/* force CP activities */

	r = radeon_ring_lock(rdev, ring, 2);

	if (!r) {

		/* PACKET2 NOP */

		radeon_ring_write(ring, 0x80000000);

		radeon_ring_write(ring, 0x80000000);

		radeon_ring_unlock_commit(rdev, ring);

	}

	/* XXX deal with CP0,1,2 */

	ring->rptr = RREG32(ring->rptr_reg);

	radeon_ring_force_activity(rdev, ring);

	return radeon_ring_test_lockup(rdev, ring);

}

drivers/gpu/drm/radeon/r100.c

+1 −9
Original line number Diff line number Diff line
@@ -2162,7 +2162,6 @@ int r100_mc_wait_for_idle(struct radeon_device *rdev) 
bool r100_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring)

{

	u32 rbbm_status;

	int r;



	rbbm_status = RREG32(R_000E40_RBBM_STATUS);

	if (!G_000E40_GUI_ACTIVE(rbbm_status)) {
@@ -2170,14 +2169,7 @@ bool r100_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring) 
		return false;

	}

	/* force CP activities */

	r = radeon_ring_lock(rdev, ring, 2);

	if (!r) {

		/* PACKET2 NOP */

		radeon_ring_write(ring, 0x80000000);

		radeon_ring_write(ring, 0x80000000);

		radeon_ring_unlock_commit(rdev, ring);

	}

	ring->rptr = RREG32(ring->rptr_reg);

	radeon_ring_force_activity(rdev, ring);

	return radeon_ring_test_lockup(rdev, ring);

}

drivers/gpu/drm/radeon/r300.c

+1 −9
Original line number Diff line number Diff line
@@ -380,7 +380,6 @@ void r300_gpu_init(struct radeon_device *rdev) 
bool r300_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring)

{

	u32 rbbm_status;

	int r;



	rbbm_status = RREG32(R_000E40_RBBM_STATUS);

	if (!G_000E40_GUI_ACTIVE(rbbm_status)) {
@@ -388,14 +387,7 @@ bool r300_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring) 
		return false;

	}

	/* force CP activities */

	r = radeon_ring_lock(rdev, ring, 2);

	if (!r) {

		/* PACKET2 NOP */

		radeon_ring_write(ring, 0x80000000);

		radeon_ring_write(ring, 0x80000000);

		radeon_ring_unlock_commit(rdev, ring);

	}

	ring->rptr = RREG32(RADEON_CP_RB_RPTR);

	radeon_ring_force_activity(rdev, ring);

	return radeon_ring_test_lockup(rdev, ring);

}

drivers/gpu/drm/radeon/r600.c

+1 −9
Original line number Diff line number Diff line
@@ -1350,7 +1350,6 @@ bool r600_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring) 
	u32 srbm_status;

	u32 grbm_status;

	u32 grbm_status2;

	int r;



	srbm_status = RREG32(R_000E50_SRBM_STATUS);

	grbm_status = RREG32(R_008010_GRBM_STATUS);
@@ -1360,14 +1359,7 @@ bool r600_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring) 
		return false;

	}

	/* force CP activities */

	r = radeon_ring_lock(rdev, ring, 2);

	if (!r) {

		/* PACKET2 NOP */

		radeon_ring_write(ring, 0x80000000);

		radeon_ring_write(ring, 0x80000000);

		radeon_ring_unlock_commit(rdev, ring);

	}

	ring->rptr = RREG32(ring->rptr_reg);

	radeon_ring_force_activity(rdev, ring);

	return radeon_ring_test_lockup(rdev, ring);

}