Attachment 91541 Details for Bug 44099 – updated version of Michel's patch for all asics

[patch] updated version of Michel's patch for all asics

0001-radeon-exa-Always-use-a-scratch-surface-for-UTS-to-v.patch (text/plain), 3.27 KB, created by Alex Deucher on 2014-01-06 14:54:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2014-01-06 14:54:51 UTC

Size: 3.27 KB

patch

obsolete

>From 6336feaf17d5b0dcdcea6d713335636b974637d5 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Mon, 6 Jan 2014 09:52:50 -0500
>Subject: [PATCH] radeon/exa: Always use a scratch surface for UTS to vram
>
>If we don't, we may hit a buffer that crosses the
>visible vram boundary resulting in a sigbus when the
>CPU accesses the buffer beyond the PCI aperture.
>This will introduce a extra copy in certain cases.
>
>Bug:
>https://bugs.freedesktop.org/show_bug.cgi?id=44099
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>---
> src/evergreen_exa.c    | 5 +++--
> src/r600_exa.c         | 5 +++--
> src/radeon_exa_funcs.c | 5 +++--
> 3 files changed, 9 insertions(+), 6 deletions(-)
>
>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 */
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 44099: 57144 | 91541

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.