From b4099b7cdbe992920fd07b17c16606cba51d6d24 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Wed, 2 Jan 2013 18:30:21 -0500 Subject: [PATCH] --- yaml --- r: 348229 b: refs/heads/master c: 909d9eb67f1e4e39f2ea88e96bde03d560cde3eb h: refs/heads/master i: 348227: d853d1acfe7c6d43f0e532667235d7eef42c1566 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/r600.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 56fd1ca68449..934757d77a49 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cafa59b9011a7790be4ddd5979419259844a165d +refs/heads/master: 909d9eb67f1e4e39f2ea88e96bde03d560cde3eb diff --git a/trunk/drivers/gpu/drm/radeon/r600.c b/trunk/drivers/gpu/drm/radeon/r600.c index 2aaf147969bd..9f4ce5eb9e9c 100644 --- a/trunk/drivers/gpu/drm/radeon/r600.c +++ b/trunk/drivers/gpu/drm/radeon/r600.c @@ -2636,8 +2636,8 @@ int r600_copy_dma(struct radeon_device *rdev, for (i = 0; i < num_loops; i++) { cur_size_in_dw = size_in_dw; - if (cur_size_in_dw > 0xFFFF) - cur_size_in_dw = 0xFFFF; + if (cur_size_in_dw > 0xFFFE) + cur_size_in_dw = 0xFFFE; size_in_dw -= cur_size_in_dw; radeon_ring_write(ring, DMA_PACKET(DMA_PACKET_COPY, 0, 0, cur_size_in_dw)); radeon_ring_write(ring, dst_offset & 0xfffffffc);