diff options
| author | Christian König <christian.koenig@amd.com> | 2016-06-06 04:17:55 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2016-07-07 14:54:36 -0400 |
| commit | a6f76dcd02f36faa9d45b759732453dcfbf8fe8a (patch) | |
| tree | 864a4a07f878eb449ffe36beb7f37024dac50e20 /drivers/gpu/drm/ttm | |
| parent | 77dfc28bad2c75493125ba8660e4c27c2dcdab57 (diff) | |
drm/ttm: drop wait for idle in ttm_bo_move_buffer
That is unnecessary now.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/ttm')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 041fb3b8b2aa..cc94df00939a 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c | |||
| @@ -996,20 +996,6 @@ static int ttm_bo_move_buffer(struct ttm_buffer_object *bo, | |||
| 996 | 996 | ||
| 997 | lockdep_assert_held(&bo->resv->lock.base); | 997 | lockdep_assert_held(&bo->resv->lock.base); |
| 998 | 998 | ||
| 999 | /* | ||
| 1000 | * Don't wait for the BO on initial allocation. This is important when | ||
| 1001 | * the BO has an imported reservation object. | ||
| 1002 | */ | ||
| 1003 | if (bo->mem.mem_type != TTM_PL_SYSTEM || bo->ttm != NULL) { | ||
| 1004 | /* | ||
| 1005 | * FIXME: It's possible to pipeline buffer moves. | ||
| 1006 | * Have the driver move function wait for idle when necessary, | ||
| 1007 | * instead of doing it here. | ||
| 1008 | */ | ||
| 1009 | ret = ttm_bo_wait(bo, interruptible, no_wait_gpu); | ||
| 1010 | if (ret) | ||
| 1011 | return ret; | ||
| 1012 | } | ||
| 1013 | mem.num_pages = bo->num_pages; | 999 | mem.num_pages = bo->num_pages; |
| 1014 | mem.size = mem.num_pages << PAGE_SHIFT; | 1000 | mem.size = mem.num_pages << PAGE_SHIFT; |
| 1015 | mem.page_alignment = bo->mem.page_alignment; | 1001 | mem.page_alignment = bo->mem.page_alignment; |
