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

Commit 2e97140d authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon/px: fix module unload 

Use the new vga_switcheroo_fini_domain_pm_ops function
to unregister the pm ops.

Based on a patch from:
Pali Rohár <pali.rohar@gmail.com>

bug:
https://bugzilla.kernel.org/show_bug.cgi?id=84431



Reviewed-by: default avatarBen Skeggs <bskeggs@redhat.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarPali Rohár <pali.rohar@gmail.com>
Cc: Ben Skeggs <bskeggs@redhat.com>
parent 766a53d0

drivers/gpu/drm/radeon/radeon_device.c

+9 −2
Original line number Diff line number Diff line
@@ -1393,7 +1393,7 @@ int radeon_device_init(struct radeon_device *rdev, 


	r = radeon_init(rdev);

	if (r)

		return r;

		goto failed;



	r = radeon_ib_ring_tests(rdev);

	if (r)
@@ -1413,7 +1413,7 @@ int radeon_device_init(struct radeon_device *rdev, 
		radeon_agp_disable(rdev);

		r = radeon_init(rdev);

		if (r)

			return r;

			goto failed;

	}



	if ((radeon_testing & 1)) {
@@ -1435,6 +1435,11 @@ int radeon_device_init(struct radeon_device *rdev, 
			DRM_INFO("radeon: acceleration disabled, skipping benchmarks\n");

	}

	return 0;



failed:

	if (runtime)

		vga_switcheroo_fini_domain_pm_ops(rdev->dev);

	return r;

}



static void radeon_debugfs_remove_files(struct radeon_device *rdev);
@@ -1455,6 +1460,8 @@ void radeon_device_fini(struct radeon_device *rdev) 
	radeon_bo_evict_vram(rdev);

	radeon_fini(rdev);

	vga_switcheroo_unregister_client(rdev->pdev);

	if (rdev->flags & RADEON_IS_PX)

		vga_switcheroo_fini_domain_pm_ops(rdev->dev);

	vga_client_register(rdev->pdev, NULL, NULL, NULL);

	if (rdev->rio_mem)

		pci_iounmap(rdev->pdev, rdev->rio_mem);