Commit 85621630 authored Apr 07, 2016 by Felix Kuehling Committed by Alex Deucher May 04, 2016

drm/ttm: Fix TTM BO accounting



TTM BO accounting is out of sync with how memory is really allocated
in ttm[_dma]_tt_alloc_page_directory. This resulted in excessive
estimated overhead with many small allocations.

ttm_dma_tt_alloc_page_directory makes a single allocation for three
arrays: pages, DMA and CPU addresses. It uses drm_calloc_large, which
uses kmalloc internally for allocations smaller than PAGE_SIZE.
ttm_round_pot should be a good approximation of its memory usage both
above and below PAGE_SIZE.

Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: Monk Liu <monk.liu@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 110e6f26

drivers/gpu/drm/ttm/ttm_bo.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -1215,7 +1215,7 @@ size_t ttm_bo_acc_size(struct ttm_bo_device *bdev,
		size_t size = 0;

		size += ttm_round_pot(struct_size);
		size += PAGE_ALIGN(npages * sizeof(void *));
		size += ttm_round_pot(npages * sizeof(void *));
		size += ttm_round_pot(sizeof(struct ttm_tt));
		return size;
		}
		@@ -1229,8 +1229,7 @@ size_t ttm_bo_dma_acc_size(struct ttm_bo_device *bdev,
		size_t size = 0;

		size += ttm_round_pot(struct_size);
		size += PAGE_ALIGN(npages * sizeof(void *));
		size += PAGE_ALIGN(npages * sizeof(dma_addr_t));
		size += ttm_round_pot(npages * (2sizeof(void ) + sizeof(dma_addr_t)));
		size += ttm_round_pot(sizeof(struct ttm_dma_tt));
		return size;
		}