OSDN Git Service

drm/vmwgfx: Fix a bad merge in otable batch takedown
authorZack Rusin <zackr@vmware.com>
Tue, 15 Jun 2021 18:23:35 +0000 (14:23 -0400)
committerZack Rusin <zackr@vmware.com>
Fri, 9 Jul 2021 20:18:44 +0000 (16:18 -0400)
commit34bd46bcf3de72cbffcdc42d3fa67e543d1c869b
tree3cafd0ed8aa49451e548dd7691a0176e4c3c47a3
parentc26d6586e97a69ef9b429cc577ca4c9d2d2ec7cd
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
drivers/gpu/drm/vmwgfx/vmwgfx_mob.c