Attachment 848644 Details for Bug 1029144 – Upstream Patch by Alex Deucher <alexander.deucher@amd.com>

[patch] Upstream Patch by Alex Deucher <alexander.deucher@amd.com>

file_1029144.txt (text/plain), 2.63 KB, created by kubrick@fgv6.net on 2014-01-11 15:52:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: kubrick@fgv6.net

Created: 2014-01-11 15:52:31 UTC

Size: 2.63 KB

patch

obsolete

>diff --git a/src/evergreen_exa.c b/src/evergreen_exa.c
>index abb5076..d788bfc 100644
>--- a/src/evergreen_exa.c
>+++ b/src/evergreen_exa.c
>@@ -1658,13 +1658,14 @@ EVERGREENUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h,
>     if (!driver_priv || !driver_priv->bo)
> 	return FALSE;
> 
>-    /* If we know the BO won't be busy, don't bother with a scratch */
>+    /* If we know the BO won't be busy / in VRAM, don't bother with a scratch */
>     copy_dst = driver_priv->bo;
>     copy_pitch = pDst->devKind;
>     if (!(driver_priv->tiling_flags & (RADEON_TILING_MACRO | RADEON_TILING_MICRO))) {
> 	if (!radeon_bo_is_referenced_by_cs(driver_priv->bo, info->cs)) {
> 	    flush = FALSE;
>-	    if (!radeon_bo_is_busy(driver_priv->bo, &dst_domain))
>+	    if (!radeon_bo_is_busy(driver_priv->bo, &dst_domain) &&
>+		!(dst_domain & RADEON_GEM_DOMAIN_VRAM))
> 		goto copy;
> 	}
>     }
>diff --git a/src/r600_exa.c b/src/r600_exa.c
>index a354ccd..8d11ce7 100644
>--- a/src/r600_exa.c
>+++ b/src/r600_exa.c
>@@ -1538,13 +1538,14 @@ R600UploadToScreenCS(PixmapPtr pDst, int x, int y, int w, int h,
>     if (!driver_priv || !driver_priv->bo)
> 	return FALSE;
> 
>-    /* If we know the BO won't be busy, don't bother with a scratch */
>+    /* If we know the BO won't be busy / in VRAM, don't bother with a scratch */
>     copy_dst = driver_priv->bo;
>     copy_pitch = pDst->devKind;
>     if (!(driver_priv->tiling_flags & (RADEON_TILING_MACRO | RADEON_TILING_MICRO))) {
> 	if (!radeon_bo_is_referenced_by_cs(driver_priv->bo, info->cs)) {
> 	    flush = FALSE;
>-	    if (!radeon_bo_is_busy(driver_priv->bo, &dst_domain))
>+	    if (!radeon_bo_is_busy(driver_priv->bo, &dst_domain) &&
>+		!(dst_domain & RADEON_GEM_DOMAIN_VRAM))
> 		goto copy;
> 	}
> 	/* use cpu copy for fast fb access */
>diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c
>index d9340c5..d901305 100644
>--- a/src/radeon_exa_funcs.c
>+++ b/src/radeon_exa_funcs.c
>@@ -403,13 +403,14 @@ RADEONUploadToScreenCS(PixmapPtr pDst, int x, int y, int w, int h,
>     }
> #endif
> 
>-    /* If we know the BO won't be busy, don't bother with a scratch */
>+    /* If we know the BO won't be busy / in VRAM, don't bother with a scratch */
>     copy_dst = driver_priv->bo;
>     copy_pitch = pDst->devKind;
>     if (!(driver_priv->tiling_flags & (RADEON_TILING_MACRO | RADEON_TILING_MICRO))) {
> 	if (!radeon_bo_is_referenced_by_cs(driver_priv->bo, info->cs)) {
> 	    flush = FALSE;
>-	    if (!radeon_bo_is_busy(driver_priv->bo, &dst_domain))
>+	    if (!radeon_bo_is_busy(driver_priv->bo, &dst_domain) &&
>+		!(dst_domain & RADEON_GEM_DOMAIN_VRAM))
> 		goto copy;
> 	}
> 	/* use cpu copy for fast fb access */

Actions: View | Diff

Attachments on bug 1029144: 822611 | 822613 | 848644