Attachment 9059 Details for Bug 10205 – Patch to fix the problem

[patch] Patch to fix the problem

patch (text/plain), 2.60 KB, created by henry.zhao@oracle.com on 2007-03-09 15:13:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: henry.zhao@oracle.com

Created: 2007-03-09 15:13:19 UTC

Size: 2.60 KB

patch

obsolete

>diff --git a/src/radeon_modes.c b/src/radeon_modes.c
>index 70bf184..6bf1315 100644
>--- a/src/radeon_modes.c
>+++ b/src/radeon_modes.c
>@@ -86,10 +86,16 @@ static void RADEONSortModes(DisplayModeP
> 
>     p = *last;
>     while (p) {
>-	if ((((*new)->HDisplay < p->HDisplay) &&
>+	if (((*new)->HDisplay < p->HDisplay) ||
>+	    (((*new)->HDisplay == p->HDisplay) &&
> 	     ((*new)->VDisplay < p->VDisplay)) ||
> 	    (((*new)->HDisplay == p->HDisplay) &&
> 	     ((*new)->VDisplay == p->VDisplay) &&
>+	     ((*new)->type < p->type) && 
>+	     !(((*new)->type == M_T_USERDEF) || (!(*new)->type))) ||
>+	    (((*new)->HDisplay == p->HDisplay) &&
>+	     ((*new)->VDisplay == p->VDisplay) &&
>+	     ((*new)->type == p->type) && 
> 	     ((*new)->Clock < p->Clock))) {
> 
> 	    if (p->next) p->next->prev = *new;
>@@ -181,9 +187,8 @@ static DisplayModePtr RADEONDDCModes(Scr
> #ifdef M_T_PREFERRED
> 	    if (PREFERRED_TIMING_MODE(ddc->features.msc))
> 	      new->type     = M_T_PREFERRED;
>-	    else
> #endif
>-	      new->type     = M_T_DEFAULT;
>+	      new->type     |= M_T_DRIVER;
> 
> 	    if (d_timings->sync == 3) {
> 		switch (d_timings->misc) {
>@@ -207,8 +212,10 @@ #endif
>     for (j = 0; j < 8; j++) {
>         if (ddc->timings2[j].hsize == 0 || ddc->timings2[j].vsize == 0)
>                continue;
>-	for (p = pScrn->monitor->Modes; p && p->next; p = p->next->next) {
>+	for (p = pScrn->monitor->Modes; p && p->next; p = p->next) {
> 	    /* Ignore all double scan modes */
>+	    if (p->Flags & V_DBLSCAN)
>+		continue;
> 	    if ((ddc->timings2[j].hsize == p->HDisplay) &&
> 		(ddc->timings2[j].vsize == p->VDisplay)) {
> 		float  refresh =
>@@ -221,7 +228,8 @@ #endif
> 		    new->name = xnfalloc(strlen(p->name) + 1);
> 		    strcpy(new->name, p->name);
> 		    new->status = MODE_OK;
>-		    new->type   = M_T_DEFAULT;
>+		    if ((new->type != M_T_USERDEF) && (new->type))
>+		    	new->type   = M_T_DEFAULT;
> 
> 		    count++;
> 
>@@ -240,7 +248,10 @@ #endif
>     tmp = (ddc->timings1.t1 << 8) | ddc->timings1.t2;
>     for (j = 0; j < 16; j++) {
> 	if (tmp & (1 << j)) {
>-	    for (p = pScrn->monitor->Modes; p && p->next; p = p->next->next) {
>+	    for (p = pScrn->monitor->Modes; p && p->next; p = p->next) {
>+		/* Ignore all double scan modes */
>+		if (p->Flags & V_DBLSCAN)
>+		    continue;
> 		if ((est_timings[j].hsize == p->HDisplay) &&
> 		    (est_timings[j].vsize == p->VDisplay)) {
> 		    float  refresh =
>@@ -253,7 +264,8 @@ #endif
> 			new->name = xnfalloc(strlen(p->name) + 1);
> 			strcpy(new->name, p->name);
> 			new->status = MODE_OK;
>-			new->type   = M_T_DEFAULT;
>+		    	if ((new->type != M_T_USERDEF) && (new->type))
>+		    	    new->type   = M_T_DEFAULT;
> 
> 			count++;
>

Actions: View | Splinter Review

Attachments on bug 10205: 9059

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.