From 4957ade9b37dc5f713429e785e67c56e50b4ec58 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Wed, 24 Mar 2010 12:03:50 -0400 Subject: [PATCH] r6xx+ EXA/Xv: allow bo placement in vram or gart --- src/r600_exa.c | 8 ++++---- src/r600_textured_videofuncs.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/r600_exa.c b/src/r600_exa.c index e34a471..0ebc6f4 100644 --- a/src/r600_exa.c +++ b/src/r600_exa.c @@ -327,7 +327,7 @@ R600PrepareSolid(PixmapPtr pPix, int alu, Pixel pm, Pixel fg) 0, dst_pitch, pPix->drawable.width, pPix->drawable.height, dst_offset, dst_bo, pPix->drawable.bitsPerPixel, - RADEON_GEM_DOMAIN_VRAM, + RADEON_GEM_DOMAIN_VRAM | RADEON_GEM_DOMAIN_GTT, accel_state->solid_vs_offset, accel_state->solid_ps_offset, alu, pm)) return FALSE; @@ -761,7 +761,7 @@ R600PrepareCopy(PixmapPtr pSrc, PixmapPtr pDst, 0, dst_pitch, pDst->drawable.width, pDst->drawable.height, dst_offset, dst_bo, pDst->drawable.bitsPerPixel, - RADEON_GEM_DOMAIN_VRAM, + RADEON_GEM_DOMAIN_VRAM | RADEON_GEM_DOMAIN_GTT, accel_state->copy_vs_offset, accel_state->copy_ps_offset, rop, planemask)) return FALSE; @@ -1422,7 +1422,7 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture, RADEON_GEM_DOMAIN_VRAM | RADEON_GEM_DOMAIN_GTT, dst_pitch, pDst->drawable.width, pDst->drawable.height, dst_offset, dst_bo, pDst->drawable.bitsPerPixel, - RADEON_GEM_DOMAIN_VRAM, + RADEON_GEM_DOMAIN_VRAM | RADEON_GEM_DOMAIN_GTT, accel_state->comp_vs_offset, accel_state->comp_mask_ps_offset, 3, 0xffffffff)) return FALSE; @@ -1448,7 +1448,7 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture, 0, dst_pitch, pDst->drawable.width, pDst->drawable.height, dst_offset, dst_bo, pDst->drawable.bitsPerPixel, - RADEON_GEM_DOMAIN_VRAM, + RADEON_GEM_DOMAIN_VRAM | RADEON_GEM_DOMAIN_GTT, accel_state->comp_vs_offset, accel_state->comp_ps_offset, 3, 0xffffffff)) return FALSE; diff --git a/src/r600_textured_videofuncs.c b/src/r600_textured_videofuncs.c index fc7b40d..d4840a2 100644 --- a/src/r600_textured_videofuncs.c +++ b/src/r600_textured_videofuncs.c @@ -186,7 +186,7 @@ R600DisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv) 0, dst_pitch, pPixmap->drawable.width, pPixmap->drawable.height, dst_offset, dst_bo, pPixmap->drawable.bitsPerPixel, - RADEON_GEM_DOMAIN_VRAM, + RADEON_GEM_DOMAIN_VRAM | RADEON_GEM_DOMAIN_GTT, accel_state->xv_vs_offset, accel_state->xv_ps_offset, 3, 0xffffffff)) return; -- 1.5.6.3