diff options
| author | Christian König <christian.koenig@amd.com> | 2014-06-03 14:51:46 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2014-06-09 22:06:48 -0400 |
| commit | 5e167cdbf6ab51c7cc7c3c2efdc54ec1080834d3 (patch) | |
| tree | 9905fda9cd5c888147cedcb7ca3bb5ab40065097 /drivers/gpu/drm/radeon/si_dma.c | |
| parent | 4c0dae57873edb1560b738c6519361c5ecd443ae (diff) | |
drm/radeon: use lower_32_bits where appropriate
Replace occurrences of "v & 0xffffffff" with lower_32_bits(v)
when it's next to an upper_32_bits(v). Also remove unnecessary
"upper_32_bits(v) & 0xffffffff" code snippets.
Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/si_dma.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/si_dma.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/si_dma.c b/drivers/gpu/drm/radeon/si_dma.c index 9a660f861d2c..e24c94b6d14d 100644 --- a/drivers/gpu/drm/radeon/si_dma.c +++ b/drivers/gpu/drm/radeon/si_dma.c | |||
| @@ -88,8 +88,8 @@ void si_dma_vm_set_page(struct radeon_device *rdev, | |||
| 88 | 88 | ||
| 89 | ib->ptr[ib->length_dw++] = DMA_PACKET(DMA_PACKET_COPY, | 89 | ib->ptr[ib->length_dw++] = DMA_PACKET(DMA_PACKET_COPY, |
| 90 | 1, 0, 0, bytes); | 90 | 1, 0, 0, bytes); |
| 91 | ib->ptr[ib->length_dw++] = pe & 0xffffffff; | 91 | ib->ptr[ib->length_dw++] = lower_32_bits(pe); |
| 92 | ib->ptr[ib->length_dw++] = src & 0xffffffff; | 92 | ib->ptr[ib->length_dw++] = lower_32_bits(src); |
| 93 | ib->ptr[ib->length_dw++] = upper_32_bits(pe) & 0xff; | 93 | ib->ptr[ib->length_dw++] = upper_32_bits(pe) & 0xff; |
| 94 | ib->ptr[ib->length_dw++] = upper_32_bits(src) & 0xff; | 94 | ib->ptr[ib->length_dw++] = upper_32_bits(src) & 0xff; |
| 95 | 95 | ||
| @@ -220,8 +220,8 @@ int si_copy_dma(struct radeon_device *rdev, | |||
| 220 | cur_size_in_bytes = 0xFFFFF; | 220 | cur_size_in_bytes = 0xFFFFF; |
| 221 | size_in_bytes -= cur_size_in_bytes; | 221 | size_in_bytes -= cur_size_in_bytes; |
| 222 | radeon_ring_write(ring, DMA_PACKET(DMA_PACKET_COPY, 1, 0, 0, cur_size_in_bytes)); | 222 | radeon_ring_write(ring, DMA_PACKET(DMA_PACKET_COPY, 1, 0, 0, cur_size_in_bytes)); |
| 223 | radeon_ring_write(ring, dst_offset & 0xffffffff); | 223 | radeon_ring_write(ring, lower_32_bits(dst_offset)); |
| 224 | radeon_ring_write(ring, src_offset & 0xffffffff); | 224 | radeon_ring_write(ring, lower_32_bits(src_offset)); |
| 225 | radeon_ring_write(ring, upper_32_bits(dst_offset) & 0xff); | 225 | radeon_ring_write(ring, upper_32_bits(dst_offset) & 0xff); |
| 226 | radeon_ring_write(ring, upper_32_bits(src_offset) & 0xff); | 226 | radeon_ring_write(ring, upper_32_bits(src_offset) & 0xff); |
| 227 | src_offset += cur_size_in_bytes; | 227 | src_offset += cur_size_in_bytes; |
