]> git.baikalelectronics.ru Git - kernel.git/commit
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>
Wed, 16 Jun 2021 18:27:17 +0000 (14:27 -0400)
commitd6ee211a4af8b1251d42f939f1ba4b0e9956e9b1
tree8cd7bc5c55ce6b43e30bf7ee15edb732d6e96c3f
parentf871294328376eb45d42c4986cf8e966a961acfa
drm/vmwgfx: Fix a bad merge in otable batch takedown

Change
44e5b9c6840d ("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
0077831f6f7c ("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: 0077831f6f7c ("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