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

Commit 62a8ea3f authored by Jerome Glisse's avatar Jerome Glisse Committed by Dave Airlie
Browse files

drm/radeon/kms: Remove old init path as no hw use it anymore 



This remove old init path and allow code cleanup, now all hw
use the new init path, see top of radeon.h for description of
this.

Signed-off-by: default avatarJerome Glisse <jglisse@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent c010f800

drivers/gpu/drm/radeon/r100.c

+0 −1
Original line number Diff line number Diff line
@@ -3176,7 +3176,6 @@ int r100_init(struct radeon_device *rdev) 
{

	int r;



	rdev->new_init_path = true;

	/* Register debugfs file specific to this group of asics */

	r100_debugfs(rdev);

	/* Disable VGA */

drivers/gpu/drm/radeon/r300.c

+0 −1
Original line number Diff line number Diff line
@@ -1275,7 +1275,6 @@ int r300_init(struct radeon_device *rdev) 
{

	int r;



	rdev->new_init_path = true;

	/* Disable VGA */

	r100_vga_render_disable(rdev);

	/* Initialize scratch registers */

drivers/gpu/drm/radeon/r420.c

+0 −1
Original line number Diff line number Diff line
@@ -272,7 +272,6 @@ int r420_init(struct radeon_device *rdev) 
{

	int r;



	rdev->new_init_path = true;

	/* Initialize scratch registers */

	radeon_scratch_init(rdev);

	/* Initialize surface registers */

drivers/gpu/drm/radeon/r520.c

+0 −1
Original line number Diff line number Diff line
@@ -228,7 +228,6 @@ int r520_init(struct radeon_device *rdev) 
{

	int r;



	rdev->new_init_path = true;

	/* Initialize scratch registers */

	radeon_scratch_init(rdev);

	/* Initialize surface registers */

drivers/gpu/drm/radeon/r600.c

+2 −3
Original line number Diff line number Diff line
@@ -1531,7 +1531,7 @@ int r600_resume(struct radeon_device *rdev) 
		return r;

	}



	r = radeon_ib_test(rdev);

	r = r600_ib_test(rdev);

	if (r) {

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

		return r;
@@ -1562,7 +1562,6 @@ int r600_init(struct radeon_device *rdev) 
{

	int r;



	rdev->new_init_path = true;

	r = radeon_dummy_page_init(rdev);

	if (r)

		return r;
@@ -1653,7 +1652,7 @@ int r600_init(struct radeon_device *rdev) 
			DRM_ERROR("radeon: failled initializing IB pool (%d).\n", r);

			rdev->accel_working = false;

		}

		r = radeon_ib_test(rdev);

		r = r600_ib_test(rdev);

		if (r) {

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

			rdev->accel_working = false;