Rev 6937 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 6937 | Rev 7144 | ||
---|---|---|---|
Line 390... | Line 390... | ||
390 | reserved_base, reserved_base + reserved_size, |
390 | reserved_base, reserved_base + reserved_size, |
391 | dev_priv->mm.stolen_base, stolen_top); |
391 | dev_priv->mm.stolen_base, stolen_top); |
392 | return 0; |
392 | return 0; |
393 | } |
393 | } |
Line -... | Line 394... | ||
- | 394 | ||
- | 395 | dev_priv->gtt.stolen_reserved_base = reserved_base; |
|
- | 396 | dev_priv->gtt.stolen_reserved_size = reserved_size; |
|
394 | 397 | ||
395 | /* It is possible for the reserved area to end before the end of stolen |
398 | /* It is possible for the reserved area to end before the end of stolen |
396 | * memory, so just consider the start. */ |
399 | * memory, so just consider the start. */ |
Line 397... | Line 400... | ||
397 | reserved_total = stolen_top - reserved_base; |
400 | reserved_total = stolen_top - reserved_base; |
Line 501... | Line 504... | ||
501 | obj->pages = i915_pages_create_for_stolen(dev, |
504 | obj->pages = i915_pages_create_for_stolen(dev, |
502 | stolen->start, stolen->size); |
505 | stolen->start, stolen->size); |
503 | if (obj->pages == NULL) |
506 | if (obj->pages == NULL) |
504 | goto cleanup; |
507 | goto cleanup; |
Line -... | Line 508... | ||
- | 508 | ||
- | 509 | obj->get_page.sg = obj->pages->sgl; |
|
- | 510 | obj->get_page.last = 0; |
|
505 | 511 | ||
506 | i915_gem_object_pin_pages(obj); |
512 | i915_gem_object_pin_pages(obj); |
Line 507... | Line 513... | ||
507 | obj->stolen = stolen; |
513 | obj->stolen = stolen; |
508 | 514 | ||
Line 564... | Line 570... | ||
564 | int ret; |
570 | int ret; |
Line 565... | Line 571... | ||
565 | 571 | ||
566 | if (!drm_mm_initialized(&dev_priv->mm.stolen)) |
572 | if (!drm_mm_initialized(&dev_priv->mm.stolen)) |
Line -... | Line 573... | ||
- | 573 | return NULL; |
|
- | 574 | ||
567 | return NULL; |
575 | lockdep_assert_held(&dev->struct_mutex); |
568 | 576 | ||
Line 569... | Line 577... | ||
569 | DRM_DEBUG_KMS("creating preallocated stolen object: stolen_offset=%x, gtt_offset=%x, size=%x\n", |
577 | DRM_DEBUG_KMS("creating preallocated stolen object: stolen_offset=%x, gtt_offset=%x, size=%x\n", |
570 | stolen_offset, gtt_offset, size); |
578 | stolen_offset, gtt_offset, size); |
Line 621... | Line 629... | ||
621 | goto err; |
629 | goto err; |
622 | } |
630 | } |
Line 623... | Line 631... | ||
623 | 631 | ||
624 | vma->bound |= GLOBAL_BIND; |
632 | vma->bound |= GLOBAL_BIND; |
625 | __i915_vma_set_map_and_fenceable(vma); |
633 | __i915_vma_set_map_and_fenceable(vma); |
626 | list_add_tail(&vma->mm_list, &ggtt->inactive_list); |
634 | list_add_tail(&vma->vm_link, &ggtt->inactive_list); |
Line 627... | Line 635... | ||
627 | } |
635 | } |
628 | 636 |