diff options
| author | Alex Deucher <alex@samba.(none)> | 2007-12-17 20:07:07 -0500 |
|---|---|---|
| committer | Alex Deucher <alex@samba.(none)> | 2007-12-17 20:07:07 -0500 |
| commit | cf685f37ec874f0aacd09e7c4eb0402c6daec1b0 (patch) | |
| tree | ef70e906789de556ea3885261b594ce1b31221e2 /src/atombios_crtc.c | |
| parent | 2a134af01bc85de758ad83a85b23d1bba4a1a0f5 (diff) | |
| parent | 44d07c4ccce9acb5bd21a17acb082e91f7225764 (diff) | |
Merge branch 'master' of git+ssh://agd5f@git.freedesktop.org/git/xorg/driver/xf86-video-ati into atombios-support
merge master and fix conflicts
Diffstat (limited to 'src/atombios_crtc.c')
| -rw-r--r-- | src/atombios_crtc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/atombios_crtc.c b/src/atombios_crtc.c index 6c7828b9..e7ad4a97 100644 --- a/src/atombios_crtc.c +++ b/src/atombios_crtc.c @@ -166,8 +166,8 @@ atombios_crtc_set_pll(xf86CrtcPtr crtc, DisplayModePtr mode) if (IS_AVIVO_VARIANT) { CARD32 temp; - RADEONComputePLL(&info->pll, mode->Clock * 1000, &temp, &fb_div, &ref_div, &post_div); - sclock = temp / 10000; + RADEONComputePLL(&info->pll, mode->Clock, &temp, &fb_div, &ref_div, &post_div, 0); + sclock = temp; /* disable spread spectrum clocking for now -- thanks Hedy Lamarr */ if (radeon_crtc->crtc_id == 0) { |