xf86-video-ati: Branch 'atombios-support' - 3 commits
Alex Deucher
agd5f at kemper.freedesktop.org
Fri Nov 30 11:32:35 PST 2007
src/atombios_crtc.c | 4 ++--
src/radeon_crtc.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit e1945f1f25a34310bd58ce128c8ff27ecc985618
Merge: b368b0f... df7777b...
Author: Alex Deucher <alex at botch2.(none)>
Date: Fri Nov 30 14:30:55 2007 -0500
Merge branch 'atombios-support' of ssh://agd5f@git.freedesktop.org/git/xorg/driver/xf86-video-ati into atombios-support
commit b368b0f22cd1d7ef9b4c65d82929c76f3b82d573
Author: Alex Deucher <alex at botch2.(none)>
Date: Fri Nov 30 14:29:27 2007 -0500
RADEON: disable atom pll set for r4xx cards
the clocks do not get set correctly in all cases. this needs
further investigation.
diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c
index c4a5d11..57fad39 100644
--- a/src/radeon_crtc.c
+++ b/src/radeon_crtc.c
@@ -907,18 +907,18 @@ legacy_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
ErrorF("restore crtc1\n");
RADEONRestoreCrtcRegisters(pScrn, &info->ModeReg);
ErrorF("restore pll1\n");
- if (info->IsAtomBios)
+ /*if (info->IsAtomBios)
atombios_crtc_set_pll(crtc, adjusted_mode);
- else
+ else*/
RADEONRestorePLLRegisters(pScrn, &info->ModeReg);
break;
case 1:
ErrorF("restore crtc2\n");
RADEONRestoreCrtc2Registers(pScrn, &info->ModeReg);
ErrorF("restore pll2\n");
- if (info->IsAtomBios)
+ /*if (info->IsAtomBios)
atombios_crtc_set_pll(crtc, adjusted_mode);
- else
+ else*/
RADEONRestorePLL2Registers(pScrn, &info->ModeReg);
break;
}
commit 5af15739571c09260750bcfd3620e16fd7fec862
Author: Alex Deucher <alex at botch2.(none)>
Date: Fri Nov 30 14:24:30 2007 -0500
RADEON: small cleanup of pll code
diff --git a/src/atombios_crtc.c b/src/atombios_crtc.c
index 0609bb5..a2f0291 100644
--- a/src/atombios_crtc.c
+++ b/src/atombios_crtc.c
@@ -240,10 +240,10 @@ atombios_crtc_set_pll(xf86CrtcPtr crtc, DisplayModePtr mode)
unsigned char *space;
RADEONSavePtr save = &info->ModeReg;
- sclock = mode->Clock;
if (IS_AVIVO_VARIANT) {
- PLLCalculate(crtc->scrn, mode->Clock, &ref_div, &fb_div, &post_div);
+ PLLCalculate(crtc->scrn, sclock, &ref_div, &fb_div, &post_div);
} else {
+ sclock = save->dot_clock_freq * 10;
fb_div = save->feedback_div;
post_div = save->post_div;
ref_div = save->ppll_ref_div;
More information about the xorg-commit
mailing list