Attachment 45809 Details for Bug 104069

[patch] New patch, for SL 10.0

radeon_mga_sis_metamodes_sl10_0.diff (text/plain), 8.27 KB, created by Matthias Hopf on 2005-08-11 16:52:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Hopf

Created: 2005-08-11 16:52:56 UTC

Size: 8.27 KB

patch

obsolete

>diff -urp xc_orig/programs/Xserver/hw/xfree86/drivers/ati/radeon_mergedfb.c xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_mergedfb.c
>--- xc_orig/programs/Xserver/hw/xfree86/drivers/ati/radeon_mergedfb.c	2005-08-11 18:41:05.000000000 +0200
>+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_mergedfb.c	2005-08-11 18:48:54.000000000 +0200
>@@ -351,6 +351,8 @@ RADEONGenerateModeListFromMetaModes(Scrn
>         case 0:
>         case '-':
>         case ' ':
>+	case ',':
>+	case ';':
>            if((strmode != str)) {
> 
>               strncpy(modename, strmode, str - strmode);
>@@ -373,11 +375,11 @@ RADEONGenerateModeListFromMetaModes(Scrn
>                     xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
>                         "Mode \"%s\" is not a supported mode for CRT1\n", modename);
>                     gotdash = FALSE;
>-                    while(*tmps == ' ') tmps++;
>-                    if(*tmps == '-') { 							/* skip the next mode */
>+                    while(*tmps == ' ' || *tmps == ';') tmps++;
>+                    if(*tmps == '-'|| *tmps == ',') { 					/* skip the next mode */
>                        tmps++;
>-                       while((*tmps == ' ') && (*tmps != 0)) tmps++; 			/* skip spaces */
>-                       while((*tmps != ' ') && (*tmps != '-') && (*tmps != 0)) tmps++; 	/* skip modename */
>+                       while(*tmps == ' ' || *tmps == ';') tmps++; 			/* skip spaces */
>+                       while(*tmps && *tmps != ' ' && *tmps != ';' && *tmps != '-' && *tmps != ',') tmps++; 	/* skip modename */
>                        strncpy(modename,strmode,tmps - strmode);
>                        modename[tmps - strmode] = 0;
>                        str = tmps-1;
>@@ -390,7 +392,7 @@ RADEONGenerateModeListFromMetaModes(Scrn
>               gotdash = FALSE;
>            }
>            strmode = str + 1;
>-           gotdash |= (*str == '-');
>+           gotdash |= (*str == '-' || *str == ',');
> 
>            if(*str != 0) break;
> 	   /* Fall through otherwise */
>diff -urp xc_orig/programs/Xserver/hw/xfree86/drivers/mga/mga_merge.c xc/programs/Xserver/hw/xfree86/drivers/mga/mga_merge.c
>--- xc_orig/programs/Xserver/hw/xfree86/drivers/mga/mga_merge.c	2005-08-11 18:41:05.000000000 +0200
>+++ xc/programs/Xserver/hw/xfree86/drivers/mga/mga_merge.c	2005-08-11 18:42:02.000000000 +0200
>@@ -147,6 +147,8 @@ GenerateModeList(ScrnInfoPtr pScrn, char
>             case 0:
>             case '-':
>             case ' ':
>+	    case ',':
>+	    case ';':
>                 if((strmode != str)) {/*we got a mode */
>                     /* read new entry */
>                     strncpy(modename,strmode,str - strmode);
>@@ -170,11 +172,11 @@ GenerateModeList(ScrnInfoPtr pScrn, char
>                                 "Mode: \"%s\" is not a supported mode for monitor 1\n",modename);
>                             /* find if a monitor2 mode follows */
>                             gotdash = FALSE;
>-                            while(*tmps == ' ') tmps++;
>-                            if(*tmps == '-') { /* skip the next mode */
>+                            while(*tmps == ' ' || *tmps == ';') tmps++;
>+                            if(*tmps == '-' || *tmps == ',') { /* skip the next mode */
>                                 tmps++;
>-                                while((*tmps == ' ') && (*tmps != 0)) tmps++; /*skip spaces */
>-                                while((*tmps != ' ') && (*tmps != '-') && (*tmps != 0)) tmps++; /*skip modename */
>+                                while(*tmps == ' ' || *tmps == ';') tmps++; /*skip spaces */
>+                                while(*tmps && *tmps != ' ' && *tmps != ';' && *tmps != '-' && *tmps != ',') tmps++; /*skip modename */
>                                 /* for error message */
>                                 strncpy(modename,strmode,tmps - strmode);
>                                 modename[tmps - strmode] = 0;
>@@ -188,7 +190,7 @@ GenerateModeList(ScrnInfoPtr pScrn, char
>                     gotdash = FALSE;
>                 }
>                 strmode = str+1; /* number starts on next char */
>-                gotdash |= (*str == '-');
>+                gotdash |= (*str == '-' || *str == ',');
>                 
>                 if(*str != 0) break; /* if end of string, we wont get a chance to catch a char and run the
>                                         default case. do it now */
>diff -urp xc_orig/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c
>--- xc_orig/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c	2005-08-11 18:41:07.000000000 +0200
>+++ xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c	2005-08-11 18:42:02.000000000 +0200
>@@ -1483,8 +1483,8 @@ SiSGenerateModeListFromLargestModes(Scrn
>     return result;
> }
> 
>-/* Generate the merged-fb mode modelist from metamodes
>- * (Code base taken from mga driver)
>+/* Generate the merged-fb mode modelist
>+ * (Taken from mga driver)
>  */
> static DisplayModePtr
> SiSGenerateModeListFromMetaModes(ScrnInfoPtr pScrn, char* str,
>@@ -1496,7 +1496,8 @@ SiSGenerateModeListFromMetaModes(ScrnInf
> #endif
>     char* strmode = str;
>     char modename[256];
>-    Bool gotdash = FALSE, gotplus = FALSE;
>+    Bool gotdash = FALSE;
>+    char gotsep = 0;
>     SiSScrn2Rel sr;
>     DisplayModePtr mode1 = NULL;
>     DisplayModePtr mode2 = NULL;
>@@ -1513,6 +1514,8 @@ SiSGenerateModeListFromMetaModes(ScrnInf
> 	case '-':
> 	case '+':
> 	case ' ':
>+	case ',':
>+	case ';':
> 	   if(strmode != str) {
> 
> 	      myslen = str - strmode;
>@@ -1531,9 +1534,9 @@ SiSGenerateModeListFromMetaModes(ScrnInf
> 		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
> 			"Mode \"%s\" is not a supported mode for CRT2\n", modename);
> 		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
>-			"\t(Skipping metamode \"%s%s%s\")\n", mode1->name, gotplus ? "+" : "-", modename);
>+                        "\t(Skipping metamode \"%s%c%s\")\n", mode1->name, gotsep, modename);
> 		    mode1 = NULL;
>-		    gotplus = FALSE;
>+		    gotsep = 0;
> 		 }
> 	      } else {
> 		 mode1 = SiSGetModeFromName(modename, i);
>@@ -1541,29 +1544,32 @@ SiSGenerateModeListFromMetaModes(ScrnInf
> 		    char* tmps = str;
> 		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
> 			"Mode \"%s\" is not a supported mode for CRT1\n", modename);
>-		    while(*tmps == ' ') tmps++;
>+                    while(*tmps == ' ' || *tmps == ';') tmps++;
> 		    /* skip the next mode */
>-		    if((*tmps == '-') || (*tmps == '+')) {
>+  	            if(*tmps == '-' || *tmps == '+' || *tmps == ',') {
> 		       tmps++;
> 		       /* skip spaces */
>-		       while(*tmps == ' ') tmps++;
>+		       while(*tmps == ' ' || *tmps == ';') tmps++;
> 		       /* skip modename */
>-		       while((*tmps != ' ') && (*tmps != '-') && (*tmps != '+') && (*tmps != 0)) tmps++;
>+		       while(*tmps && *tmps != ' ' && *tmps != ';' && *tmps != '-' && *tmps != '+' && *tmps != ',') tmps++;
> 		       myslen = tmps - strmode;
> 		       if(myslen > 255) myslen = 255;
> 		       strncpy(modename,strmode,myslen);
> 		       modename[myslen] = 0;
> 		       str = tmps - 1;
> 		    }
>+                    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
>+                        "\t(Skipping metamode \"%s\")\n", modename);
> 		    mode1 = NULL;
>-		    gotplus = FALSE;
>+		    gotsep = 0;
> 		 }
> 	      }
> 	      gotdash = FALSE;
> 	   }
> 	   strmode = str + 1;
>-	   gotdash |= ((*str == '-') || (*str == '+'));
>-	   gotplus |= (*str == '+');
>+           gotdash |= (*str == '-' || *str == '+' || *str == ',');
>+	   if (*str == '-' || *str == '+' || *str == ',')
>+  	      gotsep = *str;
> 
> 	   if(*str != 0) break;
> 	   /* Fall through otherwise */
>@@ -1571,7 +1577,7 @@ SiSGenerateModeListFromMetaModes(ScrnInf
>         default:
> 	   if(!gotdash && mode1) {
> 	      sr = srel;
>-	      if(gotplus) sr = sisClone;
>+	      if(gotsep == '+') sr = sisClone;
> 	      if(!mode2) {
> 	         mode2 = SiSGetModeFromName(mode1->name, j);
> 	         sr = sisClone;
>@@ -1579,13 +1585,15 @@ SiSGenerateModeListFromMetaModes(ScrnInf
> 	      if(!mode2) {
> 		 xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
> 		     "Mode \"%s\" is not a supported mode for CRT2\n", mode1->name);
>+                 xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
>+                     "\t(Skipping metamode \"%s\")\n", modename);
> 		 mode1 = NULL;
> 	      } else {
> 		 result = SiSCopyModeNLink(pScrn, result, mode1, mode2, sr);
> 		 mode1 = NULL;
> 		 mode2 = NULL;
> 	      }
>-	      gotplus = FALSE;
>+	      gotsep = 0;
> 	   }
> 	   break;
>

Actions: View | Diff

Attachments on bug 104069: 45687 | 45809