Attachment 8278 Details for Bug 9284 – always turn FW off unless asked for it by config file.. leave speed alone.. also use brackets, the old code gave me an error...

[patch] always turn FW off unless asked for it by config file.. leave speed alone.. also use brackets, the old code gave me an error...

fix8500_agpfw.diff (text/plain), 1.43 KB, created by Dave Airlie on 2007-01-02 20:59:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Airlie

Created: 2007-01-02 20:59:56 UTC

Size: 1.43 KB

patch

obsolete

>diff --git a/src/radeon_dri.c b/src/radeon_dri.c
>index 35e4154..9c2e4e9 100644
>--- a/src/radeon_dri.c
>+++ b/src/radeon_dri.c
>@@ -739,8 +739,9 @@ static Bool RADEONSetAgpMode(RADEONInfoPtr info, ScreenPtr pScreen)
>     from = X_DEFAULT;
> 
>     if (xf86GetOptValInteger(info->Options, OPTION_AGP_MODE, &info->agpMode)) {
>-	if (info->agpMode < is_v3 ? 4 : 1 || info->agpMode > is_v3 ? 8 : 4 ||
>-	    info->agpMode & (info->agpMode - 1)) {
>+	if ((info->agpMode < (is_v3 ? 4 : 1)) ||
>+            (info->agpMode > (is_v3 ? 8 : 4)) ||
>+	    (info->agpMode & (info->agpMode - 1))) {
> 	    xf86DrvMsg(pScreen->myNum, X_ERROR,
> 		       "Illegal AGP Mode: %d (valid values: %s), leaving at "
> 		       "%dx\n", info->agpMode, is_v3 ? "4, 8" : "1, 2, 4",
>@@ -753,7 +754,7 @@ static Bool RADEONSetAgpMode(RADEONInfoPtr info, ScreenPtr pScreen)
> 
>     xf86DrvMsg(pScreen->myNum, from, "Using AGP %dx\n", info->agpMode);
> 
>-    info->agpFastWrite = (agp_status & RADEON_AGP_FW_MODE);
>+    info->agpFastWrite = 0; //(agp_status & RADEON_AGP_FW_MODE);
> 
>     from = xf86GetOptValInteger(info->Options, OPTION_AGP_FW,
> 				&info->agpFastWrite) ? X_CONFIG : X_DEFAULT;
>@@ -794,6 +795,7 @@ static Bool RADEONSetAgpMode(RADEONInfoPtr info, ScreenPtr pScreen)
>     }
> 
>     if (info->agpFastWrite) mode |= RADEON_AGP_FW_MODE;
>+    else mode &= ~RADEON_AGP_FW_MODE;
> 
>     xf86DrvMsg(pScreen->myNum, X_INFO,
> 	       "[agp] Mode 0x%08lx [AGP 0x%04x/0x%04x; Card 0x%04x/0x%04x]\n",

Actions: View | Splinter Review

Attachments on bug 9284: 8010 | 8011 | 8278

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.