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

Commit f712812e authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms: make ring_start, ring_test, and ib_test per ring 



Each ring type may need a different variant.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarChristian <König&lt;christian.koenig@amd.com>
Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Reviewed-by: default avatarJerome Glisse <jglisse@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent dfb276f0

drivers/gpu/drm/radeon/evergreen.c

+2 −2
Original line number Diff line number Diff line
@@ -1539,7 +1539,7 @@ int evergreen_cp_resume(struct radeon_device *rdev) 


	evergreen_cp_start(rdev);

	ring->ready = true;

	r = radeon_ring_test(rdev, ring);

	r = radeon_ring_test(rdev, RADEON_RING_TYPE_GFX_INDEX, ring);

	if (r) {

		ring->ready = false;

		return r;
@@ -3237,7 +3237,7 @@ static int evergreen_startup(struct radeon_device *rdev) 
	if (r)

		return r;



	r = r600_ib_test(rdev, RADEON_RING_TYPE_GFX_INDEX);

	r = radeon_ib_test(rdev, RADEON_RING_TYPE_GFX_INDEX, &rdev->ring[RADEON_RING_TYPE_GFX_INDEX]);

	if (r) {

		DRM_ERROR("radeon: failed testing IB (%d).\n", r);

		rdev->accel_working = false;

drivers/gpu/drm/radeon/ni.c

+2 −2
Original line number Diff line number Diff line
@@ -1318,7 +1318,7 @@ int cayman_cp_resume(struct radeon_device *rdev) 
	rdev->ring[CAYMAN_RING_TYPE_CP1_INDEX].ready = false;

	rdev->ring[CAYMAN_RING_TYPE_CP2_INDEX].ready = false;

	/* this only test cp0 */

	r = radeon_ring_test(rdev, &rdev->ring[RADEON_RING_TYPE_GFX_INDEX]);

	r = radeon_ring_test(rdev, RADEON_RING_TYPE_GFX_INDEX, &rdev->ring[RADEON_RING_TYPE_GFX_INDEX]);

	if (r) {

		rdev->ring[RADEON_RING_TYPE_GFX_INDEX].ready = false;

		rdev->ring[CAYMAN_RING_TYPE_CP1_INDEX].ready = false;
@@ -1518,7 +1518,7 @@ static int cayman_startup(struct radeon_device *rdev) 
	if (r)

		return r;



	r = r600_ib_test(rdev, RADEON_RING_TYPE_GFX_INDEX);

	r = radeon_ib_test(rdev, RADEON_RING_TYPE_GFX_INDEX, &rdev->ring[RADEON_RING_TYPE_GFX_INDEX]);

	if (r) {

		DRM_ERROR("radeon: failed testing IB (%d).\n", r);

		rdev->accel_working = false;

drivers/gpu/drm/radeon/r100.c

+5 −6
Original line number Diff line number Diff line
@@ -970,9 +970,8 @@ static int r100_cp_wait_for_idle(struct radeon_device *rdev) 
	return -1;

}



void r100_ring_start(struct radeon_device *rdev)

void r100_ring_start(struct radeon_device *rdev, struct radeon_ring *ring)

{

	struct radeon_ring *ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX];

	int r;



	r = radeon_ring_lock(rdev, ring, 2);
@@ -1183,8 +1182,8 @@ int r100_cp_init(struct radeon_device *rdev, unsigned ring_size) 
	WREG32(RADEON_CP_RB_WPTR_DELAY, 0);

	WREG32(RADEON_CP_CSQ_MODE, 0x00004D4D);

	WREG32(RADEON_CP_CSQ_CNTL, RADEON_CSQ_PRIBM_INDBM);

	radeon_ring_start(rdev);

	r = radeon_ring_test(rdev, ring);

	radeon_ring_start(rdev, RADEON_RING_TYPE_GFX_INDEX, &rdev->ring[RADEON_RING_TYPE_GFX_INDEX]);

	r = radeon_ring_test(rdev, RADEON_RING_TYPE_GFX_INDEX, ring);

	if (r) {

		DRM_ERROR("radeon: cp isn't working (%d).\n", r);

		return r;
@@ -3743,7 +3742,7 @@ void r100_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib) 
	radeon_ring_write(ring, ib->length_dw);

}



int r100_ib_test(struct radeon_device *rdev)

int r100_ib_test(struct radeon_device *rdev, struct radeon_ring *ring)

{

	struct radeon_ib *ib;

	uint32_t scratch;
@@ -3968,7 +3967,7 @@ static int r100_startup(struct radeon_device *rdev) 
	if (r)

		return r;



	r = r100_ib_test(rdev);

	r = radeon_ib_test(rdev, RADEON_RING_TYPE_GFX_INDEX, &rdev->ring[RADEON_RING_TYPE_GFX_INDEX]);

	if (r) {

		dev_err(rdev->dev, "failed testing IB (%d).\n", r);

		rdev->accel_working = false;

drivers/gpu/drm/radeon/r300.c

+2 −3
Original line number Diff line number Diff line
@@ -206,9 +206,8 @@ void r300_fence_ring_emit(struct radeon_device *rdev, 
	radeon_ring_write(ring, RADEON_SW_INT_FIRE);

}



void r300_ring_start(struct radeon_device *rdev)

void r300_ring_start(struct radeon_device *rdev, struct radeon_ring *ring)

{

	struct radeon_ring *ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX];

	unsigned gb_tile_config;

	int r;
@@ -1419,7 +1418,7 @@ static int r300_startup(struct radeon_device *rdev) 
	if (r)

		return r;



	r = r100_ib_test(rdev);

	r = radeon_ib_test(rdev, RADEON_RING_TYPE_GFX_INDEX, &rdev->ring[RADEON_RING_TYPE_GFX_INDEX]);

	if (r) {

		dev_err(rdev->dev, "failed testing IB (%d).\n", r);

		rdev->accel_working = false;

drivers/gpu/drm/radeon/r420.c

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static int r420_startup(struct radeon_device *rdev) 
	if (r)

		return r;



	r = r100_ib_test(rdev);

	r = radeon_ib_test(rdev, RADEON_RING_TYPE_GFX_INDEX, &rdev->ring[RADEON_RING_TYPE_GFX_INDEX]);

	if (r) {

		dev_err(rdev->dev, "failed testing IB (%d).\n", r);

		rdev->accel_working = false;