Attachment 7345 Details for Bug 6966 – Patch based on comment #18 and comment #19

[patch] Patch based on comment #18 and comment #19

diff (text/plain), 1.24 KB, created by henry.zhao@oracle.com on 2006-10-10 17:15:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: henry.zhao@oracle.com

Created: 2006-10-10 17:15:32 UTC

Size: 1.24 KB

patch

obsolete

>diff --git a/src/radeon_mergedfb.c b/src/radeon_mergedfb.c
>index 3e64e94..94ac942 100644
>--- a/src/radeon_mergedfb.c
>+++ b/src/radeon_mergedfb.c
>@@ -211,18 +211,14 @@ RADEONCopyModeNLink(ScrnInfoPtr pScrn, D
>     mode->VSyncEnd += dy;
>     mode->VTotal += dy;
> 
>-    /* This is needed for not generating negative refesh rates in xrandr with the
>-       faked DotClock below
>-     */
>-    if (!(mode->VRefresh))
>-        mode->VRefresh = mode->Clock * 1000.0 / mode->HTotal / mode->VTotal;
>-
>-     /* Provide a sophisticated fake DotClock in order to trick the vidmode
>+     /* Provide a fake VRefresh/DotClock in order to trick the vidmode
>       * extension to allow selecting among a number of modes whose merged result
>       * looks identical but consists of different modes for CRT1 and CRT2
>       */
>-    mode->Clock = (((i->Clock >> 3) + i->HTotal) << 16) | ((j->Clock >> 2) + j->HTotal);
>-    mode->Clock ^= ((i->VTotal << 19) | (j->VTotal << 3));
>+    mode->VRefresh = (i->Clock * 1000.0 / i->HTotal / i->VTotal) * 100 +
>+	(j->Clock * 1000.0 / j->HTotal / j->VTotal);
>+
>+    mode->Clock = (int)(mode->VRefresh * 0.001 * mode->HTotal * mode->VTotal);
> 
>     if( ((mode->HDisplay * ((pScrn->bitsPerPixel + 7) / 8) * mode->VDisplay) > 
> 	(pScrn->videoRam * 1024)) ||

Actions: View | Splinter Review

Attachments on bug 6966: 5677 | 5678 | 5972 | 6296 | 7345 | 7454

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.