geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Whitespace cleanups.

main
Jesse Barnes 2007-04-11 11:44:54 -07:00
parent c731b68091
commit 425da42e95
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
linux-core/intel_display.c
View File

@ -168,18 +168,18 @@ static const intel_limit_t intel_limits[] = {
}, },
}; };
static const intel_limit_t *intel_limit (struct drm_crtc *crtc) static const intel_limit_t *intel_limit(struct drm_crtc *crtc)
{ {
drm_device_t *dev = crtc->dev; drm_device_t *dev = crtc->dev;
const intel_limit_t *limit; const intel_limit_t *limit;
if (IS_I9XX(dev)) { if (IS_I9XX(dev)) {
if (intel_pipe_has_type (crtc, INTEL_OUTPUT_LVDS)) if (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS))
limit = &intel_limits[INTEL_LIMIT_I9XX_LVDS]; limit = &intel_limits[INTEL_LIMIT_I9XX_LVDS];
else else
limit = &intel_limits[INTEL_LIMIT_I9XX_SDVO_DAC]; limit = &intel_limits[INTEL_LIMIT_I9XX_SDVO_DAC];
} else { } else {
if (intel_pipe_has_type (crtc, INTEL_OUTPUT_LVDS)) if (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS))
limit = &intel_limits[INTEL_LIMIT_I8XX_LVDS]; limit = &intel_limits[INTEL_LIMIT_I8XX_LVDS];
else else
limit = &intel_limits[INTEL_LIMIT_I8XX_DVO_DAC]; limit = &intel_limits[INTEL_LIMIT_I8XX_DVO_DAC];
@ -280,18 +280,20 @@ static bool intel_find_best_PLL(struct drm_crtc *crtc, int target,
{ {
drm_device_t *dev = crtc->dev; drm_device_t *dev = crtc->dev;
drm_i915_private_t *dev_priv = dev->dev_private; drm_i915_private_t *dev_priv = dev->dev_private;
intel_clock_t clock; intel_clock_t clock;
const intel_limit_t *limit = intel_limit (crtc); const intel_limit_t *limit = intel_limit(crtc);
int err = target; int err = target;
if (IS_I9XX(dev)& intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) && if (IS_I9XX(dev) && intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) &&
(I915_READ(LVDS) & LVDS_PORT_EN) != 0) (I915_READ(LVDS) & LVDS_PORT_EN) != 0) {
{ /*
/* For LVDS, if the panel is on, just rely on its current settings for * For LVDS, if the panel is on, just rely on its current
* dual-channel. We haven't figured out how to reliably set up * settings for dual-channel. We haven't figured out how to
* different single/dual channel state, if we even can. * reliably set up different single/dual channel state, if we
*/ * even can.
if ((I915_READ(LVDS) & LVDS_CLKB_POWER_MASK) == LVDS_CLKB_POWER_UP) */
if ((I915_READ(LVDS) & LVDS_CLKB_POWER_MASK) ==
LVDS_CLKB_POWER_UP)
clock.p2 = limit->p2.p2_fast; clock.p2 = limit->p2.p2_fast;
else else
clock.p2 = limit->p2.p2_slow; clock.p2 = limit->p2.p2_slow;
@ -304,17 +306,16 @@ static bool intel_find_best_PLL(struct drm_crtc *crtc, int target,
memset (best_clock, 0, sizeof (*best_clock)); memset (best_clock, 0, sizeof (*best_clock));
for (clock.m1 = limit->m1.min; clock.m1 <= limit->m1.max; clock.m1++) for (clock.m1 = limit->m1.min; clock.m1 <= limit->m1.max; clock.m1++) {
{ for (clock.m2 = limit->m2.min; clock.m2 < clock.m1 &&
for (clock.m2 = limit->m2.min; clock.m2 < clock.m1 && clock.m2 <= limit->m2.max; clock.m2++) clock.m2 <= limit->m2.max; clock.m2++) {
{ for (clock.n = limit->n.min; clock.n <= limit->n.max;
for (clock.n = limit->n.min; clock.n <= limit->n.max; clock.n++) clock.n++) {
{ for (clock.p1 = limit->p1.min;
for (clock.p1 = limit->p1.min; clock.p1 <= limit->p1.max; clock.p1++) clock.p1 <= limit->p1.max; clock.p1++) {
{
int this_err; int this_err;
intel_clock (dev, refclk, &clock); intel_clock(dev, refclk, &clock);
if (!intel_PLL_is_valid(crtc, &clock)) if (!intel_PLL_is_valid(crtc, &clock))
continue; continue;
@ -328,6 +329,7 @@ static bool intel_find_best_PLL(struct drm_crtc *crtc, int target,
} }
} }
} }
return (err != target); return (err != target);
} }