leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/ttm: don't wait for BO on initial allocation

Browse Source 
When we use an extern reservation object that otherwise waits for every
fence registered with it.

Reviewed-by: Sinclair Yeh <syeh@vmware.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König 2016-04-06 11:12:02 +02:00 committed by Alex Deucher
parent eb43096900
commit 5ee7b41a8b
1 changed files with 12 additions and 6 deletions

18
drivers/gpu/drm/ttm/ttm_bo.c
View File

@ -998,13 +998,19 @@ static int ttm_bo_move_buffer(struct ttm_buffer_object *bo,
lockdep_assert_held(&bo->resv->lock.base);
/*
* FIXME: It's possible to pipeline buffer moves.
* Have the driver move function wait for idle when necessary,
* instead of doing it here.
* Don't wait for the BO on initial allocation. This is important when
* the BO has an imported reservation object.
*/
ret = ttm_bo_wait(bo, false, interruptible, no_wait_gpu);
if (ret)
return ret;
if (bo->mem.mem_type != TTM_PL_SYSTEM || bo->ttm != NULL) {
/*
* FIXME: It's possible to pipeline buffer moves.
* Have the driver move function wait for idle when necessary,
* instead of doing it here.
*/
ret = ttm_bo_wait(bo, false, interruptible, no_wait_gpu);
if (ret)
return ret;
}
mem.num_pages = bo->num_pages;
mem.size = mem.num_pages << PAGE_SHIFT;
mem.page_alignment = bo->mem.page_alignment;