Attachment 38202 Details for Bug 27139 – [PATCH 1/6] DownloadFromScreenCS: download via a scratch BO if pixmap domain is unknown

[patch] [PATCH 1/6] DownloadFromScreenCS: download via a scratch BO if pixmap domain is unknown

0001-DownloadFromScreenCS-download-via-a-scratch-BO-if-pi.patch (text/plain), 1.47 KB, created by Karl Tomlinson on 2010-08-26 15:10:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Karl Tomlinson

Created: 2010-08-26 15:10:02 UTC

Size: 1.47 KB

patch

obsolete

>From df63f153eb9e8ef380c7fc1f754183d646da9eba Mon Sep 17 00:00:00 2001
>From: Karl Tomlinson <karlt+@karlt.net>
>Date: Sat, 21 Aug 2010 21:44:39 +1200
>Subject: [PATCH 1/6] DownloadFromScreenCS: download via a scratch BO if pixmap domain is unknown
>
>radeon_bo_is_busy() may return without setting the domain out-parameter.
>If this happens, then download via a scratch GTT BO to avoid CPU VRAM read.
>---
> src/r600_exa.c         |    2 +-
> src/radeon_exa_funcs.c |    2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/src/r600_exa.c b/src/r600_exa.c
>index d6e98ff..9b7a0c9 100644
>--- a/src/r600_exa.c
>+++ b/src/r600_exa.c
>@@ -1885,7 +1885,7 @@ R600DownloadFromScreenCS(PixmapPtr pSrc, int x, int y, int w,
>     if (!src_domain)
> 	radeon_bo_is_busy(driver_priv->bo, &src_domain);
> 
>-    if (src_domain != RADEON_GEM_DOMAIN_VRAM)
>+    if (src_domain & ~(uint32_t)RADEON_GEM_DOMAIN_VRAM)
> 	return FALSE;
> 
>     size = scratch_pitch * h;
>diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c
>index 2df6ccb..a82e416 100644
>--- a/src/radeon_exa_funcs.c
>+++ b/src/radeon_exa_funcs.c
>@@ -598,7 +598,7 @@ RADEONDownloadFromScreenCS(PixmapPtr pSrc, int x, int y, int w,
>     if (!src_domain)
> 	radeon_bo_is_busy(driver_priv->bo, &src_domain);
> 
>-    if (src_domain != RADEON_GEM_DOMAIN_VRAM) {
>+    if (src_domain & ~(uint32_t)RADEON_GEM_DOMAIN_VRAM) {
> #if X_BYTE_ORDER == X_BIG_ENDIAN
> 	/* Can't return FALSE here if we need to swap bytes */
> 	if (swap != RADEON_HOST_DATA_SWAP_NONE) {
>-- 
>1.7.1
>

Actions: View | Splinter Review

Attachments on bug 27139: 34163 | 37900 | 38202 | 38203 | 38204 | 38205 | 38206 | 38207 | 38208

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.