diff options
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_mem.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_ttm.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/ttm/ttm_page_alloc.c | 11 | ||||
-rw-r--r-- | drivers/gpu/drm/ttm/ttm_tt.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 | ||||
-rw-r--r-- | include/drm/ttm/ttm_bo_driver.h | 1 | ||||
-rw-r--r-- | include/drm/ttm/ttm_page_alloc.h | 8 |
7 files changed, 10 insertions, 18 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c index 2b4e5e912110..123969dd4f56 100644 --- a/drivers/gpu/drm/nouveau/nouveau_mem.c +++ b/drivers/gpu/drm/nouveau/nouveau_mem.c | |||
@@ -409,7 +409,6 @@ nouveau_mem_vram_init(struct drm_device *dev) | |||
409 | if (ret) | 409 | if (ret) |
410 | return ret; | 410 | return ret; |
411 | 411 | ||
412 | dev_priv->ttm.bdev.dev = dev->dev; | ||
413 | ret = ttm_bo_device_init(&dev_priv->ttm.bdev, | 412 | ret = ttm_bo_device_init(&dev_priv->ttm.bdev, |
414 | dev_priv->ttm.bo_global_ref.ref.object, | 413 | dev_priv->ttm.bo_global_ref.ref.object, |
415 | &nouveau_bo_driver, DRM_FILE_PAGE_OFFSET, | 414 | &nouveau_bo_driver, DRM_FILE_PAGE_OFFSET, |
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index 177adc884b74..df5734d0c4af 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c | |||
@@ -513,7 +513,6 @@ int radeon_ttm_init(struct radeon_device *rdev) | |||
513 | if (r) { | 513 | if (r) { |
514 | return r; | 514 | return r; |
515 | } | 515 | } |
516 | rdev->mman.bdev.dev = rdev->dev; | ||
517 | /* No others user of address space so set it to 0 */ | 516 | /* No others user of address space so set it to 0 */ |
518 | r = ttm_bo_device_init(&rdev->mman.bdev, | 517 | r = ttm_bo_device_init(&rdev->mman.bdev, |
519 | rdev->mman.bo_global_ref.ref.object, | 518 | rdev->mman.bo_global_ref.ref.object, |
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c index 35849dbf3ab5..737a2a2e46a5 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c | |||
@@ -664,7 +664,7 @@ out: | |||
664 | */ | 664 | */ |
665 | int ttm_get_pages(struct list_head *pages, int flags, | 665 | int ttm_get_pages(struct list_head *pages, int flags, |
666 | enum ttm_caching_state cstate, unsigned count, | 666 | enum ttm_caching_state cstate, unsigned count, |
667 | dma_addr_t *dma_address, struct device *dev) | 667 | dma_addr_t *dma_address) |
668 | { | 668 | { |
669 | struct ttm_page_pool *pool = ttm_get_pool(flags, cstate); | 669 | struct ttm_page_pool *pool = ttm_get_pool(flags, cstate); |
670 | struct page *p = NULL; | 670 | struct page *p = NULL; |
@@ -685,7 +685,7 @@ int ttm_get_pages(struct list_head *pages, int flags, | |||
685 | for (r = 0; r < count; ++r) { | 685 | for (r = 0; r < count; ++r) { |
686 | if ((flags & TTM_PAGE_FLAG_DMA32) && dma_address) { | 686 | if ((flags & TTM_PAGE_FLAG_DMA32) && dma_address) { |
687 | void *addr; | 687 | void *addr; |
688 | addr = dma_alloc_coherent(dev, PAGE_SIZE, | 688 | addr = dma_alloc_coherent(NULL, PAGE_SIZE, |
689 | &dma_address[r], | 689 | &dma_address[r], |
690 | gfp_flags); | 690 | gfp_flags); |
691 | if (addr == NULL) | 691 | if (addr == NULL) |
@@ -730,7 +730,7 @@ int ttm_get_pages(struct list_head *pages, int flags, | |||
730 | printk(KERN_ERR TTM_PFX | 730 | printk(KERN_ERR TTM_PFX |
731 | "Failed to allocate extra pages " | 731 | "Failed to allocate extra pages " |
732 | "for large request."); | 732 | "for large request."); |
733 | ttm_put_pages(pages, 0, flags, cstate, NULL, NULL); | 733 | ttm_put_pages(pages, 0, flags, cstate, NULL); |
734 | return r; | 734 | return r; |
735 | } | 735 | } |
736 | } | 736 | } |
@@ -741,8 +741,7 @@ int ttm_get_pages(struct list_head *pages, int flags, | |||
741 | 741 | ||
742 | /* Put all pages in pages list to correct pool to wait for reuse */ | 742 | /* Put all pages in pages list to correct pool to wait for reuse */ |
743 | void ttm_put_pages(struct list_head *pages, unsigned page_count, int flags, | 743 | void ttm_put_pages(struct list_head *pages, unsigned page_count, int flags, |
744 | enum ttm_caching_state cstate, dma_addr_t *dma_address, | 744 | enum ttm_caching_state cstate, dma_addr_t *dma_address) |
745 | struct device *dev) | ||
746 | { | 745 | { |
747 | unsigned long irq_flags; | 746 | unsigned long irq_flags; |
748 | struct ttm_page_pool *pool = ttm_get_pool(flags, cstate); | 747 | struct ttm_page_pool *pool = ttm_get_pool(flags, cstate); |
@@ -758,7 +757,7 @@ void ttm_put_pages(struct list_head *pages, unsigned page_count, int flags, | |||
758 | void *addr = page_address(p); | 757 | void *addr = page_address(p); |
759 | WARN_ON(!addr || !dma_address[r]); | 758 | WARN_ON(!addr || !dma_address[r]); |
760 | if (addr) | 759 | if (addr) |
761 | dma_free_coherent(dev, PAGE_SIZE, | 760 | dma_free_coherent(NULL, PAGE_SIZE, |
762 | addr, | 761 | addr, |
763 | dma_address[r]); | 762 | dma_address[r]); |
764 | dma_address[r] = 0; | 763 | dma_address[r] = 0; |
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c index 0f8fc9ff0c53..86d5b1745a45 100644 --- a/drivers/gpu/drm/ttm/ttm_tt.c +++ b/drivers/gpu/drm/ttm/ttm_tt.c | |||
@@ -110,7 +110,7 @@ static struct page *__ttm_tt_get_page(struct ttm_tt *ttm, int index) | |||
110 | INIT_LIST_HEAD(&h); | 110 | INIT_LIST_HEAD(&h); |
111 | 111 | ||
112 | ret = ttm_get_pages(&h, ttm->page_flags, ttm->caching_state, 1, | 112 | ret = ttm_get_pages(&h, ttm->page_flags, ttm->caching_state, 1, |
113 | &ttm->dma_address[index], ttm->be->bdev->dev); | 113 | &ttm->dma_address[index]); |
114 | 114 | ||
115 | if (ret != 0) | 115 | if (ret != 0) |
116 | return NULL; | 116 | return NULL; |
@@ -304,7 +304,7 @@ static void ttm_tt_free_alloced_pages(struct ttm_tt *ttm) | |||
304 | } | 304 | } |
305 | } | 305 | } |
306 | ttm_put_pages(&h, count, ttm->page_flags, ttm->caching_state, | 306 | ttm_put_pages(&h, count, ttm->page_flags, ttm->caching_state, |
307 | ttm->dma_address, ttm->be->bdev->dev); | 307 | ttm->dma_address); |
308 | ttm->state = tt_unpopulated; | 308 | ttm->state = tt_unpopulated; |
309 | ttm->first_himem_page = ttm->num_pages; | 309 | ttm->first_himem_page = ttm->num_pages; |
310 | ttm->last_lomem_page = -1; | 310 | ttm->last_lomem_page = -1; |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index df04661e2b93..96949b93d920 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | |||
@@ -322,7 +322,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) | |||
322 | ttm_lock_set_kill(&dev_priv->fbdev_master.lock, false, SIGTERM); | 322 | ttm_lock_set_kill(&dev_priv->fbdev_master.lock, false, SIGTERM); |
323 | dev_priv->active_master = &dev_priv->fbdev_master; | 323 | dev_priv->active_master = &dev_priv->fbdev_master; |
324 | 324 | ||
325 | dev_priv->bdev.dev = dev->dev; | 325 | |
326 | ret = ttm_bo_device_init(&dev_priv->bdev, | 326 | ret = ttm_bo_device_init(&dev_priv->bdev, |
327 | dev_priv->bo_global_ref.ref.object, | 327 | dev_priv->bo_global_ref.ref.object, |
328 | &vmw_bo_driver, VMWGFX_FILE_PAGE_OFFSET, | 328 | &vmw_bo_driver, VMWGFX_FILE_PAGE_OFFSET, |
diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index 38ff06822609..efed0820d9fa 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h | |||
@@ -551,7 +551,6 @@ struct ttm_bo_device { | |||
551 | struct list_head device_list; | 551 | struct list_head device_list; |
552 | struct ttm_bo_global *glob; | 552 | struct ttm_bo_global *glob; |
553 | struct ttm_bo_driver *driver; | 553 | struct ttm_bo_driver *driver; |
554 | struct device *dev; | ||
555 | rwlock_t vm_lock; | 554 | rwlock_t vm_lock; |
556 | struct ttm_mem_type_manager man[TTM_NUM_MEM_TYPES]; | 555 | struct ttm_mem_type_manager man[TTM_NUM_MEM_TYPES]; |
557 | spinlock_t fence_lock; | 556 | spinlock_t fence_lock; |
diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h index ccb6b7a240e2..8062890f725e 100644 --- a/include/drm/ttm/ttm_page_alloc.h +++ b/include/drm/ttm/ttm_page_alloc.h | |||
@@ -37,14 +37,12 @@ | |||
37 | * @cstate: ttm caching state for the page. | 37 | * @cstate: ttm caching state for the page. |
38 | * @count: number of pages to allocate. | 38 | * @count: number of pages to allocate. |
39 | * @dma_address: The DMA (bus) address of pages (if TTM_PAGE_FLAG_DMA32 set). | 39 | * @dma_address: The DMA (bus) address of pages (if TTM_PAGE_FLAG_DMA32 set). |
40 | * @dev: struct device for appropiate DMA accounting. | ||
41 | */ | 40 | */ |
42 | int ttm_get_pages(struct list_head *pages, | 41 | int ttm_get_pages(struct list_head *pages, |
43 | int flags, | 42 | int flags, |
44 | enum ttm_caching_state cstate, | 43 | enum ttm_caching_state cstate, |
45 | unsigned count, | 44 | unsigned count, |
46 | dma_addr_t *dma_address, | 45 | dma_addr_t *dma_address); |
47 | struct device *dev); | ||
48 | /** | 46 | /** |
49 | * Put linked list of pages to pool. | 47 | * Put linked list of pages to pool. |
50 | * | 48 | * |
@@ -54,14 +52,12 @@ int ttm_get_pages(struct list_head *pages, | |||
54 | * @flags: ttm flags for page allocation. | 52 | * @flags: ttm flags for page allocation. |
55 | * @cstate: ttm caching state. | 53 | * @cstate: ttm caching state. |
56 | * @dma_address: The DMA (bus) address of pages (if TTM_PAGE_FLAG_DMA32 set). | 54 | * @dma_address: The DMA (bus) address of pages (if TTM_PAGE_FLAG_DMA32 set). |
57 | * @dev: struct device for appropiate DMA accounting. | ||
58 | */ | 55 | */ |
59 | void ttm_put_pages(struct list_head *pages, | 56 | void ttm_put_pages(struct list_head *pages, |
60 | unsigned page_count, | 57 | unsigned page_count, |
61 | int flags, | 58 | int flags, |
62 | enum ttm_caching_state cstate, | 59 | enum ttm_caching_state cstate, |
63 | dma_addr_t *dma_address, | 60 | dma_addr_t *dma_address); |
64 | struct device *dev); | ||
65 | /** | 61 | /** |
66 | * Initialize pool allocator. | 62 | * Initialize pool allocator. |
67 | */ | 63 | */ |