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

Commit 0e3d50bf authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon/dce6: fix display powergating 



Only enable it when we disable the display rather than
at DPMS time since enabling it requires a full modeset
to restore the display state.  Fixes blank screens in
certain cases.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 7271c7f9

drivers/gpu/drm/radeon/atombios_crtc.c

+2 −4
Original line number Diff line number Diff line
@@ -252,8 +252,6 @@ void atombios_crtc_dpms(struct drm_crtc *crtc, int mode) 
		radeon_crtc->enabled = true;

		/* adjust pm to dpms changes BEFORE enabling crtcs */

		radeon_pm_compute_clocks(rdev);

		if (ASIC_IS_DCE6(rdev) && !radeon_crtc->in_mode_set)

			atombios_powergate_crtc(crtc, ATOM_DISABLE);

		atombios_enable_crtc(crtc, ATOM_ENABLE);

		if (ASIC_IS_DCE3(rdev) && !ASIC_IS_DCE6(rdev))

			atombios_enable_crtc_memreq(crtc, ATOM_ENABLE);
@@ -271,8 +269,6 @@ void atombios_crtc_dpms(struct drm_crtc *crtc, int mode) 
			atombios_enable_crtc_memreq(crtc, ATOM_DISABLE);

		atombios_enable_crtc(crtc, ATOM_DISABLE);

		radeon_crtc->enabled = false;

		if (ASIC_IS_DCE6(rdev) && !radeon_crtc->in_mode_set)

			atombios_powergate_crtc(crtc, ATOM_ENABLE);

		/* adjust pm to dpms changes AFTER disabling crtcs */

		radeon_pm_compute_clocks(rdev);

		break;
@@ -1844,6 +1840,8 @@ static void atombios_crtc_disable(struct drm_crtc *crtc) 
	int i;



	atombios_crtc_dpms(crtc, DRM_MODE_DPMS_OFF);

	if (ASIC_IS_DCE6(rdev))

		atombios_powergate_crtc(crtc, ATOM_ENABLE);



	for (i = 0; i < rdev->num_crtc; i++) {

		if (rdev->mode_info.crtcs[i] &&