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

Commit bc6a6295 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: resume old pm late 



Moving the pm resume up in the init order to fix
dpm seems to have regressed somes cases with the old
pm code.  Move it back to late resume.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 14eedc32

drivers/gpu/drm/radeon/cik.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -7902,6 +7902,7 @@ int cik_resume(struct radeon_device *rdev) 
	/* init golden registers */

	/* init golden registers */

	cik_init_golden_registers(rdev);

	cik_init_golden_registers(rdev);





	if (rdev->pm.pm_method == PM_METHOD_DPM)

		radeon_pm_resume(rdev);

		radeon_pm_resume(rdev);





	rdev->accel_working = true;

	rdev->accel_working = true;

drivers/gpu/drm/radeon/evergreen.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -5299,6 +5299,7 @@ int evergreen_resume(struct radeon_device *rdev) 
	/* init golden registers */

	/* init golden registers */

	evergreen_init_golden_registers(rdev);

	evergreen_init_golden_registers(rdev);





	if (rdev->pm.pm_method == PM_METHOD_DPM)

		radeon_pm_resume(rdev);

		radeon_pm_resume(rdev);





	rdev->accel_working = true;

	rdev->accel_working = true;

drivers/gpu/drm/radeon/ni.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -2105,6 +2105,7 @@ int cayman_resume(struct radeon_device *rdev) 
	/* init golden registers */

	/* init golden registers */

	ni_init_golden_registers(rdev);

	ni_init_golden_registers(rdev);





	if (rdev->pm.pm_method == PM_METHOD_DPM)

		radeon_pm_resume(rdev);

		radeon_pm_resume(rdev);





	rdev->accel_working = true;

	rdev->accel_working = true;

drivers/gpu/drm/radeon/r100.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -3942,8 +3942,6 @@ int r100_resume(struct radeon_device *rdev) 
	/* Initialize surface registers */

	/* Initialize surface registers */

	radeon_surface_init(rdev);

	radeon_surface_init(rdev);





	radeon_pm_resume(rdev);



	rdev->accel_working = true;

	rdev->accel_working = true;

	r = r100_startup(rdev);

	r = r100_startup(rdev);

	if (r) {

	if (r) {

drivers/gpu/drm/radeon/r300.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -1430,8 +1430,6 @@ int r300_resume(struct radeon_device *rdev) 
	/* Initialize surface registers */

	/* Initialize surface registers */

	radeon_surface_init(rdev);

	radeon_surface_init(rdev);





	radeon_pm_resume(rdev);



	rdev->accel_working = true;

	rdev->accel_working = true;

	r = r300_startup(rdev);

	r = r300_startup(rdev);

	if (r) {

	if (r) {