diff options
author | Dave Airlie <airlied@nx6125b.(none)> | 2007-05-29 07:21:48 +1000 |
---|---|---|
committer | Dave Airlie <airlied@nx6125b.(none)> | 2007-05-29 07:21:48 +1000 |
commit | c52322354fe64725733842b3356798c50e7735d5 (patch) | |
tree | bcd7c26f46e40ed8dbdc8cd3bdd8a0bf2def434b /src/radeon_mergedfb.c | |
parent | dd6a966e862b774a8e8b9e1a085309219673efad (diff) | |
parent | 975da595f032c145ad74079ff8edeaead779dc7b (diff) |
Merge branch 'origin'
Diffstat (limited to 'src/radeon_mergedfb.c')
-rw-r--r-- | src/radeon_mergedfb.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/radeon_mergedfb.c b/src/radeon_mergedfb.c index fa143cb2..abbc1606 100644 --- a/src/radeon_mergedfb.c +++ b/src/radeon_mergedfb.c @@ -215,8 +215,13 @@ RADEONCopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest, * extension to allow selecting among a number of modes whose merged result * looks identical but consists of different modes for CRT1 and CRT2 */ - mode->VRefresh = (float)((i->Clock * 1000.0 / i->HTotal / i->VTotal) * 100 + - (j->Clock * 1000.0 / j->HTotal / j->VTotal)); + { + float ref1, ref2; + ref1 = ((float)i->Clock * 100.0 / i->HTotal / i->VTotal) * 50.0; + ref2 = ((float)j->Clock * 100.0 / j->HTotal / j->VTotal) / 2.0; + + mode->VRefresh = (float) ref1 + ref2; + } mode->Clock = (int)(mode->VRefresh * 0.001 * mode->HTotal * mode->VTotal); |