Commit 2898c348 authored by Christian König's avatar Christian König
Browse files

drm/radeon: remove ip_pool start/suspend 



The IB pool is in gart memory, so it is completely
superfluous to unpin / repin it on suspend / resume.

Signed-off-by: default avatarChristian König <deathsimple@vodafone.de>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b90ca986

drivers/gpu/drm/radeon/evergreen.c

+6 −11
Original line number Diff line number Diff line
@@ -3087,9 +3087,11 @@ static int evergreen_startup(struct radeon_device *rdev) 
	if (r)

		return r;



	r = radeon_ib_pool_start(rdev);

	if (r)

	r = radeon_ib_pool_init(rdev);

	if (r) {

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

		return r;

	}



	r = radeon_ib_ring_tests(rdev);

	if (r)
@@ -3137,7 +3139,6 @@ int evergreen_suspend(struct radeon_device *rdev) 
	struct radeon_ring *ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX];



	r600_audio_fini(rdev);

	radeon_ib_pool_suspend(rdev);

	r600_blit_suspend(rdev);

	r700_cp_stop(rdev);

	ring->ready = false;
@@ -3224,20 +3225,14 @@ int evergreen_init(struct radeon_device *rdev) 
	if (r)

		return r;



	r = radeon_ib_pool_init(rdev);

	rdev->accel_working = true;

	if (r) {

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

		rdev->accel_working = false;

	}



	r = evergreen_startup(rdev);

	if (r) {

		dev_err(rdev->dev, "disabling GPU acceleration\n");

		r700_cp_fini(rdev);

		r600_irq_fini(rdev);

		radeon_wb_fini(rdev);

		r100_ib_fini(rdev);

		radeon_ib_pool_fini(rdev);

		radeon_irq_kms_fini(rdev);

		evergreen_pcie_gart_fini(rdev);

		rdev->accel_working = false;
@@ -3264,7 +3259,7 @@ void evergreen_fini(struct radeon_device *rdev) 
	r700_cp_fini(rdev);

	r600_irq_fini(rdev);

	radeon_wb_fini(rdev);

	r100_ib_fini(rdev);

	radeon_ib_pool_fini(rdev);

	radeon_irq_kms_fini(rdev);

	evergreen_pcie_gart_fini(rdev);

	r600_vram_scratch_fini(rdev);

drivers/gpu/drm/radeon/ni.c

+6 −10
Original line number Diff line number Diff line
@@ -1270,9 +1270,11 @@ static int cayman_startup(struct radeon_device *rdev) 
	if (r)

		return r;



	r = radeon_ib_pool_start(rdev);

	if (r)

	r = radeon_ib_pool_init(rdev);

	if (r) {

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

		return r;

	}



	r = radeon_ib_ring_tests(rdev);

	if (r)
@@ -1313,7 +1315,6 @@ int cayman_resume(struct radeon_device *rdev) 
int cayman_suspend(struct radeon_device *rdev)

{

	r600_audio_fini(rdev);

	radeon_ib_pool_suspend(rdev);

	radeon_vm_manager_suspend(rdev);

	r600_blit_suspend(rdev);

	cayman_cp_enable(rdev, false);
@@ -1391,12 +1392,7 @@ int cayman_init(struct radeon_device *rdev) 
	if (r)

		return r;



	r = radeon_ib_pool_init(rdev);

	rdev->accel_working = true;

	if (r) {

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

		rdev->accel_working = false;

	}

	r = radeon_vm_manager_init(rdev);

	if (r) {

		dev_err(rdev->dev, "vm manager initialization failed (%d).\n", r);
@@ -1410,7 +1406,7 @@ int cayman_init(struct radeon_device *rdev) 
		if (rdev->flags & RADEON_IS_IGP)

			si_rlc_fini(rdev);

		radeon_wb_fini(rdev);

		r100_ib_fini(rdev);

		radeon_ib_pool_fini(rdev);

		radeon_vm_manager_fini(rdev);

		radeon_irq_kms_fini(rdev);

		cayman_pcie_gart_fini(rdev);
@@ -1441,7 +1437,7 @@ void cayman_fini(struct radeon_device *rdev) 
		si_rlc_fini(rdev);

	radeon_wb_fini(rdev);

	radeon_vm_manager_fini(rdev);

	r100_ib_fini(rdev);

	radeon_ib_pool_fini(rdev);

	radeon_irq_kms_fini(rdev);

	cayman_pcie_gart_fini(rdev);

	r600_vram_scratch_fini(rdev);

drivers/gpu/drm/radeon/r100.c

+6 −17
Original line number Diff line number Diff line
@@ -3722,12 +3722,6 @@ int r100_ib_test(struct radeon_device *rdev, struct radeon_ring *ring) 
	return r;

}



void r100_ib_fini(struct radeon_device *rdev)

{

	radeon_ib_pool_suspend(rdev);

	radeon_ib_pool_fini(rdev);

}



void r100_mc_stop(struct radeon_device *rdev, struct r100_mc_save *save)

{

	/* Shutdown CP we shouldn't need to do that but better be safe than
@@ -3887,9 +3881,11 @@ static int r100_startup(struct radeon_device *rdev) 
		return r;

	}



	r = radeon_ib_pool_start(rdev);

	if (r)

	r = radeon_ib_pool_init(rdev);

	if (r) {

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

		return r;

	}



	r = radeon_ib_ring_tests(rdev);

	if (r)
@@ -3930,7 +3926,6 @@ int r100_resume(struct radeon_device *rdev) 


int r100_suspend(struct radeon_device *rdev)

{

	radeon_ib_pool_suspend(rdev);

	r100_cp_disable(rdev);

	radeon_wb_disable(rdev);

	r100_irq_disable(rdev);
@@ -3943,7 +3938,7 @@ void r100_fini(struct radeon_device *rdev) 
{

	r100_cp_fini(rdev);

	radeon_wb_fini(rdev);

	r100_ib_fini(rdev);

	radeon_ib_pool_fini(rdev);

	radeon_gem_fini(rdev);

	if (rdev->flags & RADEON_IS_PCI)

		r100_pci_gart_fini(rdev);
@@ -4050,20 +4045,14 @@ int r100_init(struct radeon_device *rdev) 
	}

	r100_set_safe_registers(rdev);



	r = radeon_ib_pool_init(rdev);

	rdev->accel_working = true;

	if (r) {

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

		rdev->accel_working = false;

	}



	r = r100_startup(rdev);

	if (r) {

		/* Somethings want wront with the accel init stop accel */

		dev_err(rdev->dev, "Disabling GPU acceleration\n");

		r100_cp_fini(rdev);

		radeon_wb_fini(rdev);

		r100_ib_fini(rdev);

		radeon_ib_pool_fini(rdev);

		radeon_irq_kms_fini(rdev);

		if (rdev->flags & RADEON_IS_PCI)

			r100_pci_gart_fini(rdev);

drivers/gpu/drm/radeon/r300.c

+6 −11
Original line number Diff line number Diff line
@@ -1391,9 +1391,11 @@ static int r300_startup(struct radeon_device *rdev) 
		return r;

	}



	r = radeon_ib_pool_start(rdev);

	if (r)

	r = radeon_ib_pool_init(rdev);

	if (r) {

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

		return r;

	}



	r = radeon_ib_ring_tests(rdev);

	if (r)
@@ -1436,7 +1438,6 @@ int r300_resume(struct radeon_device *rdev) 


int r300_suspend(struct radeon_device *rdev)

{

	radeon_ib_pool_suspend(rdev);

	r100_cp_disable(rdev);

	radeon_wb_disable(rdev);

	r100_irq_disable(rdev);
@@ -1451,7 +1452,7 @@ void r300_fini(struct radeon_device *rdev) 
{

	r100_cp_fini(rdev);

	radeon_wb_fini(rdev);

	r100_ib_fini(rdev);

	radeon_ib_pool_fini(rdev);

	radeon_gem_fini(rdev);

	if (rdev->flags & RADEON_IS_PCIE)

		rv370_pcie_gart_fini(rdev);
@@ -1538,20 +1539,14 @@ int r300_init(struct radeon_device *rdev) 
	}

	r300_set_reg_safe(rdev);



	r = radeon_ib_pool_init(rdev);

	rdev->accel_working = true;

	if (r) {

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

		rdev->accel_working = false;

	}



	r = r300_startup(rdev);

	if (r) {

		/* Somethings want wront with the accel init stop accel */

		dev_err(rdev->dev, "Disabling GPU acceleration\n");

		r100_cp_fini(rdev);

		radeon_wb_fini(rdev);

		r100_ib_fini(rdev);

		radeon_ib_pool_fini(rdev);

		radeon_irq_kms_fini(rdev);

		if (rdev->flags & RADEON_IS_PCIE)

			rv370_pcie_gart_fini(rdev);

drivers/gpu/drm/radeon/r420.c

+6 −11
Original line number Diff line number Diff line
@@ -275,9 +275,11 @@ static int r420_startup(struct radeon_device *rdev) 
	}

	r420_cp_errata_init(rdev);



	r = radeon_ib_pool_start(rdev);

	if (r)

	r = radeon_ib_pool_init(rdev);

	if (r) {

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

		return r;

	}



	r = radeon_ib_ring_tests(rdev);

	if (r)
@@ -324,7 +326,6 @@ int r420_resume(struct radeon_device *rdev) 


int r420_suspend(struct radeon_device *rdev)

{

	radeon_ib_pool_suspend(rdev);

	r420_cp_errata_fini(rdev);

	r100_cp_disable(rdev);

	radeon_wb_disable(rdev);
@@ -340,7 +341,7 @@ void r420_fini(struct radeon_device *rdev) 
{

	r100_cp_fini(rdev);

	radeon_wb_fini(rdev);

	r100_ib_fini(rdev);

	radeon_ib_pool_fini(rdev);

	radeon_gem_fini(rdev);

	if (rdev->flags & RADEON_IS_PCIE)

		rv370_pcie_gart_fini(rdev);
@@ -438,20 +439,14 @@ int r420_init(struct radeon_device *rdev) 
	}

	r420_set_reg_safe(rdev);



	r = radeon_ib_pool_init(rdev);

	rdev->accel_working = true;

	if (r) {

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

		rdev->accel_working = false;

	}



	r = r420_startup(rdev);

	if (r) {

		/* Somethings want wront with the accel init stop accel */

		dev_err(rdev->dev, "Disabling GPU acceleration\n");

		r100_cp_fini(rdev);

		radeon_wb_fini(rdev);

		r100_ib_fini(rdev);

		radeon_ib_pool_fini(rdev);

		radeon_irq_kms_fini(rdev);

		if (rdev->flags & RADEON_IS_PCIE)

			rv370_pcie_gart_fini(rdev);