UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/radeon: export radeon_atombios_lookup_gpio 

We need it for dpm.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Alex Deucher 2014-11-07 11:16:25 -05:00
parent 129acb7c0b
commit 09e619c0c6
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/radeon/radeon_atombios.c
View File

@ -196,8 +196,8 @@ void radeon_atombios_i2c_init(struct radeon_device *rdev)
} }
} }
static struct radeon_gpio_rec radeon_lookup_gpio(struct radeon_device *rdev, struct radeon_gpio_rec radeon_atombios_lookup_gpio(struct radeon_device *rdev,
u8 id) u8 id)
{ {
struct atom_context *ctx = rdev->mode_info.atom_context; struct atom_context *ctx = rdev->mode_info.atom_context;
struct radeon_gpio_rec gpio; struct radeon_gpio_rec gpio;
@ -801,7 +801,7 @@ bool radeon_get_atom_connector_info_from_object_table(struct drm_device *dev)
hpd_record = hpd_record =
(ATOM_HPD_INT_RECORD *) (ATOM_HPD_INT_RECORD *)
record; record;
gpio = radeon_lookup_gpio(rdev, gpio = radeon_atombios_lookup_gpio(rdev,
hpd_record->ucHPDIntGPIOID); hpd_record->ucHPDIntGPIOID);
hpd = radeon_atom_get_hpd_info_from_gpio(rdev, &gpio); hpd = radeon_atom_get_hpd_info_from_gpio(rdev, &gpio);
hpd.plugged_state = hpd_record->ucPlugged_PinState; hpd.plugged_state = hpd_record->ucPlugged_PinState;
@ -2128,7 +2128,7 @@ static int radeon_atombios_parse_power_table_1_3(struct radeon_device *rdev)
rdev->pm.power_state[state_index].clock_info[0].voltage.type = rdev->pm.power_state[state_index].clock_info[0].voltage.type =
VOLTAGE_GPIO; VOLTAGE_GPIO;
rdev->pm.power_state[state_index].clock_info[0].voltage.gpio = rdev->pm.power_state[state_index].clock_info[0].voltage.gpio =
radeon_lookup_gpio(rdev, radeon_atombios_lookup_gpio(rdev,
power_info->info.asPowerPlayInfo[i].ucVoltageDropIndex); power_info->info.asPowerPlayInfo[i].ucVoltageDropIndex);
if (misc & ATOM_PM_MISCINFO_VOLTAGE_DROP_ACTIVE_HIGH) if (misc & ATOM_PM_MISCINFO_VOLTAGE_DROP_ACTIVE_HIGH)
rdev->pm.power_state[state_index].clock_info[0].voltage.active_high = rdev->pm.power_state[state_index].clock_info[0].voltage.active_high =
@ -2164,7 +2164,7 @@ static int radeon_atombios_parse_power_table_1_3(struct radeon_device *rdev)
rdev->pm.power_state[state_index].clock_info[0].voltage.type = rdev->pm.power_state[state_index].clock_info[0].voltage.type =
VOLTAGE_GPIO; VOLTAGE_GPIO;
rdev->pm.power_state[state_index].clock_info[0].voltage.gpio = rdev->pm.power_state[state_index].clock_info[0].voltage.gpio =
radeon_lookup_gpio(rdev, radeon_atombios_lookup_gpio(rdev,
power_info->info_2.asPowerPlayInfo[i].ucVoltageDropIndex); power_info->info_2.asPowerPlayInfo[i].ucVoltageDropIndex);
if (misc & ATOM_PM_MISCINFO_VOLTAGE_DROP_ACTIVE_HIGH) if (misc & ATOM_PM_MISCINFO_VOLTAGE_DROP_ACTIVE_HIGH)
rdev->pm.power_state[state_index].clock_info[0].voltage.active_high = rdev->pm.power_state[state_index].clock_info[0].voltage.active_high =
@ -2200,7 +2200,7 @@ static int radeon_atombios_parse_power_table_1_3(struct radeon_device *rdev)
rdev->pm.power_state[state_index].clock_info[0].voltage.type = rdev->pm.power_state[state_index].clock_info[0].voltage.type =
VOLTAGE_GPIO; VOLTAGE_GPIO;
rdev->pm.power_state[state_index].clock_info[0].voltage.gpio = rdev->pm.power_state[state_index].clock_info[0].voltage.gpio =
radeon_lookup_gpio(rdev, radeon_atombios_lookup_gpio(rdev,
power_info->info_3.asPowerPlayInfo[i].ucVoltageDropIndex); power_info->info_3.asPowerPlayInfo[i].ucVoltageDropIndex);
if (misc & ATOM_PM_MISCINFO_VOLTAGE_DROP_ACTIVE_HIGH) if (misc & ATOM_PM_MISCINFO_VOLTAGE_DROP_ACTIVE_HIGH)
rdev->pm.power_state[state_index].clock_info[0].voltage.active_high = rdev->pm.power_state[state_index].clock_info[0].voltage.active_high =

2
drivers/gpu/drm/radeon/radeon_mode.h
View File

@ -748,6 +748,8 @@ extern bool radeon_atombios_get_ppll_ss_info(struct radeon_device *rdev,
extern bool radeon_atombios_get_asic_ss_info(struct radeon_device *rdev, extern bool radeon_atombios_get_asic_ss_info(struct radeon_device *rdev,
struct radeon_atom_ss *ss, struct radeon_atom_ss *ss,
int id, u32 clock); int id, u32 clock);
extern struct radeon_gpio_rec radeon_atombios_lookup_gpio(struct radeon_device *rdev,
u8 id);
extern void radeon_compute_pll_legacy(struct radeon_pll *pll, extern void radeon_compute_pll_legacy(struct radeon_pll *pll,
uint64_t freq, uint64_t freq,