Attachment 25890 Details for Bug 21683 – use XAA in low memory situations or when the DRI is disabled

[patch] use XAA in low memory situations or when the DRI is disabled

use_xaa_for_some_circumstances.diff (text/plain), 1.49 KB, created by Alex Deucher on 2009-05-15 08:19:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2009-05-15 08:19:18 UTC

Size: 1.49 KB

patch

obsolete

>diff --git a/src/radeon_driver.c b/src/radeon_driver.c
>index 8a2a978..29ee7a3 100644
>--- a/src/radeon_driver.c
>+++ b/src/radeon_driver.c
>@@ -2061,6 +2061,7 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
> #if defined(USE_EXA) && defined(USE_XAA)
>     char *optstr;
> #endif
>+    int maxy = info->FbMapSize / (pScrn->displayWidth * info->CurrentLayout.pixel_bytes);
> 
>     if (!(info->accel_state = xcalloc(1, sizeof(struct radeon_accel_state)))) {
> 	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Unable to allocate accel_state rec!\n");
>@@ -2081,7 +2082,16 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
> 	info->accel_state->has_tcl = TRUE;
>     }
> 
>-    info->useEXA = TRUE;
>+#ifdef XF86DRI
>+    if ((!info->directRenderingEnabled) ||
>+	(maxy <= pScrn->virtualY * 3) ||
>+	(pScrn->videoRam <= 32768))
>+	info->useEXA = FALSE;
>+    else
>+	info->useEXA = TRUE;
>+#else
>+	info->useEXA = FALSE;
>+#endif
> 
>     if (!xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) {
> 	int errmaj = 0, errmin = 0;
>@@ -2091,9 +2101,10 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
> #if defined(USE_XAA)
> 	optstr = (char *)xf86GetOptValString(info->Options, OPTION_ACCELMETHOD);
> 	if (optstr != NULL) {
>-	    if (xf86NameCmp(optstr, "EXA") == 0)
>+	    if (xf86NameCmp(optstr, "EXA") == 0) {
> 		from = X_CONFIG;
>-	    else if (xf86NameCmp(optstr, "XAA") == 0) {
>+		info->useEXA = TRUE;
>+	    } else if (xf86NameCmp(optstr, "XAA") == 0) {
> 		from = X_CONFIG;
> 		if (info->ChipFamily < CHIP_FAMILY_R600)
> 		    info->useEXA = FALSE;

Actions: View | Splinter Review

Attachments on bug 21683: 25793 | 25794 | 25795 | 25796 | 25890 | 25892 | 26475 | 26476 | 26479 | 26530 | 26531 | 26532 | 26533 | 26534 | 26535 | 26536

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.