diff options
| author | Jérôme Glisse <jglisse@redhat.com> | 2015-07-09 20:19:29 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-07-17 10:17:33 +0200 |
| commit | ef2b731759b9ae6380c9728b60ce92cf32683e94 (patch) | |
| tree | d288ccb02a159af75691a6ebe40d489f6de9fa1d /drivers/gpu/drm/ttm | |
| parent | Merge branch 'drm-rockchip-2015-07-13' of https://github.com/markyzq/kernel-d... (diff) | |
| download | linux-ef2b731759b9ae6380c9728b60ce92cf32683e94.tar.xz linux-ef2b731759b9ae6380c9728b60ce92cf32683e94.zip | |
drm/ttm: fix uncached page deallocation to properly fill page pool v3.
Current code never allowed the page pool to actualy fill in anyway.
This fix it, so that we only start freeing page from the pool when
we go over the pool size.
Changed since v1:
- Move the page batching optimization to its separate patch.
Changed since v2:
- Do not remove code part of the batching optimization with
this patch.
- Better commit message.
Signed-off-by: Jérôme Glisse <jglisse@redhat.com>
Reviewed-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/ttm')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c index 3077f1554099..af230802b90b 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c @@ -963,7 +963,6 @@ void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev) } else { pool->npages_free += count; list_splice(&ttm_dma->pages_list, &pool->free_list); - npages = count; if (pool->npages_free > _manager->options.max_size) { npages = pool->npages_free - _manager->options.max_size; /* free at least NUM_PAGES_TO_ALLOC number of pages |