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

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

drm/radeon/atom: powergating fixes for DCE6 



Power gating is per crtc pair, but the powergating registers
should be called individually.  The hw handles power up/down
properly.  The pair is powered up if either crtc in the pair
is powered up and the pair is not powered down until both
crtcs in the pair are powered down.  This simplifies
programming and should save additional power as the previous
code never actually power gated the crtc pair.

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

drivers/gpu/drm/radeon/atombios_crtc.c

+2 −20
Original line number Diff line number Diff line
@@ -258,7 +258,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);

		/* disable crtc pair power gating before programming */

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

			atombios_powergate_crtc(crtc, ATOM_DISABLE);

		atombios_enable_crtc(crtc, ATOM_ENABLE);
@@ -278,25 +277,8 @@ 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;

		/* power gating is per-pair */

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

			struct drm_crtc *other_crtc;

			struct radeon_crtc *other_radeon_crtc;

			list_for_each_entry(other_crtc, &rdev->ddev->mode_config.crtc_list, head) {

				other_radeon_crtc = to_radeon_crtc(other_crtc);

				if (((radeon_crtc->crtc_id == 0) && (other_radeon_crtc->crtc_id == 1)) ||

				    ((radeon_crtc->crtc_id == 1) && (other_radeon_crtc->crtc_id == 0)) ||

				    ((radeon_crtc->crtc_id == 2) && (other_radeon_crtc->crtc_id == 3)) ||

				    ((radeon_crtc->crtc_id == 3) && (other_radeon_crtc->crtc_id == 2)) ||

				    ((radeon_crtc->crtc_id == 4) && (other_radeon_crtc->crtc_id == 5)) ||

				    ((radeon_crtc->crtc_id == 5) && (other_radeon_crtc->crtc_id == 4))) {

					/* if both crtcs in the pair are off, enable power gating */

					if (other_radeon_crtc->enabled == false)

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

			atombios_powergate_crtc(crtc, ATOM_ENABLE);

					break;

				}

			}

		}

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

		radeon_pm_compute_clocks(rdev);

		break;