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

Commit 655efd3d authored by Jerome Glisse's avatar Jerome Glisse Committed by Dave Airlie
Browse files

drm/radeon/kms: don't call suspend path before cleaning up GPU 



In suspend path we unmap the GART table while in cleaning up
path we will unbind buffer and thus try to write to unmapped
GART leading to oops. In order to avoid this we don't call the
suspend path in cleanup path. Cleanup path is clever enough
to desactive GPU like the suspend path is doing, thus this was
redondant.

Tested on: RV370, R420, RV515, RV570, RV610, RV770 (all PCIE)

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

drivers/gpu/drm/radeon/r100.c

+1 −3
Original line number Diff line number Diff line
@@ -3375,7 +3375,6 @@ int r100_suspend(struct radeon_device *rdev) 


void r100_fini(struct radeon_device *rdev)

{

	r100_suspend(rdev);

	r100_cp_fini(rdev);

	r100_wb_fini(rdev);

	r100_ib_fini(rdev);
@@ -3487,13 +3486,12 @@ int r100_init(struct radeon_device *rdev) 
	if (r) {

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

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

		r100_suspend(rdev);

		r100_cp_fini(rdev);

		r100_wb_fini(rdev);

		r100_ib_fini(rdev);

		radeon_irq_kms_fini(rdev);

		if (rdev->flags & RADEON_IS_PCI)

			r100_pci_gart_fini(rdev);

		radeon_irq_kms_fini(rdev);

		rdev->accel_working = false;

	}

	return 0;

drivers/gpu/drm/radeon/r300.c

+2 −3
Original line number Diff line number Diff line
@@ -1327,7 +1327,6 @@ int r300_suspend(struct radeon_device *rdev) 


void r300_fini(struct radeon_device *rdev)

{

	r300_suspend(rdev);

	r100_cp_fini(rdev);

	r100_wb_fini(rdev);

	r100_ib_fini(rdev);
@@ -1418,15 +1417,15 @@ int r300_init(struct radeon_device *rdev) 
	if (r) {

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

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

		r300_suspend(rdev);

		r100_cp_fini(rdev);

		r100_wb_fini(rdev);

		r100_ib_fini(rdev);

		radeon_irq_kms_fini(rdev);

		if (rdev->flags & RADEON_IS_PCIE)

			rv370_pcie_gart_fini(rdev);

		if (rdev->flags & RADEON_IS_PCI)

			r100_pci_gart_fini(rdev);

		radeon_irq_kms_fini(rdev);

		radeon_agp_fini(rdev);

		rdev->accel_working = false;

	}

	return 0;

drivers/gpu/drm/radeon/r420.c

+1 −2
Original line number Diff line number Diff line
@@ -389,16 +389,15 @@ int r420_init(struct radeon_device *rdev) 
	if (r) {

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

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

		r420_suspend(rdev);

		r100_cp_fini(rdev);

		r100_wb_fini(rdev);

		r100_ib_fini(rdev);

		radeon_irq_kms_fini(rdev);

		if (rdev->flags & RADEON_IS_PCIE)

			rv370_pcie_gart_fini(rdev);

		if (rdev->flags & RADEON_IS_PCI)

			r100_pci_gart_fini(rdev);

		radeon_agp_fini(rdev);

		radeon_irq_kms_fini(rdev);

		rdev->accel_working = false;

	}

	return 0;

drivers/gpu/drm/radeon/r520.c

+1 −2
Original line number Diff line number Diff line
@@ -294,13 +294,12 @@ int r520_init(struct radeon_device *rdev) 
	if (r) {

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

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

		rv515_suspend(rdev);

		r100_cp_fini(rdev);

		r100_wb_fini(rdev);

		r100_ib_fini(rdev);

		radeon_irq_kms_fini(rdev);

		rv370_pcie_gart_fini(rdev);

		radeon_agp_fini(rdev);

		radeon_irq_kms_fini(rdev);

		rdev->accel_working = false;

	}

	return 0;

drivers/gpu/drm/radeon/r600.c

+13 −8
Original line number Diff line number Diff line
@@ -1654,6 +1654,12 @@ void r600_ring_init(struct radeon_device *rdev, unsigned ring_size) 
	rdev->cp.align_mask = 16 - 1;

}



void r600_cp_fini(struct radeon_device *rdev)

{

	r600_cp_stop(rdev);

	radeon_ring_fini(rdev);

}





/*

 * GPU scratch registers helpers function.
@@ -2055,9 +2061,11 @@ int r600_init(struct radeon_device *rdev) 
	rdev->accel_working = true;

	r = r600_startup(rdev);

	if (r) {

		r600_suspend(rdev);

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

		r600_cp_fini(rdev);

		r600_wb_fini(rdev);

		radeon_ring_fini(rdev);

		r600_irq_fini(rdev);

		radeon_irq_kms_fini(rdev);

		r600_pcie_gart_fini(rdev);

		rdev->accel_working = false;

	}
@@ -2083,20 +2091,17 @@ int r600_init(struct radeon_device *rdev) 


void r600_fini(struct radeon_device *rdev)

{

	/* Suspend operations */

	r600_suspend(rdev);



	r600_audio_fini(rdev);

	r600_blit_fini(rdev);

	r600_cp_fini(rdev);

	r600_wb_fini(rdev);

	r600_irq_fini(rdev);

	radeon_irq_kms_fini(rdev);

	radeon_ring_fini(rdev);

	r600_wb_fini(rdev);

	r600_pcie_gart_fini(rdev);

	radeon_agp_fini(rdev);

	radeon_gem_fini(rdev);

	radeon_fence_driver_fini(rdev);

	radeon_clocks_fini(rdev);

	radeon_agp_fini(rdev);

	radeon_bo_fini(rdev);

	radeon_atombios_fini(rdev);

	kfree(rdev->bios);