diff options
| author | Zack Rusin <[email protected]> | 2021-06-15 18:23:35 +0000 |
|---|---|---|
| committer | Zack Rusin <[email protected]> | 2021-07-09 20:18:44 +0000 |
| commit | 34bd46bcf3de72cbffcdc42d3fa67e543d1c869b (patch) | |
| tree | 3cafd0ed8aa49451e548dd7691a0176e4c3c47a3 /drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | |
| parent | drm/vmwgfx: Fix implicit declaration error (diff) | |
| download | kernel-34bd46bcf3de72cbffcdc42d3fa67e543d1c869b.tar.gz kernel-34bd46bcf3de72cbffcdc42d3fa67e543d1c869b.zip | |
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 <[email protected]>
Reviewed-by: Martin Krastev <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c')
0 files changed, 0 insertions, 0 deletions