Attachment 4988 Details for Bug 1992 – Attempt to fix some R300 family oddities in the handling of Option "DisplayPriority" "HIGH"

[patch] Attempt to fix some R300 family oddities in the handling of Option "DisplayPriority" "HIGH"

r300-dispbw-critical-point.diff (text/plain), 1.91 KB, created by Michel Dänzer on 2006-03-19 01:56:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2006-03-19 01:56:32 UTC

Size: 1.91 KB

patch

obsolete

>Index: src/radeon_driver.c
>===================================================================
>RCS file: /cvs/xorg/driver/xf86-video-ati/src/radeon_driver.c,v
>retrieving revision 1.101
>diff -p -u -r1.101 radeon_driver.c
>--- src/radeon_driver.c	15 Mar 2006 04:03:37 -0000	1.101
>+++ src/radeon_driver.c	18 Mar 2006 14:51:31 -0000
>@@ -7516,15 +7517,7 @@ static void RADEONInitDispBandwidth(Scrn
>     if (critical_point < temp) critical_point = temp;
>     */
>     if (info->DispPriority == 2) {
>-	if (mode2) {
>-	    /*??some R300 cards have problem with this set to 0, when CRTC2 is enabled.*/
>-	    if (info->ChipFamily == CHIP_FAMILY_R300) 
>-	        critical_point += 0x10;
>-	    else
>-	        critical_point = 0;
>-	}
>-	else
>-	    critical_point = 0;
>+	critical_point = 0;
>     }
> 
>     /*
>@@ -7533,6 +7526,11 @@ static void RADEONInitDispBandwidth(Scrn
>     */
>     if (max_stop_req - critical_point < 4) critical_point = 0; 
> 
>+    if (critical_point == 0 && mode2 && info->ChipFamily == CHIP_FAMILY_R300) {
>+	/* some R300 cards have problem with this set to 0, when CRTC2 is enabled.*/
>+	critical_point = 0x10;
>+    }
>+
>     temp = info->SavedReg.grph_buffer_cntl;
>     temp &= ~(RADEON_GRPH_STOP_REQ_MASK);
>     temp |= (stop_req << RADEON_GRPH_STOP_REQ_SHIFT);
>@@ -7586,16 +7584,18 @@ static void RADEONInitDispBandwidth(Scrn
> 					disp_latency) * disp_drain_rate2 + 0.5);
> 
> 	    if (info->DispPriority == 2) {
>-		if (info->ChipFamily == CHIP_FAMILY_R300) 
>-		    critical_point2 += 0x10;
>-		else
>-		    critical_point2 = 0;
>+		critical_point2 = 0;
> 	    }
> 
> 	    if (max_stop_req - critical_point2 < 4) critical_point2 = 0;
> 
> 	}
> 
>+	if (critical_point2 == 0 && info->ChipFamily == CHIP_FAMILY_R300) {
>+	    /* some R300 cards have problem with this set to 0 */
>+	    critical_point2 = 0x10;
>+	}
>+
> 	OUTREG(RADEON_GRPH2_BUFFER_CNTL, ((temp & ~RADEON_GRPH_CRITICAL_POINT_MASK) |
> 					  (critical_point2 << RADEON_GRPH_CRITICAL_POINT_SHIFT)));
>

Actions: View | Splinter Review

Attachments on bug 1992: 1443 | 3593 | 3594 | 4988

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.