Commit a10fbb42 authored by Alex Deucher's avatar Alex Deucher

drm/radeon: fix DMA CS parser for r6xx linear copy packet

Was using the r7xx format.
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 43fb7787
...@@ -2677,6 +2677,7 @@ int r600_dma_cs_parse(struct radeon_cs_parser *p) ...@@ -2677,6 +2677,7 @@ int r600_dma_cs_parse(struct radeon_cs_parser *p)
} }
p->idx += 7; p->idx += 7;
} else { } else {
if (p->family >= CHIP_RV770) {
src_offset = ib[idx+2]; src_offset = ib[idx+2];
src_offset |= ((u64)(ib[idx+4] & 0xff)) << 32; src_offset |= ((u64)(ib[idx+4] & 0xff)) << 32;
dst_offset = ib[idx+1]; dst_offset = ib[idx+1];
...@@ -2687,6 +2688,18 @@ int r600_dma_cs_parse(struct radeon_cs_parser *p) ...@@ -2687,6 +2688,18 @@ int r600_dma_cs_parse(struct radeon_cs_parser *p)
ib[idx+3] += upper_32_bits(dst_reloc->lobj.gpu_offset) & 0xff; ib[idx+3] += upper_32_bits(dst_reloc->lobj.gpu_offset) & 0xff;
ib[idx+4] += upper_32_bits(src_reloc->lobj.gpu_offset) & 0xff; ib[idx+4] += upper_32_bits(src_reloc->lobj.gpu_offset) & 0xff;
p->idx += 5; p->idx += 5;
} else {
src_offset = ib[idx+2];
src_offset |= ((u64)(ib[idx+3] & 0xff)) << 32;
dst_offset = ib[idx+1];
dst_offset |= ((u64)(ib[idx+3] & 0xff0000)) << 16;
ib[idx+1] += (u32)(dst_reloc->lobj.gpu_offset & 0xfffffffc);
ib[idx+2] += (u32)(src_reloc->lobj.gpu_offset & 0xfffffffc);
ib[idx+3] += upper_32_bits(src_reloc->lobj.gpu_offset) & 0xff;
ib[idx+3] += (upper_32_bits(dst_reloc->lobj.gpu_offset) & 0xff) << 16;
p->idx += 4;
}
} }
if ((src_offset + (count * 4)) > radeon_bo_size(src_reloc->robj)) { if ((src_offset + (count * 4)) > radeon_bo_size(src_reloc->robj)) {
dev_warn(p->dev, "DMA copy src buffer too small (%llu %lu)\n", dev_warn(p->dev, "DMA copy src buffer too small (%llu %lu)\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment