| From 8a5a7788fbe31aa1f76f413029b33c1775b29ea6 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 15 Jun 2021 14:23:35 -0400 |
| Subject: drm/vmwgfx: Fix a bad merge in otable batch takedown |
| |
| From: Zack Rusin <zackr@vmware.com> |
| |
| [ Upstream commit 34bd46bcf3de72cbffcdc42d3fa67e543d1c869b ] |
| |
| Change |
| 2ef4fb92363c ("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 |
| 68a32ba14177 ("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: 68a32ba14177 ("Merge tag 'drm-next-2021-04-28' of git://anongit.freedesktop.org/drm/drm") |
| Signed-off-by: Zack Rusin <zackr@vmware.com> |
| Reviewed-by: Martin Krastev <krastevm@vmware.com> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20210615182336.995192-4-zackr@vmware.com |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 1 - |
| 1 file changed, 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_mob.c b/drivers/gpu/drm/vmwgfx/vmwgfx_mob.c |
| index 5648664f71bc..f2d625415458 100644 |
| --- a/drivers/gpu/drm/vmwgfx/vmwgfx_mob.c |
| +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_mob.c |
| @@ -354,7 +354,6 @@ static void vmw_otable_batch_takedown(struct vmw_private *dev_priv, |
| ttm_bo_unpin(bo); |
| ttm_bo_unreserve(bo); |
| |
| - ttm_bo_unpin(batch->otable_bo); |
| ttm_bo_put(batch->otable_bo); |
| batch->otable_bo = NULL; |
| } |
| -- |
| 2.30.2 |
| |
