diff options
| author |   Christian König <christian.koenig@amd.com> | 2020-12-01 14:27:34 +0100 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2020-12-01 20:23:18 +0100 |
| commit | b73cd1e2ebfc8c22741eb4439bc5d347555f3e84 (patch) | |
| tree | ea7543f1ae48ca123f3869f776a2d4b1091339d2 /drivers/gpu/drm | |
| parent | drm/nouveau: Drop mutex_lock_nested for atomic (diff) | |
| download | linux-dev-b73cd1e2ebfc8c22741eb4439bc5d347555f3e84.tar.xz linux-dev-b73cd1e2ebfc8c22741eb4439bc5d347555f3e84.zip | |
drm/ttm: stop destroying pinned ghost object
Daniel added a warning for this, but we were abusing that behavior here.
Signed-off-by: Christian König <christian.koenig@amd.com>
Fixes: 57fcd550eb15 ("drm/ttm: Warn on pinning without holding a reference")
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/series/84456/
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo_util.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index 7ccb2295cac1..5bbc1339d28e 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c @@ -310,7 +310,7 @@ static int ttm_buffer_object_transfer(struct ttm_buffer_object *bo, kref_init(&fbo->base.kref); fbo->base.destroy = &ttm_transfered_destroy; fbo->base.acc_size = 0; - fbo->base.pin_count = 1; + fbo->base.pin_count = 0; if (bo->type != ttm_bo_type_sg) fbo->base.base.resv = &fbo->base.base._resv; @@ -319,6 +319,8 @@ static int ttm_buffer_object_transfer(struct ttm_buffer_object *bo, ret = dma_resv_trylock(&fbo->base.base._resv); WARN_ON(!ret); + ttm_bo_move_to_lru_tail_unlocked(&fbo->base); + *new_obj = &fbo->base; return 0; } |