Skip to content

Commit ab4d991

Browse files
committed
drm/vmwgfx: Make sure we unpin no longer needed buffers
We were not correctly unpinning no longer needed buffers. In particular vmw_buffer_object, which is internally often pinned on creation wasn't unpinned on destruction and none of the internal MOB buffers were unpinned before being put back. Technically this existed for a long time but commit 57fcd55 ("drm/ttm: Warn on pinning without holding a reference") introduced a WARN_ON which was filling up the kernel logs rather quickly. Quite frankly internal usage of vmw_buffer_object and in general pinning needs to be refactored in vmwgfx but for now this makes it work. Signed-off-by: Zack Rusin <zackr@vmware.com> Reviewed-by: Martin Krastev <krastevm@vmware.com> Reviewed-by: Roland Scheidegger <sroland@vmware.com> Fixes: 57fcd55 ("drm/ttm: Warn on pinning without holding a reference") Link: https://patchwork.freedesktop.org/patch/414984/?series=86052&rev=1 Cc: Huang Rui <ray.huang@amd.com> Cc: Christian König <christian.koenig@amd.com> Cc: Daniel Vetter <daniel.vetter@intel.com> Cc: Christian Koenig <christian.koenig@amd.com> Cc: dri-devel@lists.freedesktop.org
1 parent d434405 commit ab4d991

2 files changed

Lines changed: 6 additions & 0 deletions

File tree

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1525,6 +1525,8 @@ static inline void vmw_bo_unreference(struct vmw_buffer_object **buf)
15251525

15261526
*buf = NULL;
15271527
if (tmp_buf != NULL) {
1528+
if (tmp_buf->base.pin_count > 0)
1529+
ttm_bo_unpin(&tmp_buf->base);
15281530
ttm_bo_put(&tmp_buf->base);
15291531
}
15301532
}

drivers/gpu/drm/vmwgfx/vmwgfx_mob.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ static int vmw_otable_batch_setup(struct vmw_private *dev_priv,
277277
&batch->otables[i]);
278278
}
279279

280+
ttm_bo_unpin(batch->otable_bo);
280281
ttm_bo_put(batch->otable_bo);
281282
batch->otable_bo = NULL;
282283
return ret;
@@ -342,6 +343,7 @@ static void vmw_otable_batch_takedown(struct vmw_private *dev_priv,
342343
vmw_bo_fence_single(bo, NULL);
343344
ttm_bo_unreserve(bo);
344345

346+
ttm_bo_unpin(batch->otable_bo);
345347
ttm_bo_put(batch->otable_bo);
346348
batch->otable_bo = NULL;
347349
}
@@ -528,6 +530,7 @@ static void vmw_mob_pt_setup(struct vmw_mob *mob,
528530
void vmw_mob_destroy(struct vmw_mob *mob)
529531
{
530532
if (mob->pt_bo) {
533+
ttm_bo_unpin(mob->pt_bo);
531534
ttm_bo_put(mob->pt_bo);
532535
mob->pt_bo = NULL;
533536
}
@@ -643,6 +646,7 @@ int vmw_mob_bind(struct vmw_private *dev_priv,
643646
out_no_cmd_space:
644647
vmw_fifo_resource_dec(dev_priv);
645648
if (pt_set_up) {
649+
ttm_bo_unpin(mob->pt_bo);
646650
ttm_bo_put(mob->pt_bo);
647651
mob->pt_bo = NULL;
648652
}

0 commit comments

Comments
 (0)