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

Revert "drm/radeon: drop btc_get_max_clock_from_voltage_dependency_table" 

This reverts commit fc9dfeb1.

There are still some stability problems on some SI boards so bring
this back.
parent dfda0df3

drivers/gpu/drm/radeon/btc_dpm.c

+17 −0
Original line number Diff line number Diff line
@@ -1170,6 +1170,23 @@ static const struct radeon_blacklist_clocks btc_blacklist_clocks[] = 
        { 25000, 30000, RADEON_SCLK_UP }

};



void btc_get_max_clock_from_voltage_dependency_table(struct radeon_clock_voltage_dependency_table *table,

						     u32 *max_clock)

{

	u32 i, clock = 0;



	if ((table == NULL) || (table->count == 0)) {

		*max_clock = clock;

		return;

	}



	for (i = 0; i < table->count; i++) {

		if (clock < table->entries[i].clk)

			clock = table->entries[i].clk;

	}

	*max_clock = clock;

}



void btc_apply_voltage_dependency_rules(struct radeon_clock_voltage_dependency_table *table,

					u32 clock, u16 max_voltage, u16 *voltage)

{

drivers/gpu/drm/radeon/btc_dpm.h

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ void btc_adjust_clock_combinations(struct radeon_device *rdev, 
				   struct rv7xx_pl *pl);

void btc_apply_voltage_dependency_rules(struct radeon_clock_voltage_dependency_table *table,

					u32 clock, u16 max_voltage, u16 *voltage);

void btc_get_max_clock_from_voltage_dependency_table(struct radeon_clock_voltage_dependency_table *table,

						     u32 *max_clock);

void btc_apply_voltage_delta_rules(struct radeon_device *rdev,

				   u16 max_vddc, u16 max_vddci,

				   u16 *vddc, u16 *vddci);