Rev 1404 | Rev 1963 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1404 | Rev 1430 | ||
|---|---|---|---|
| Line 177... | Line 177... | ||
| 177 | bo->tbo.offset = bo->tbo.vm_node->start << PAGE_SHIFT; |
177 | bo->tbo.offset = bo->tbo.vm_node->start << PAGE_SHIFT; |
| Line 178... | Line 178... | ||
| 178 | 178 | ||
| 179 | if(bo->domain & RADEON_GEM_DOMAIN_VRAM) |
179 | if(bo->domain & RADEON_GEM_DOMAIN_VRAM) |
| 180 | { |
180 | { |
| 181 | bo->tbo.offset += (u64)bo->rdev->mc.vram_location; |
181 | bo->tbo.offset += (u64)bo->rdev->mc.vram_start; |
| 182 | } |
182 | } |
| 183 | else if (bo->domain & RADEON_GEM_DOMAIN_GTT) |
183 | else if (bo->domain & RADEON_GEM_DOMAIN_GTT) |
| 184 | { |
184 | { |
| 185 | u32_t *pagelist; |
185 | u32_t *pagelist; |
| Line 189... | Line 189... | ||
| 189 | pagelist = &((u32_t*)page_tabs)[(u32_t)bo->kptr >> 12]; |
189 | pagelist = &((u32_t*)page_tabs)[(u32_t)bo->kptr >> 12]; |
| 190 | dbgprintf("pagelist %x\n", pagelist); |
190 | dbgprintf("pagelist %x\n", pagelist); |
| 191 | radeon_gart_bind(bo->rdev, bo->tbo.offset, |
191 | radeon_gart_bind(bo->rdev, bo->tbo.offset, |
| 192 | bo->tbo.vm_node->size, pagelist); |
192 | bo->tbo.vm_node->size, pagelist); |
| 193 | bo->tbo.offset += (u64)bo->rdev->mc.gtt_location; |
193 | bo->tbo.offset += (u64)bo->rdev->mc.gtt_start; |
| 194 | } |
194 | } |
| 195 | else |
195 | else |
| 196 | { |
196 | { |
| 197 | DRM_ERROR("Unknown placement %x\n", bo->domain); |
197 | DRM_ERROR("Unknown placement %x\n", bo->domain); |
| 198 | bo->tbo.offset = -1; |
198 | bo->tbo.offset = -1; |
| Line 376... | Line 376... | ||
| 376 | vm_node->mm = NULL; |
376 | vm_node->mm = NULL; |
| 377 | 377 | ||
| Line 378... | Line 378... | ||
| 378 | bo->tbo.vm_node = vm_node; |
378 | bo->tbo.vm_node = vm_node; |
| 379 | bo->tbo.offset = bo->tbo.vm_node->start << PAGE_SHIFT; |
379 | bo->tbo.offset = bo->tbo.vm_node->start << PAGE_SHIFT; |
| 380 | bo->tbo.offset += (u64)bo->rdev->mc.vram_location; |
380 | bo->tbo.offset += (u64)bo->rdev->mc.vram_start; |
| 381 | bo->kptr = (void*)0xFE000000; |
381 | bo->kptr = (void*)0xFE000000; |
| 382 | bo->pin_count = 1; |
382 | bo->pin_count = 1; |
| Line 383... | Line 383... | ||
| 383 | 383 | ||