Browse Source

drm/radeon/dpm: use stored max_vddc rather than looking it up

When we parse the power tables use the stored mac_vddc value
rather than lookig it up manually each time.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Alex Deucher 11 years ago
parent
commit
299302294e
2 changed files with 4 additions and 6 deletions
  1. 2 3
      drivers/gpu/drm/radeon/ni_dpm.c
  2. 2 3
      drivers/gpu/drm/radeon/rv770_dpm.c

+ 2 - 3
drivers/gpu/drm/radeon/ni_dpm.c

@@ -3945,7 +3945,6 @@ static void ni_parse_pplib_clock_info(struct radeon_device *rdev,
 	struct rv7xx_power_info *pi = rv770_get_pi(rdev);
 	struct rv7xx_power_info *pi = rv770_get_pi(rdev);
 	struct evergreen_power_info *eg_pi = evergreen_get_pi(rdev);
 	struct evergreen_power_info *eg_pi = evergreen_get_pi(rdev);
 	struct ni_ps *ps = ni_get_ps(rps);
 	struct ni_ps *ps = ni_get_ps(rps);
-	u16 vddc;
 	struct rv7xx_pl *pl = &ps->performance_levels[index];
 	struct rv7xx_pl *pl = &ps->performance_levels[index];
 
 
 	ps->performance_level_count = index + 1;
 	ps->performance_level_count = index + 1;
@@ -3961,8 +3960,8 @@ static void ni_parse_pplib_clock_info(struct radeon_device *rdev,
 
 
 	/* patch up vddc if necessary */
 	/* patch up vddc if necessary */
 	if (pl->vddc == 0xff01) {
 	if (pl->vddc == 0xff01) {
-		if (radeon_atom_get_max_vddc(rdev, 0, 0, &vddc) == 0)
-			pl->vddc = vddc;
+		if (pi->max_vddc)
+			pl->vddc = pi->max_vddc;
 	}
 	}
 
 
 	if (rps->class & ATOM_PPLIB_CLASSIFICATION_ACPI) {
 	if (rps->class & ATOM_PPLIB_CLASSIFICATION_ACPI) {

+ 2 - 3
drivers/gpu/drm/radeon/rv770_dpm.c

@@ -2174,7 +2174,6 @@ static void rv7xx_parse_pplib_clock_info(struct radeon_device *rdev,
 	struct evergreen_power_info *eg_pi = evergreen_get_pi(rdev);
 	struct evergreen_power_info *eg_pi = evergreen_get_pi(rdev);
 	struct rv7xx_ps *ps = rv770_get_ps(rps);
 	struct rv7xx_ps *ps = rv770_get_ps(rps);
 	u32 sclk, mclk;
 	u32 sclk, mclk;
-	u16 vddc;
 	struct rv7xx_pl *pl;
 	struct rv7xx_pl *pl;
 
 
 	switch (index) {
 	switch (index) {
@@ -2214,8 +2213,8 @@ static void rv7xx_parse_pplib_clock_info(struct radeon_device *rdev,
 
 
 	/* patch up vddc if necessary */
 	/* patch up vddc if necessary */
 	if (pl->vddc == 0xff01) {
 	if (pl->vddc == 0xff01) {
-		if (radeon_atom_get_max_vddc(rdev, 0, 0, &vddc) == 0)
-			pl->vddc = vddc;
+		if (pi->max_vddc)
+			pl->vddc = pi->max_vddc;
 	}
 	}
 
 
 	if (rps->class & ATOM_PPLIB_CLASSIFICATION_ACPI) {
 	if (rps->class & ATOM_PPLIB_CLASSIFICATION_ACPI) {