diff options
| author | Zack Rusin <zackr@vmware.com> | 2021-06-15 14:23:35 -0400 |
|---|---|---|
| committer | Zack Rusin <zackr@vmware.com> | 2021-07-09 16:18:44 -0400 |
| commit | 34bd46bcf3de72cbffcdc42d3fa67e543d1c869b (patch) | |
| tree | 3cafd0ed8aa49451e548dd7691a0176e4c3c47a3 /drivers/gpu/drm/drm_dp_aux_dev.c | |
| parent | c26d6586e97a69ef9b429cc577ca4c9d2d2ec7cd (diff) | |
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/drm_dp_aux_dev.c')
0 files changed, 0 insertions, 0 deletions