summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2013-02-21 16:54:46 +0100
committerIan Romanick <ian.d.romanick@intel.com>2013-03-05 14:58:04 -0800
commit391e7ed51edbc2980757ccc0022bed5370e96e2f (patch)
tree3871a06a0984874eff9544976663820ea77285a7
parentdb5492cae38bef58d7c466e41541382774fe9b8f (diff)
r600g: use async DMA with a non-zero src offset
probably a typo Tested-by: Andreas Boll <andreas.boll.dev@gmail.com> NOTE: This is a candidate for the 9.1 branch. (cherry picked from commit 9dd18f43a4db73be73dfbf2e9950ae4dfaf6322e)
-rw-r--r--src/gallium/drivers/r600/r600_buffer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/r600/r600_buffer.c b/src/gallium/drivers/r600/r600_buffer.c
index 6df0d91a56c..89740359be0 100644
--- a/src/gallium/drivers/r600/r600_buffer.c
+++ b/src/gallium/drivers/r600/r600_buffer.c
@@ -189,7 +189,7 @@ static void r600_buffer_transfer_unmap(struct pipe_context *pipe,
doffset = transfer->box.x;
soffset = rtransfer->offset + transfer->box.x % R600_MAP_BUFFER_ALIGNMENT;
/* Copy the staging buffer into the original one. */
- if (rctx->rings.dma.cs && !(size % 4) && !(doffset % 4) && !(soffset)) {
+ if (rctx->rings.dma.cs && !(size % 4) && !(doffset % 4) && !(soffset % 4)) {
if (rctx->screen->chip_class >= EVERGREEN) {
evergreen_dma_copy(rctx, dst, src, doffset, soffset, size);
} else {