diff options
| author | Alex Deucher <alex@botch2.(none)> | 2007-12-11 13:11:15 -0500 |
|---|---|---|
| committer | Alex Deucher <alex@botch2.(none)> | 2007-12-11 13:11:15 -0500 |
| commit | 3c22ad977c25d5ca2811821fcac6bb8ecd79994a (patch) | |
| tree | 08e4a2e826092957d1d9e1396eca5c41c816b4fd /src/radeon_bios.c | |
| parent | c9a0cee97ca69e8fe1e1937c7670fa903214cded (diff) | |
| parent | f3d2ec3a5ae61215c792018320158750e7aa937c (diff) | |
Merge branch 'master' of ssh://agd5f@git.freedesktop.org/git/xorg/driver/xf86-video-ati into atombios-support
fix conflicts
Diffstat (limited to 'src/radeon_bios.c')
| -rw-r--r-- | src/radeon_bios.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/radeon_bios.c b/src/radeon_bios.c index 3043de62..cca3d435 100644 --- a/src/radeon_bios.c +++ b/src/radeon_bios.c @@ -618,15 +618,6 @@ Bool RADEONGetClockInfoFromBIOS (ScrnInfoPtr pScrn) info->sclk = RADEON_BIOS32(pll_info_block + 8) / 100.0; info->mclk = RADEON_BIOS32(pll_info_block + 12) / 100.0; - if (info->sclk == 0) info->sclk = 200; - if (info->mclk == 0) info->mclk = 200; - - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ref_freq: %d, min_pll: %u, " - "max_pll: %u, xclk: %d, sclk: %f, mclk: %f\n", - pll->reference_freq, (unsigned)pll->min_pll_freq, - (unsigned)pll->max_pll_freq, pll->xclk, info->sclk, - info->mclk); - } else { pll_info_block = RADEON_BIOS16 (info->ROMHeaderStart + 0x30); @@ -639,8 +630,17 @@ Bool RADEONGetClockInfoFromBIOS (ScrnInfoPtr pScrn) info->sclk = RADEON_BIOS16(pll_info_block + 8) / 100.0; info->mclk = RADEON_BIOS16(pll_info_block + 10) / 100.0; } + + if (info->sclk == 0) info->sclk = 200; + if (info->mclk == 0) info->mclk = 200; } + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ref_freq: %d, min_pll: %u, " + "max_pll: %u, xclk: %d, sclk: %f, mclk: %f\n", + pll->reference_freq, (unsigned)pll->min_pll_freq, + (unsigned)pll->max_pll_freq, pll->xclk, info->sclk, + info->mclk); + return TRUE; } |