Skip to content

Commit 34bd46b

Browse files
committed
drm/vmwgfx: Fix a bad merge in otable batch takedown
Change 2ef4fb9 ("drm/vmwgfx: Make sure bo's are unpinned before putting them back") caused a conflict in one of the drm trees and the merge commit 68a32ba ("Merge tag 'drm-next-2021-04-28' of git://anongit.freedesktop.org/drm/drm") accidently re-added code that the original change was removing. Fixed by removing the incorrect buffer unpin - it has already been unpinned two lines above. Fixes: 68a32ba ("Merge tag 'drm-next-2021-04-28' of git://anongit.freedesktop.org/drm/drm") Signed-off-by: Zack Rusin <[email protected]> Reviewed-by: Martin Krastev <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent c26d658 commit 34bd46b

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

drivers/gpu/drm/vmwgfx/vmwgfx_mob.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,6 @@ static void vmw_otable_batch_takedown(struct vmw_private *dev_priv,
354354
ttm_bo_unpin(bo);
355355
ttm_bo_unreserve(bo);
356356

357-
ttm_bo_unpin(batch->otable_bo);
358357
ttm_bo_put(batch->otable_bo);
359358
batch->otable_bo = NULL;
360359
}

0 commit comments

Comments
 (0)