Attachment 35710 Details for Bug 28114 – force specific domains for Xv src data

[patch] force specific domains for Xv src data

bug28114.diff (text/plain), 3.64 KB, created by Alex Deucher on 2010-05-17 07:39:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2010-05-17 07:39:19 UTC

Size: 3.64 KB

patch

obsolete

>diff --git a/src/r600_textured_videofuncs.c b/src/r600_textured_videofuncs.c
>index 2a86df3..f4e4a17 100644
>--- a/src/r600_textured_videofuncs.c
>+++ b/src/r600_textured_videofuncs.c
>@@ -181,7 +181,7 @@ R600DisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
>     src_obj.width = pPriv->w;
>     src_obj.height = pPriv->h;
>     src_obj.bpp = 16;
>-    src_obj.domain = RADEON_GEM_DOMAIN_VRAM | RADEON_GEM_DOMAIN_GTT;
>+    src_obj.domain = RADEON_GEM_DOMAIN_GTT;
>     src_obj.bo = pPriv->src_bo[pPriv->currentBuffer];
>     
>     dst_obj.width = pPixmap->drawable.width;
>diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
>index 138dfa3..eb1b79e 100644
>--- a/src/radeon_textured_videofuncs.c
>+++ b/src/radeon_textured_videofuncs.c
>@@ -107,10 +107,10 @@ FUNC_NAME(RADEONPrepareTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
> 	int ret;
> 
> 	radeon_cs_space_reset_bos(info->cs);
>-        radeon_cs_space_add_persistent_bo(info->cs, src_bo, RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM, 0);
>+        radeon_cs_space_add_persistent_bo(info->cs, src_bo, RADEON_GEM_DOMAIN_GTT, 0);
> 
> 	if (pPriv->bicubic_enabled)
>-	    radeon_cs_space_add_persistent_bo(info->cs, info->bicubic_bo, RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM, 0);
>+	    radeon_cs_space_add_persistent_bo(info->cs, info->bicubic_bo, RADEON_GEM_DOMAIN_VRAM, 0);
> 
> 	driver_priv = exaGetPixmapDriverPrivate(pPixmap);
> 	radeon_cs_space_add_persistent_bo(info->cs, driver_priv->bo, 0, RADEON_GEM_DOMAIN_VRAM);
>@@ -574,10 +574,10 @@ FUNC_NAME(R200PrepareTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
> 	int ret;
> 
> 	radeon_cs_space_reset_bos(info->cs);
>-        radeon_cs_space_add_persistent_bo(info->cs, src_bo, RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM, 0);
>+        radeon_cs_space_add_persistent_bo(info->cs, src_bo, RADEON_GEM_DOMAIN_GTT, 0);
> 
> 	if (pPriv->bicubic_enabled)
>-	    radeon_cs_space_add_persistent_bo(info->cs, info->bicubic_bo, RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM, 0);
>+	    radeon_cs_space_add_persistent_bo(info->cs, info->bicubic_bo, RADEON_GEM_DOMAIN_VRAM, 0);
> 
> 	driver_priv = exaGetPixmapDriverPrivate(pPixmap);
> 	radeon_cs_space_add_persistent_bo(info->cs, driver_priv->bo, 0, RADEON_GEM_DOMAIN_VRAM);
>@@ -1191,10 +1191,10 @@ FUNC_NAME(R300PrepareTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
> 	int ret;
> 
> 	radeon_cs_space_reset_bos(info->cs);
>-	radeon_cs_space_add_persistent_bo(info->cs, src_bo, RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM, 0);
>+	radeon_cs_space_add_persistent_bo(info->cs, src_bo, RADEON_GEM_DOMAIN_GTT, 0);
> 
> 	if (pPriv->bicubic_enabled)
>-	  radeon_cs_space_add_persistent_bo(info->cs, info->bicubic_bo, RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM, 0);
>+	  radeon_cs_space_add_persistent_bo(info->cs, info->bicubic_bo, RADEON_GEM_DOMAIN_VRAM, 0);
> 
> 	driver_priv = exaGetPixmapDriverPrivate(pPixmap);
> 	radeon_cs_space_add_persistent_bo(info->cs, driver_priv->bo, 0, RADEON_GEM_DOMAIN_VRAM);
>@@ -2673,10 +2673,10 @@ FUNC_NAME(R500PrepareTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
> 	int ret;
> 
> 	radeon_cs_space_reset_bos(info->cs);
>-	radeon_cs_space_add_persistent_bo(info->cs, src_bo, RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM, 0);
>+	radeon_cs_space_add_persistent_bo(info->cs, src_bo, RADEON_GEM_DOMAIN_GTT, 0);
> 
> 	if (pPriv->bicubic_enabled)
>-	    radeon_cs_space_add_persistent_bo(info->cs, info->bicubic_bo, RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM, 0);
>+	    radeon_cs_space_add_persistent_bo(info->cs, info->bicubic_bo, RADEON_GEM_DOMAIN_VRAM, 0);
> 
> 	driver_priv = exaGetPixmapDriverPrivate(pPixmap);
> 	radeon_cs_space_add_persistent_bo(info->cs, driver_priv->bo, 0, RADEON_GEM_DOMAIN_VRAM);

Actions: View | Splinter Review

Attachments on bug 28114: 35667 | 35672 | 35710

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.