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

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

drm/radeon: use central function for IB testing 



Removing all the different error messages and
having just one standard behaviour over all
chipset generations.

Signed-off-by: default avatarChristian König <deathsimple@vodafone.de>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarJerome Glisse <jglisse@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent ec1a6cce

drivers/gpu/drm/radeon/evergreen.c

+2 −5
Original line number Diff line number Diff line
@@ -3376,12 +3376,9 @@ static int evergreen_startup(struct radeon_device *rdev) 
	if (r)

		return r;



	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;

	r = radeon_ib_ring_tests(rdev);

	if (r)

		return r;

	}



	r = r600_audio_init(rdev);

	if (r) {

drivers/gpu/drm/radeon/ni.c

+2 −5
Original line number Diff line number Diff line
@@ -1601,12 +1601,9 @@ static int cayman_startup(struct radeon_device *rdev) 
	if (r)

		return r;



	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;

	r = radeon_ib_ring_tests(rdev);

	if (r)

		return r;

	}



	r = radeon_vm_manager_start(rdev);

	if (r)

drivers/gpu/drm/radeon/r100.c

+2 −5
Original line number Diff line number Diff line
@@ -3968,12 +3968,9 @@ static int r100_startup(struct radeon_device *rdev) 
	if (r)

		return r;



	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;

	r = radeon_ib_ring_tests(rdev);

	if (r)

		return r;

	}



	return 0;

}

drivers/gpu/drm/radeon/r300.c

+2 −5
Original line number Diff line number Diff line
@@ -1417,12 +1417,9 @@ static int r300_startup(struct radeon_device *rdev) 
	if (r)

		return r;



	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;

	r = radeon_ib_ring_tests(rdev);

	if (r)

		return r;

	}



	return 0;

}

drivers/gpu/drm/radeon/r420.c

+2 −5
Original line number Diff line number Diff line
@@ -279,12 +279,9 @@ static int r420_startup(struct radeon_device *rdev) 
	if (r)

		return r;



	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;

	r = radeon_ib_ring_tests(rdev);

	if (r)

		return r;

	}



	return 0;

}