diff options
| author | Zack Rusin <zackr@vmware.com> | 2021-06-15 21:23:35 +0300 |
|---|---|---|
| committer | Zack Rusin <zackr@vmware.com> | 2021-06-16 21:27:17 +0300 |
| commit | 46e4e5ffbc2af8a6f7935648ab286902b406a01d (patch) | |
| tree | 8cd7bc5c55ce6b43e30bf7ee15edb732d6e96c3f /drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | |
| parent | c2aaa37dc18fb7191a0fd829a7a943f61c2821de (diff) | |
| download | linux-46e4e5ffbc2af8a6f7935648ab286902b406a01d.tar.xz | |
drm/vmwgfx: Fix a bad merge in otable batch takedown
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
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_mob.c')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_mob.c b/drivers/gpu/drm/vmwgfx/vmwgfx_mob.c index 895088924ce3..c8e578f63c9c 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; } |