Attachment 4986 Details for Bug 6309 – Modification of xxxSetSyncRangeFromEdid() in radeon_driver.c and r128_driver.c

[patch] Modification of xxxSetSyncRangeFromEdid() in radeon_driver.c and r128_driver.c

diff (text/plain), 13.95 KB, created by henry.zhao@oracle.com on 2006-03-18 13:02:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: henry.zhao@oracle.com

Created: 2006-03-18 13:02:13 UTC

Size: 13.95 KB

patch

obsolete

>--- /export/home/Xorg/XORG_NV_MWS/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c	Wed Dec 14 11:41:19 2005
>+++ ./radeon_driver.c	Fri Mar 17 13:24:23 2006
>@@ -3596,89 +3596,162 @@
> 
> static void RADEONSetSyncRangeFromEdid(ScrnInfoPtr pScrn, int flag)
> {
>-    MonPtr      mon = pScrn->monitor;
>-    xf86MonPtr  ddc = mon->DDC;
>-    int         i;
>+    MonPtr monitor = pScrn->monitor;
>+    xf86MonPtr DDC = (xf86MonPtr)(pScrn->monitor->DDC);
>+    int i, j;
>+    float hmin = 1e6, hmax = 0.0, vmin = 1e6, vmax = 0.0;
>+    float h, v;
>+    struct std_timings *t;
>+    struct detailed_timings *dt;
>+    struct monitor_ranges *mon_range = NULL;
>+    int numTimings = 0;
>+    range hsync[MAX_HSYNC];
>+    range vrefresh[MAX_VREFRESH];
> 
>-    if (flag) { /* HSync */
>-	for (i = 0; i < 4; i++) {
>-	    if (ddc->det_mon[i].type == DS_RANGES) {
>-		mon->nHsync = 1;
>-		mon->hsync[0].lo = ddc->det_mon[i].section.ranges.min_h;
>-		mon->hsync[0].hi = ddc->det_mon[i].section.ranges.max_h;
>-		return;
>+    numTimings = 0;
>+
>+    if (flag) { /* Hsync */
>+	for (i = 0; i < DET_TIMINGS; i++) {
>+	    switch (DDC->det_mon[i].type) {
>+	    case DS_RANGES:
>+		mon_range = &DDC->det_mon[i].section.ranges;
>+		hsync[numTimings].lo = mon_range->min_h;
>+		hsync[numTimings].hi = mon_range->max_h;
>+		numTimings++;
>+		break;
>+
>+	    case DS_STD_TIMINGS:
>+		t = DDC->det_mon[i].section.std_t;
>+		for (j = 0; j < 5; j++) {
>+		    if (t[j].hsize > 256) { /* sanity check */
>+			h = t[j].refresh * 1.07 * t[j].vsize / 1000.0;
>+			if (h < hmin)
>+			    hmin = h;
>+			if (h > hmax)
>+			    hmax = h;
>+		    }
>+		}
>+		break;
>+
>+	    case DT:
>+		dt = &DDC->det_mon[i].section.d_timings;
>+		if (dt->clock > 15000000) { /* sanity check */
>+		    h = (float)dt->clock / (dt->h_active + dt->h_blanking);
>+		    h /= 1000.0;
>+		    if (h < hmin)
>+			hmin = h;
>+		    if (h > hmax)
>+			hmax = h;
>+		}
>+		break;
> 	    }
>+
>+	    if (numTimings > MAX_HSYNC)
>+		break;
> 	}
>-	/* If no sync ranges detected in detailed timing table, let's
>-	 * try to derive them from supported VESA modes.  Are we doing
>-	 * too much here!!!?  */
>-	i = 0;
>-	if (ddc->timings1.t1 & 0x02) { /* 800x600@56 */
>-	    mon->hsync[i].lo = mon->hsync[i].hi = 35.2;
>-	    i++;
>+
>+	if (numTimings == 0) {
>+	    t = DDC->timings2;
>+	    for (i = 0; i < STD_TIMINGS; i++) {
>+		if (t[i].hsize > 256) { /* sanity check */
>+		    h = t[i].refresh * 1.07 * t[i].vsize / 1000.0;
>+		    if (h < hmin)
>+			hmin = h;
>+		    if (h > hmax)
>+			hmax = h;
>+		}
>+	    }
>+
>+	    if (hmax > 0.0) {
>+		hsync[numTimings].lo = hmin;
>+		hsync[numTimings].hi = hmax;
>+		numTimings++;
>+	    }
> 	}
>-	if (ddc->timings1.t1 & 0x04) { /* 640x480@75 */
>-	    mon->hsync[i].lo = mon->hsync[i].hi = 37.5;
>-	    i++;
>+
>+	if (numTimings > 0) {
>+	    monitor->nHsync = numTimings;
>+	    for (i = 0; i < numTimings; i++) {
>+	    	monitor->hsync[i].lo = hsync[i].lo;
>+	    	monitor->hsync[i].hi = hsync[i].hi;
>+	    }
>+	} else {
>+	    pScrn->monitor->hsync[0].lo = 28;
>+            pScrn->monitor->hsync[0].hi = 33;
>+            monitor->nHsync = 1;
> 	}
>-	if ((ddc->timings1.t1 & 0x08) || (ddc->timings1.t1 & 0x01)) {
>-	    mon->hsync[i].lo = mon->hsync[i].hi = 37.9;
>-	    i++;
>-	}
>-	if (ddc->timings1.t2 & 0x40) {
>-	    mon->hsync[i].lo = mon->hsync[i].hi = 46.9;
>-	    i++;
>-	}
>-	if ((ddc->timings1.t2 & 0x80) || (ddc->timings1.t2 & 0x08)) {
>-	    mon->hsync[i].lo = mon->hsync[i].hi = 48.1;
>-	    i++;
>-	}
>-	if (ddc->timings1.t2 & 0x04) {
>-	    mon->hsync[i].lo = mon->hsync[i].hi = 56.5;
>-	    i++;
>-	}
>-	if (ddc->timings1.t2 & 0x02) {
>-	    mon->hsync[i].lo = mon->hsync[i].hi = 60.0;
>-	    i++;
>-	}
>-	if (ddc->timings1.t2 & 0x01) {
>-	    mon->hsync[i].lo = mon->hsync[i].hi = 64.0;
>-	    i++;
>-	}
>-	mon->nHsync = i;
>+
>     } else {  /* Vrefresh */
>-	for (i = 0; i < 4; i++) {
>-	    if (ddc->det_mon[i].type == DS_RANGES) {
>-		mon->nVrefresh = 1;
>-		mon->vrefresh[0].lo = ddc->det_mon[i].section.ranges.min_v;
>-		mon->vrefresh[0].hi = ddc->det_mon[i].section.ranges.max_v;
>-		return;
>+	for (i = 0; i < DET_TIMINGS; i++) {
>+	    switch (DDC->det_mon[i].type) {
>+	    case DS_RANGES:
>+		mon_range = &DDC->det_mon[i].section.ranges;
>+		vrefresh[numTimings].lo = mon_range->min_v;
>+		vrefresh[numTimings].hi = mon_range->max_v;
>+		numTimings++;
>+		break;
>+
>+	    case DS_STD_TIMINGS:
>+		t = DDC->det_mon[i].section.std_t;
>+		for (j = 0; j < 5; j++) {
>+		    if (t[j].hsize > 256) { /* sanity check */
>+			if (t[j].refresh < vmin)
>+			    vmin = t[i].refresh;
>+			if (t[j].refresh > vmax)
>+			    vmax = t[i].refresh;
>+		    }
>+		}
>+		break;
>+
>+	    case DT:
>+		dt = &DDC->det_mon[i].section.d_timings;
>+		if (dt->clock > 15000000) { /* sanity check */
>+		    h = (float)dt->clock / (dt->h_active + dt->h_blanking);
>+		    v = h / (dt->v_active + dt->v_blanking);
>+		    if (dt->interlaced) 
>+			v /= 2.0;
>+
>+		    if (v < vmin)
>+			vmin = v;
>+		    if (v > vmax)
>+			vmax = v;
>+		}
>+		break;
> 	    }
>+
>+	    if (numTimings > MAX_HSYNC)
>+		break;
> 	}
> 
>-	i = 0;
>-	if (ddc->timings1.t1 & 0x02) { /* 800x600@56 */
>-	    mon->vrefresh[i].lo = mon->vrefresh[i].hi = 56;
>-	    i++;
>+	if (numTimings == 0) {
>+	    t = DDC->timings2;
>+	    for (i = 0; i < STD_TIMINGS; i++) {
>+		if (t[i].hsize > 256) { /* sanity check */
>+		    if (t[i].refresh < vmin)
>+			vmin = t[i].refresh;
>+		    if (t[i].refresh > vmax)
>+			vmax = t[i].refresh;
>+		}
>+	    }
>+
>+	    if (vmax > 0.0) {
>+		vrefresh[numTimings].lo = vmin;
>+		vrefresh[numTimings].hi = vmax;
>+		numTimings++;
>+	    }
> 	}
>-	if ((ddc->timings1.t1 & 0x01) || (ddc->timings1.t2 & 0x08)) {
>-	    mon->vrefresh[i].lo = mon->vrefresh[i].hi = 60;
>-	    i++;
>+
>+	if (numTimings > 0) {
>+	    monitor->nVrefresh = numTimings;
>+	    for (i = 0; i < numTimings; i++) {
>+		monitor->vrefresh[i].lo = vrefresh[i].lo;
>+		monitor->vrefresh[i].hi = vrefresh[i].hi;
>+	    }
>+	 } else {
>+	    pScrn->monitor->vrefresh[0].lo = 43;
>+            pScrn->monitor->vrefresh[0].hi = 72;
>+            monitor->nVrefresh = 1;
> 	}
>-	if (ddc->timings1.t2 & 0x04) {
>-	    mon->vrefresh[i].lo = mon->vrefresh[i].hi = 70;
>-	    i++;
>-	}
>-	if ((ddc->timings1.t1 & 0x08) || (ddc->timings1.t2 & 0x80)) {
>-	    mon->vrefresh[i].lo = mon->vrefresh[i].hi = 72;
>-	    i++;
>-	}
>-	if ((ddc->timings1.t1 & 0x04) || (ddc->timings1.t2 & 0x40) ||
>-	    (ddc->timings1.t2 & 0x02) || (ddc->timings1.t2 & 0x01)) {
>-	    mon->vrefresh[i].lo = mon->vrefresh[i].hi = 75;
>-	    i++;
>-	}
>-	mon->nVrefresh = i;
>     }
> }
> 
>--- /export/home/Xorg/XORG_NV_MWS/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c	Wed Dec 14 11:41:19 2005
>+++ ./r128_driver.c	Fri Mar 17 13:29:30 2006
>@@ -1525,125 +1525,163 @@
> 
> static void R128SetSyncRangeFromEdid(ScrnInfoPtr pScrn, int flag)
> {
>-    int i;
>-    xf86MonPtr ddc = pScrn->monitor->DDC;
>-    if(flag)  /*HSync*/
>-    {
>-        for(i=0; i<4; i++)
>-        {
>-            if(ddc->det_mon[i].type == DS_RANGES)
>-            {
>-                pScrn->monitor->nHsync = 1;
>-                pScrn->monitor->hsync[0].lo =
>-                    ddc->det_mon[i].section.ranges.min_h;
>-                pScrn->monitor->hsync[0].hi =
>-                    ddc->det_mon[i].section.ranges.max_h;
>-                return;
>-            }
>-        }
>-        /*if no sync ranges detected in detailed timing table,
>-          let's try to derive them from supported VESA modes
>-          Are we doing too much here!!!?
>-        **/
>-        i = 0;
>-        if(ddc->timings1.t1 & 0x02) /*800x600@56*/
>-        {
>-            pScrn->monitor->hsync[i].lo =
>-                pScrn->monitor->hsync[i].hi = 35.2;
>-            i++;
>-        }
>-        if(ddc->timings1.t1 & 0x04) /*640x480@75*/
>-        {
>-            pScrn->monitor->hsync[i].lo =
>-                pScrn->monitor->hsync[i].hi = 37.5;
>-            i++;
>-        }
>-        if((ddc->timings1.t1 & 0x08) || (ddc->timings1.t1 & 0x01))
>-        {
>-            pScrn->monitor->hsync[i].lo =
>-                pScrn->monitor->hsync[i].hi = 37.9;
>-            i++;
>-        }
>-        if(ddc->timings1.t2 & 0x40)
>-        {
>-            pScrn->monitor->hsync[i].lo =
>-                pScrn->monitor->hsync[i].hi = 46.9;
>-            i++;
>-        }
>-        if((ddc->timings1.t2 & 0x80) || (ddc->timings1.t2 & 0x08))
>-        {
>-            pScrn->monitor->hsync[i].lo =
>-                pScrn->monitor->hsync[i].hi = 48.1;
>-            i++;
>-        }
>-        if(ddc->timings1.t2 & 0x04)
>-        {
>-            pScrn->monitor->hsync[i].lo =
>-                pScrn->monitor->hsync[i].hi = 56.5;
>-            i++;
>-        }
>-        if(ddc->timings1.t2 & 0x02)
>-        {
>-            pScrn->monitor->hsync[i].lo =
>-                pScrn->monitor->hsync[i].hi = 60.0;
>-            i++;
>-        }
>-        if(ddc->timings1.t2 & 0x01)
>-        {
>-            pScrn->monitor->hsync[i].lo =
>-                pScrn->monitor->hsync[i].hi = 64.0;
>-            i++;
>-        }
>-        pScrn->monitor->nHsync = i;
>+    MonPtr monitor = pScrn->monitor;
>+    xf86MonPtr DDC = (xf86MonPtr)(pScrn->monitor->DDC);
>+    int i, j;
>+    float hmin = 1e6, hmax = 0.0, vmin = 1e6, vmax = 0.0;
>+    float h, v;
>+    struct std_timings *t;
>+    struct detailed_timings *dt;
>+    struct monitor_ranges *mon_range = NULL;
>+    int numTimings = 0;
>+    range hsync[MAX_HSYNC];
>+    range vrefresh[MAX_VREFRESH];
>+
>+    numTimings = 0;
>+
>+    if (flag) { /* Hsync */
>+	for (i = 0; i < DET_TIMINGS; i++) {
>+	    switch (DDC->det_mon[i].type) {
>+	    case DS_RANGES:
>+		mon_range = &DDC->det_mon[i].section.ranges;
>+		hsync[numTimings].lo = mon_range->min_h;
>+		hsync[numTimings].hi = mon_range->max_h;
>+		numTimings++;
>+		break;
>+
>+	    case DS_STD_TIMINGS:
>+		t = DDC->det_mon[i].section.std_t;
>+		for (j = 0; j < 5; j++) {
>+		    if (t[j].hsize > 256) { /* sanity check */
>+			h = t[j].refresh * 1.07 * t[j].vsize / 1000.0;
>+			if (h < hmin)
>+			    hmin = h;
>+			if (h > hmax)
>+			    hmax = h;
>+		    }
>+		}
>+		break;
>+
>+	    case DT:
>+		dt = &DDC->det_mon[i].section.d_timings;
>+		if (dt->clock > 15000000) { /* sanity check */
>+		    h = (float)dt->clock / (dt->h_active + dt->h_blanking);
>+		    h /= 1000.0;
>+		    if (h < hmin)
>+			hmin = h;
>+		    if (h > hmax)
>+			hmax = h;
>+		}
>+		break;
>+	    }
>+
>+	    if (numTimings > MAX_HSYNC)
>+		break;
>+	}
>+
>+	if (numTimings == 0) {
>+	    t = DDC->timings2;
>+	    for (i = 0; i < STD_TIMINGS; i++) {
>+		if (t[i].hsize > 256) { /* sanity check */
>+		    h = t[i].refresh * 1.07 * t[i].vsize / 1000.0;
>+		    if (h < hmin)
>+			hmin = h;
>+		    if (h > hmax)
>+			hmax = h;
>+		}
>+	    }
>+
>+	    if (hmax > 0.0) {
>+		hsync[numTimings].lo = hmin;
>+		hsync[numTimings].hi = hmax;
>+		numTimings++;
>+	    }
>+	}
>+
>+	if (numTimings > 0) {
>+	    monitor->nHsync = numTimings;
>+	    for (i = 0; i < numTimings; i++) {
>+	    	monitor->hsync[i].lo = hsync[i].lo;
>+	    	monitor->hsync[i].hi = hsync[i].hi;
>+	    }
>+	} else {
>+	    pScrn->monitor->hsync[0].lo = 28;
>+            pScrn->monitor->hsync[0].hi = 60;
>+            monitor->nHsync = 1;
>+	}
>+
>+    } else {  /* Vrefresh */
>+	for (i = 0; i < DET_TIMINGS; i++) {
>+	    switch (DDC->det_mon[i].type) {
>+	    case DS_RANGES:
>+		mon_range = &DDC->det_mon[i].section.ranges;
>+		vrefresh[numTimings].lo = mon_range->min_v;
>+		vrefresh[numTimings].hi = mon_range->max_v;
>+		numTimings++;
>+		break;
>+
>+	    case DS_STD_TIMINGS:
>+		t = DDC->det_mon[i].section.std_t;
>+		for (j = 0; j < 5; j++) {
>+		    if (t[j].hsize > 256) { /* sanity check */
>+			if (t[j].refresh < vmin)
>+			    vmin = t[i].refresh;
>+			if (t[j].refresh > vmax)
>+			    vmax = t[i].refresh;
>+		    }
>+		}
>+		break;
>+
>+	    case DT:
>+		dt = &DDC->det_mon[i].section.d_timings;
>+		if (dt->clock > 15000000) { /* sanity check */
>+		    h = (float)dt->clock / (dt->h_active + dt->h_blanking);
>+		    v = h / (dt->v_active + dt->v_blanking);
>+		    if (dt->interlaced) 
>+			v /= 2.0;
>+
>+		    if (v < vmin)
>+			vmin = v;
>+		    if (v > vmax)
>+			vmax = v;
>+		}
>+		break;
>+	    }
>+
>+	    if (numTimings > MAX_HSYNC)
>+		break;
>+	}
>+
>+	if (numTimings == 0) {
>+	    t = DDC->timings2;
>+	    for (i = 0; i < STD_TIMINGS; i++) {
>+		if (t[i].hsize > 256) { /* sanity check */
>+		    if (t[i].refresh < vmin)
>+			vmin = t[i].refresh;
>+		    if (t[i].refresh > vmax)
>+			vmax = t[i].refresh;
>+		}
>+	    }
>+
>+	    if (vmax > 0.0) {
>+		vrefresh[numTimings].lo = vmin;
>+		vrefresh[numTimings].hi = vmax;
>+		numTimings++;
>+	    }
>+	}
>+
>+	if (numTimings > 0) {
>+	    monitor->nVrefresh = numTimings;
>+	    for (i = 0; i < numTimings; i++) {
>+		monitor->vrefresh[i].lo = vrefresh[i].lo;
>+		monitor->vrefresh[i].hi = vrefresh[i].hi;
>+	    }
>+	 } else {
>+	    pScrn->monitor->vrefresh[0].lo = 43;
>+            pScrn->monitor->vrefresh[0].hi = 72;
>+            monitor->nVrefresh = 1;
>+	}
>     }
>-    else      /*Vrefresh*/
>-    {
>-        for(i=0; i<4; i++)
>-        {
>-            if(ddc->det_mon[i].type == DS_RANGES)
>-            {
>-                pScrn->monitor->nVrefresh = 1;
>-                pScrn->monitor->vrefresh[0].lo =
>-                    ddc->det_mon[i].section.ranges.min_v;
>-                pScrn->monitor->vrefresh[0].hi =
>-                    ddc->det_mon[i].section.ranges.max_v;
>-                return;
>-            }
>-        }
>-        i = 0;
>-        if(ddc->timings1.t1 & 0x02) /*800x600@56*/
>-        {
>-            pScrn->monitor->vrefresh[i].lo =
>-                pScrn->monitor->vrefresh[i].hi = 56;
>-            i++;
>-        }
>-        if((ddc->timings1.t1 & 0x01) || (ddc->timings1.t2 & 0x08))
>-        {
>-            pScrn->monitor->vrefresh[i].lo =
>-                pScrn->monitor->vrefresh[i].hi = 60;
>-            i++;
>-        }
>-        if(ddc->timings1.t2 & 0x04)
>-        {
>-            pScrn->monitor->vrefresh[i].lo =
>-                pScrn->monitor->vrefresh[i].hi = 70;
>-            i++;
>-        }
>-        if((ddc->timings1.t1 & 0x08) || (ddc->timings1.t2 & 0x80))
>-        {
>-            pScrn->monitor->vrefresh[i].lo =
>-                pScrn->monitor->vrefresh[i].hi = 72;
>-            i++;
>-        }
>-        if((ddc->timings1.t1 & 0x04) || (ddc->timings1.t2 & 0x40)
>-           || (ddc->timings1.t2 & 0x02) || (ddc->timings1.t2 & 0x01))
>-        {
>-            pScrn->monitor->vrefresh[i].lo =
>-                pScrn->monitor->vrefresh[i].hi = 75;
>-            i++;
>-        }
>-        pScrn->monitor->nVrefresh = i;
>-    }
> }
> 
> /***********

Actions: View | Splinter Review

Attachments on bug 6309: 4986

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.