Rev 5271 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 5271 | Rev 6104 | ||
|---|---|---|---|
| Line 117... | Line 117... | ||
| 117 | radeon_bo_kunmap(gtt_obj[i]); |
117 | radeon_bo_kunmap(gtt_obj[i]); |
| Line 118... | Line 118... | ||
| 118 | 118 | ||
| 119 | if (ring == R600_RING_TYPE_DMA_INDEX) |
119 | if (ring == R600_RING_TYPE_DMA_INDEX) |
| 120 | fence = radeon_copy_dma(rdev, gtt_addr, vram_addr, |
120 | fence = radeon_copy_dma(rdev, gtt_addr, vram_addr, |
| 121 | size / RADEON_GPU_PAGE_SIZE, |
121 | size / RADEON_GPU_PAGE_SIZE, |
| 122 | NULL); |
122 | vram_obj->tbo.resv); |
| 123 | else |
123 | else |
| 124 | fence = radeon_copy_blit(rdev, gtt_addr, vram_addr, |
124 | fence = radeon_copy_blit(rdev, gtt_addr, vram_addr, |
| 125 | size / RADEON_GPU_PAGE_SIZE, |
125 | size / RADEON_GPU_PAGE_SIZE, |
| 126 | NULL); |
126 | vram_obj->tbo.resv); |
| 127 | if (IS_ERR(fence)) { |
127 | if (IS_ERR(fence)) { |
| 128 | DRM_ERROR("Failed GTT->VRAM copy %d\n", i); |
128 | DRM_ERROR("Failed GTT->VRAM copy %d\n", i); |
| 129 | r = PTR_ERR(fence); |
129 | r = PTR_ERR(fence); |
| 130 | goto out_lclean_unpin; |
130 | goto out_lclean_unpin; |
| Line 168... | Line 168... | ||
| 168 | radeon_bo_kunmap(vram_obj); |
168 | radeon_bo_kunmap(vram_obj); |
| Line 169... | Line 169... | ||
| 169 | 169 | ||
| 170 | if (ring == R600_RING_TYPE_DMA_INDEX) |
170 | if (ring == R600_RING_TYPE_DMA_INDEX) |
| 171 | fence = radeon_copy_dma(rdev, vram_addr, gtt_addr, |
171 | fence = radeon_copy_dma(rdev, vram_addr, gtt_addr, |
| 172 | size / RADEON_GPU_PAGE_SIZE, |
172 | size / RADEON_GPU_PAGE_SIZE, |
| 173 | NULL); |
173 | vram_obj->tbo.resv); |
| 174 | else |
174 | else |
| 175 | fence = radeon_copy_blit(rdev, vram_addr, gtt_addr, |
175 | fence = radeon_copy_blit(rdev, vram_addr, gtt_addr, |
| 176 | size / RADEON_GPU_PAGE_SIZE, |
176 | size / RADEON_GPU_PAGE_SIZE, |
| 177 | NULL); |
177 | vram_obj->tbo.resv); |
| 178 | if (IS_ERR(fence)) { |
178 | if (IS_ERR(fence)) { |
| 179 | DRM_ERROR("Failed VRAM->GTT copy %d\n", i); |
179 | DRM_ERROR("Failed VRAM->GTT copy %d\n", i); |
| 180 | r = PTR_ERR(fence); |
180 | r = PTR_ERR(fence); |
| 181 | goto out_lclean_unpin; |
181 | goto out_lclean_unpin; |