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

Commit 7bf05cc1 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon/dpm: drop clk/voltage dependency filters for NI 

No longer needed now that the underlying bug was fixed in
b0880e87
(drm/radeon/dpm: fix vddci setup typo on cayman).

bug:
https://bugs.freedesktop.org/show_bug.cgi?id=69721



Reviewed-by: default avatarAlexandre Demers <alexandre.f.demers@gmail.com>
Tested-by: default avatarAlexandre Demers <alexandre.f.demers@gmail.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4adb34ef

drivers/gpu/drm/radeon/ni_dpm.c

+0 −24
Original line number Diff line number Diff line
@@ -789,7 +789,6 @@ static void ni_apply_state_adjust_rules(struct radeon_device *rdev, 
	bool disable_mclk_switching;

	u32 mclk;

	u16 vddci;

	u32 max_sclk_vddc, max_mclk_vddci, max_mclk_vddc;

	int i;



	if ((rdev->pm.dpm.new_active_crtc_count > 1) ||
@@ -816,29 +815,6 @@ static void ni_apply_state_adjust_rules(struct radeon_device *rdev, 
		}

	}



	/* limit clocks to max supported clocks based on voltage dependency tables */

	btc_get_max_clock_from_voltage_dependency_table(&rdev->pm.dpm.dyn_state.vddc_dependency_on_sclk,

							&max_sclk_vddc);

	btc_get_max_clock_from_voltage_dependency_table(&rdev->pm.dpm.dyn_state.vddci_dependency_on_mclk,

							&max_mclk_vddci);

	btc_get_max_clock_from_voltage_dependency_table(&rdev->pm.dpm.dyn_state.vddc_dependency_on_mclk,

							&max_mclk_vddc);



	for (i = 0; i < ps->performance_level_count; i++) {

		if (max_sclk_vddc) {

			if (ps->performance_levels[i].sclk > max_sclk_vddc)

				ps->performance_levels[i].sclk = max_sclk_vddc;

		}

		if (max_mclk_vddci) {

			if (ps->performance_levels[i].mclk > max_mclk_vddci)

				ps->performance_levels[i].mclk = max_mclk_vddci;

		}

		if (max_mclk_vddc) {

			if (ps->performance_levels[i].mclk > max_mclk_vddc)

				ps->performance_levels[i].mclk = max_mclk_vddc;

		}

	}



	/* XXX validate the min clocks required for display */



	/* adjust low state */