Rev 5271 | Rev 6104 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 5271 | Rev 5346 | ||
|---|---|---|---|
| Line 239... | Line 239... | ||
| 239 | bo->flags &= ~RADEON_GEM_GTT_WC; |
239 | bo->flags &= ~RADEON_GEM_GTT_WC; |
| 240 | #endif |
240 | #endif |
| Line 241... | Line 241... | ||
| 241 | 241 | ||
| 242 | radeon_ttm_placement_from_domain(bo, domain); |
242 | radeon_ttm_placement_from_domain(bo, domain); |
| 243 | /* Kernel allocation are uninterruptible */ |
243 | /* Kernel allocation are uninterruptible */ |
| 244 | // down_read(&rdev->pm.mclk_lock); |
244 | down_read(&rdev->pm.mclk_lock); |
| 245 | r = ttm_bo_init(&rdev->mman.bdev, &bo->tbo, size, type, |
245 | r = ttm_bo_init(&rdev->mman.bdev, &bo->tbo, size, type, |
| 246 | &bo->placement, page_align, !kernel, NULL, |
246 | &bo->placement, page_align, !kernel, NULL, |
| 247 | acc_size, sg, resv, &radeon_ttm_bo_destroy); |
247 | acc_size, sg, resv, &radeon_ttm_bo_destroy); |
| 248 | // up_read(&rdev->pm.mclk_lock); |
248 | up_read(&rdev->pm.mclk_lock); |
| 249 | if (unlikely(r != 0)) { |
249 | if (unlikely(r != 0)) { |
| 250 | return r; |
250 | return r; |
| 251 | } |
251 | } |
| Line 486... | Line 486... | ||
| 486 | u32 domain = lobj->prefered_domains; |
486 | u32 domain = lobj->prefered_domains; |
| 487 | u32 allowed = lobj->allowed_domains; |
487 | u32 allowed = lobj->allowed_domains; |
| 488 | u32 current_domain = |
488 | u32 current_domain = |
| 489 | radeon_mem_type_to_domain(bo->tbo.mem.mem_type); |
489 | radeon_mem_type_to_domain(bo->tbo.mem.mem_type); |
| Line 490... | Line -... | ||
| 490 | - | ||
| 491 | WARN_ONCE(bo->gem_base.dumb, |
- | |
| 492 | "GPU use of dumb buffer is illegal.\n"); |
- | |
| 493 | 490 | ||
| 494 | /* Check if this buffer will be moved and don't move it |
491 | /* Check if this buffer will be moved and don't move it |
| 495 | * if we have moved too many buffers for this IB already. |
492 | * if we have moved too many buffers for this IB already. |
| 496 | * |
493 | * |
| 497 | * Note that this allows moving at least one buffer of |
494 | * Note that this allows moving at least one buffer of |