Module Name: src
Committed By: christos
Date: Sat Nov 1 21:46:10 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: ci_dpm.c evergreen_cs.c
rv770_dpm.c si_dpm.c sumo_dpm.c trinity_dpm.c
Log Message:
fix shadowing for min() and max() from libkern
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/radeon/ci_dpm.c \
src/sys/external/bsd/drm2/dist/drm/radeon/evergreen_cs.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/radeon/rv770_dpm.c \
src/sys/external/bsd/drm2/dist/drm/radeon/si_dpm.c \
src/sys/external/bsd/drm2/dist/drm/radeon/sumo_dpm.c \
src/sys/external/bsd/drm2/dist/drm/radeon/trinity_dpm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/radeon/ci_dpm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/ci_dpm.c:1.3 src/sys/external/bsd/drm2/dist/drm/radeon/ci_dpm.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/radeon/ci_dpm.c:1.3 Wed Sep 17 11:54:31 2014
+++ src/sys/external/bsd/drm2/dist/drm/radeon/ci_dpm.c Sat Nov 1 17:46:10 2014
@@ -361,29 +361,29 @@ static int ci_min_max_v_gnbl_pm_lid_from
struct ci_power_info *pi = ci_get_pi(rdev);
u8 *hi_vid = pi->smc_powertune_table.BapmVddCVidHiSidd;
u8 *lo_vid = pi->smc_powertune_table.BapmVddCVidLoSidd;
- int i, min, max;
+ int i, vmin, vmax;
- min = max = hi_vid[0];
+ vmin = vmax = hi_vid[0];
for (i = 0; i < 8; i++) {
if (0 != hi_vid[i]) {
- if (min > hi_vid[i])
- min = hi_vid[i];
- if (max < hi_vid[i])
- max = hi_vid[i];
+ if (vmin > hi_vid[i])
+ vmin = hi_vid[i];
+ if (vmax < hi_vid[i])
+ vmax = hi_vid[i];
}
if (0 != lo_vid[i]) {
- if (min > lo_vid[i])
- min = lo_vid[i];
- if (max < lo_vid[i])
- max = lo_vid[i];
+ if (vmin > lo_vid[i])
+ vmin = lo_vid[i];
+ if (vmax < lo_vid[i])
+ vmax = lo_vid[i];
}
}
- if ((min == 0) || (max == 0))
+ if ((vmin == 0) || (vmax == 0))
return -EINVAL;
- pi->smc_powertune_table.GnbLPMLMaxVid = (u8)max;
- pi->smc_powertune_table.GnbLPMLMinVid = (u8)min;
+ pi->smc_powertune_table.GnbLPMLMaxVid = (u8)vmax;
+ pi->smc_powertune_table.GnbLPMLMinVid = (u8)vmin;
return 0;
}
@@ -2028,15 +2028,15 @@ static u8 ci_get_sleep_divider_id_from_c
{
u32 i;
u32 tmp;
- u32 min = (min_sclk_in_sr > CISLAND_MINIMUM_ENGINE_CLOCK) ?
+ u32 vmin = (min_sclk_in_sr > CISLAND_MINIMUM_ENGINE_CLOCK) ?
min_sclk_in_sr : CISLAND_MINIMUM_ENGINE_CLOCK;
- if (sclk < min)
+ if (sclk < vmin)
return 0;
for (i = CISLAND_MAX_DEEPSLEEP_DIVIDER_ID; ; i--) {
tmp = sclk / (1 << i);
- if (tmp >= min || i == 0)
+ if (tmp >= vmin || i == 0)
break;
}
Index: src/sys/external/bsd/drm2/dist/drm/radeon/evergreen_cs.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/evergreen_cs.c:1.3 src/sys/external/bsd/drm2/dist/drm/radeon/evergreen_cs.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/radeon/evergreen_cs.c:1.3 Sat Sep 6 14:43:00 2014
+++ src/sys/external/bsd/drm2/dist/drm/radeon/evergreen_cs.c Sat Nov 1 17:46:10 2014
@@ -446,21 +446,21 @@ static int evergreen_cs_track_validate_c
*/
if (!surf.mode) {
volatile u32 *ib = p->ib.ptr;
- unsigned long tmp, nby, bsize, size, min = 0;
+ unsigned long tmp, nby, bsize, size, vmin = 0;
/* find the height the ddx wants */
if (surf.nby > 8) {
- min = surf.nby - 8;
+ vmin = surf.nby - 8;
}
bsize = radeon_bo_size(track->cb_color_bo[id]);
tmp = track->cb_color_bo_offset[id] << 8;
- for (nby = surf.nby; nby > min; nby--) {
+ for (nby = surf.nby; nby > vmin; nby--) {
size = nby * surf.nbx * surf.bpe * surf.nsamples;
if ((tmp + size * mslice) <= bsize) {
break;
}
}
- if (nby > min) {
+ if (nby > vmin) {
surf.nby = nby;
slice = ((nby * surf.nbx) / 64) - 1;
if (!evergreen_surface_check(p, &surf, "cb")) {
Index: src/sys/external/bsd/drm2/dist/drm/radeon/rv770_dpm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/rv770_dpm.c:1.2 src/sys/external/bsd/drm2/dist/drm/radeon/rv770_dpm.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/radeon/rv770_dpm.c:1.2 Wed Jul 16 16:59:57 2014
+++ src/sys/external/bsd/drm2/dist/drm/radeon/rv770_dpm.c Sat Nov 1 17:46:10 2014
@@ -1229,16 +1229,16 @@ static int rv770_init_smc_table(struct r
static int rv770_construct_vddc_table(struct radeon_device *rdev)
{
struct rv7xx_power_info *pi = rv770_get_pi(rdev);
- u16 min, max, step;
+ u16 vmin, vmax, step;
u32 steps = 0;
u8 vddc_index = 0;
u32 i;
- radeon_atom_get_min_voltage(rdev, SET_VOLTAGE_TYPE_ASIC_VDDC, &min);
- radeon_atom_get_max_voltage(rdev, SET_VOLTAGE_TYPE_ASIC_VDDC, &max);
+ radeon_atom_get_min_voltage(rdev, SET_VOLTAGE_TYPE_ASIC_VDDC, &vmin);
+ radeon_atom_get_max_voltage(rdev, SET_VOLTAGE_TYPE_ASIC_VDDC, &vmax);
radeon_atom_get_voltage_step(rdev, SET_VOLTAGE_TYPE_ASIC_VDDC, &step);
- steps = (max - min) / step + 1;
+ steps = (vmax - vmin) / step + 1;
if (steps > MAX_NO_VREG_STEPS)
return -EINVAL;
@@ -1246,7 +1246,7 @@ static int rv770_construct_vddc_table(st
for (i = 0; i < steps; i++) {
u32 gpio_pins, gpio_mask;
- pi->vddc_table[i].vddc = (u16)(min + i * step);
+ pi->vddc_table[i].vddc = (u16)(vmin + i * step);
radeon_atom_get_voltage_gpio_settings(rdev,
pi->vddc_table[i].vddc,
SET_VOLTAGE_TYPE_ASIC_VDDC,
Index: src/sys/external/bsd/drm2/dist/drm/radeon/si_dpm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/si_dpm.c:1.2 src/sys/external/bsd/drm2/dist/drm/radeon/si_dpm.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/radeon/si_dpm.c:1.2 Wed Jul 16 16:59:57 2014
+++ src/sys/external/bsd/drm2/dist/drm/radeon/si_dpm.c Sat Nov 1 17:46:10 2014
@@ -2518,7 +2518,7 @@ static int si_initialize_smc_dte_tables(
}
static int si_get_cac_std_voltage_max_min(struct radeon_device *rdev,
- u16 *max, u16 *min)
+ u16 *vmax, u16 *vmin)
{
struct si_power_info *si_pi = si_get_pi(rdev);
struct radeon_cac_leakage_table *table =
@@ -2530,35 +2530,35 @@ static int si_get_cac_std_voltage_max_mi
if (table == NULL)
return -EINVAL;
- *max = 0;
- *min = 0xFFFF;
+ *vmax = 0;
+ *vmin = 0xFFFF;
for (i = 0; i < table->count; i++) {
- if (table->entries[i].vddc > *max)
- *max = table->entries[i].vddc;
- if (table->entries[i].vddc < *min)
- *min = table->entries[i].vddc;
+ if (table->entries[i].vddc > *vmax)
+ *vmax = table->entries[i].vddc;
+ if (table->entries[i].vddc < *vmin)
+ *vmin = table->entries[i].vddc;
}
if (si_pi->powertune_data->lkge_lut_v0_percent > 100)
return -EINVAL;
- v0_loadline = (*min) * (100 - si_pi->powertune_data->lkge_lut_v0_percent) / 100;
+ v0_loadline = (*vmin) * (100 - si_pi->powertune_data->lkge_lut_v0_percent) / 100;
if (v0_loadline > 0xFFFFUL)
return -EINVAL;
- *min = (u16)v0_loadline;
+ *vmin = (u16)v0_loadline;
- if ((*min > *max) || (*max == 0) || (*min == 0))
+ if ((*vmin > *vmax) || (*vmax == 0) || (*vmin == 0))
return -EINVAL;
return 0;
}
-static u16 si_get_cac_std_voltage_step(u16 max, u16 min)
+static u16 si_get_cac_std_voltage_step(u16 vmax, u16 vmin)
{
- return ((max - min) + (SMC_SISLANDS_LKGE_LUT_NUM_OF_VOLT_ENTRIES - 1)) /
+ return ((vmax - vmin) + (SMC_SISLANDS_LKGE_LUT_NUM_OF_VOLT_ENTRIES - 1)) /
SMC_SISLANDS_LKGE_LUT_NUM_OF_VOLT_ENTRIES;
}
Index: src/sys/external/bsd/drm2/dist/drm/radeon/sumo_dpm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/sumo_dpm.c:1.2 src/sys/external/bsd/drm2/dist/drm/radeon/sumo_dpm.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/radeon/sumo_dpm.c:1.2 Wed Jul 16 16:59:57 2014
+++ src/sys/external/bsd/drm2/dist/drm/radeon/sumo_dpm.c Sat Nov 1 17:46:10 2014
@@ -1007,10 +1007,10 @@ u32 sumo_get_sleep_divider_id_from_clock
struct sumo_power_info *pi = sumo_get_pi(rdev);
u32 i;
u32 temp;
- u32 min = (min_sclk_in_sr > SUMO_MINIMUM_ENGINE_CLOCK) ?
+ u32 vmin = (min_sclk_in_sr > SUMO_MINIMUM_ENGINE_CLOCK) ?
min_sclk_in_sr : SUMO_MINIMUM_ENGINE_CLOCK;
- if (sclk < min)
+ if (sclk < vmin)
return 0;
if (!pi->enable_sclk_ds)
@@ -1019,7 +1019,7 @@ u32 sumo_get_sleep_divider_id_from_clock
for (i = SUMO_MAX_DEEPSLEEP_DIVIDER_ID; ; i--) {
temp = sclk / sumo_get_sleep_divider_from_id(i);
- if (temp >= min || i == 0)
+ if (temp >= vmin || i == 0)
break;
}
return i;
Index: src/sys/external/bsd/drm2/dist/drm/radeon/trinity_dpm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/trinity_dpm.c:1.2 src/sys/external/bsd/drm2/dist/drm/radeon/trinity_dpm.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/radeon/trinity_dpm.c:1.2 Wed Jul 16 16:59:57 2014
+++ src/sys/external/bsd/drm2/dist/drm/radeon/trinity_dpm.c Sat Nov 1 17:46:10 2014
@@ -1339,10 +1339,10 @@ static u8 trinity_get_sleep_divider_id_f
struct trinity_power_info *pi = trinity_get_pi(rdev);
u32 i;
u32 temp;
- u32 min = (min_sclk_in_sr > TRINITY_MINIMUM_ENGINE_CLOCK) ?
+ u32 vmin = (min_sclk_in_sr > TRINITY_MINIMUM_ENGINE_CLOCK) ?
min_sclk_in_sr : TRINITY_MINIMUM_ENGINE_CLOCK;
- if (sclk < min)
+ if (sclk < vmin)
return 0;
if (!pi->enable_sclk_ds)
@@ -1350,7 +1350,7 @@ static u8 trinity_get_sleep_divider_id_f
for (i = TRINITY_MAX_DEEPSLEEP_DIVIDER_ID; ; i--) {
temp = sclk / sumo_get_sleep_divider_from_id(i);
- if (temp >= min || i == 0)
+ if (temp >= vmin || i == 0)
break;
}
