leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46e4e5ffbc
linux/drivers/gpu/drm/vmwgfx
History
Zack Rusin 46e4e5ffbc drm/vmwgfx: Fix a bad merge in otable batch takedown 
Change
2ef4fb9236 ("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
68a32ba141 ("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: 68a32ba141 ("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
2021-06-16 14:27:17 -04:00
..
device_include drm/vmwgfx: Update device headers 2021-06-16 14:27:00 -04:00
Kconfig drm/vmwgfx: Introduce VMware mks-guest-stats 2021-06-12 00:00:53 -04:00
Makefile drm/vmwgfx: Simplify devcaps code 2021-06-12 00:00:48 -04:00
ttm_memory.c drm/vmwgfx: Fix some static checker warnings 2021-06-12 00:00:59 -04:00
ttm_memory.h drm/ttm: move memory accounting into vmwgfx v4 2021-02-09 17:27:33 +01:00
ttm_object.c drm/vmwgfx: replace idr_init() by idr_init_base() 2021-04-29 14:54:54 -04:00
ttm_object.h drm/ttm: move memory accounting into vmwgfx v4 2021-02-09 17:27:33 +01:00
vmw_surface_cache.h drm/vmwgfx: Update device headers 2021-06-16 14:27:00 -04:00
vmwgfx_binding.c drm/vmwgfx: Update device headers 2021-06-16 14:27:00 -04:00
vmwgfx_binding.h
vmwgfx_blit.c drm/ttm: rename bo->mem and make it a pointer 2021-06-02 11:07:25 +02:00
vmwgfx_bo.c dma-buf: drop the _rcu postfix on function names v3 2021-06-06 11:19:51 +02:00
vmwgfx_cmd.c drm/vmwgfx: Simplify devcaps code 2021-06-12 00:00:48 -04:00
vmwgfx_cmdbuf_res.c drm/vmwgfx: Fix some static checker warnings 2021-06-12 00:00:59 -04:00
vmwgfx_cmdbuf.c drm/vmwgfx: Fix some static checker warnings 2021-06-12 00:00:59 -04:00
vmwgfx_context.c drm/vmwgfx: Update device headers 2021-06-16 14:27:00 -04:00
vmwgfx_cotable.c drm/ttm: rename bo->mem and make it a pointer 2021-06-02 11:07:25 +02:00
vmwgfx_devcaps.c drm/vmwgfx: Update device headers 2021-06-16 14:27:00 -04:00
vmwgfx_devcaps.h drm/vmwgfx: Update device headers 2021-06-16 14:27:00 -04:00
vmwgfx_drv.c drm/vmwgfx: Update device headers 2021-06-16 14:27:00 -04:00
vmwgfx_drv.h drm/vmwgfx: Fix a 64bit regression on svga3 2021-06-16 14:27:17 -04:00
vmwgfx_execbuf.c drm/vmwgfx: Update device headers 2021-06-16 14:27:00 -04:00
vmwgfx_fb.c drm/vmwgfx: Remove the reservation semaphore 2021-05-11 13:37:15 -04:00
vmwgfx_fence.c drm/vmwgfx: Add basic support for SVGA3 2021-05-11 13:37:15 -04:00
vmwgfx_fence.h drm/vmwgfx: Add basic support for SVGA3 2021-05-11 13:37:15 -04:00
vmwgfx_gmr.c drm/vmwgfx: use min_t to replace min 2021-04-29 14:54:54 -04:00
vmwgfx_gmrid_manager.c drm/ttm: flip the switch for driver allocated resources v2 2021-06-04 15:16:46 +02:00
vmwgfx_ioctl.c drm/vmwgfx: Update device headers 2021-06-16 14:27:00 -04:00
vmwgfx_irq.c drm/vmwgfx: Add basic support for SVGA3 2021-05-11 13:37:15 -04:00
vmwgfx_kms.c drm/vmwgfx: Update device headers 2021-06-16 14:27:00 -04:00
vmwgfx_kms.h drm/atomic: Pass the full state to planes atomic disable and update 2021-02-25 08:05:28 +01:00
vmwgfx_ldu.c drm/vmwgfx: Add basic support for SVGA3 2021-05-11 13:37:15 -04:00
vmwgfx_mksstat.h drm/vmwgfx: Introduce VMware mks-guest-stats 2021-06-12 00:00:53 -04:00
vmwgfx_mob.c drm/vmwgfx: Fix a bad merge in otable batch takedown 2021-06-16 14:27:17 -04:00
vmwgfx_msg_arm64.h drm/vmwgfx: Port vmwgfx to arm64 2021-05-11 13:37:16 -04:00
vmwgfx_msg_x86.h drm/vmwgfx: Port vmwgfx to arm64 2021-05-11 13:37:16 -04:00
vmwgfx_msg.c drm/vmwgfx: Refactor vmw_mksstat_remove_ioctl to expect pgid match with vmw_mksstat_add_ioctl to authorise removal. 2021-06-12 00:01:03 -04:00
vmwgfx_overlay.c drm/vmwgfx: Add basic support for SVGA3 2021-05-11 13:37:15 -04:00
vmwgfx_page_dirty.c drm/ttm: rename bo->mem and make it a pointer 2021-06-02 11:07:25 +02:00
vmwgfx_prime.c
vmwgfx_reg.h drm/vmwgfx: Add basic support for SVGA3 2021-05-11 13:37:15 -04:00
vmwgfx_resource_priv.h
vmwgfx_resource.c drm/vmwgfx: Fix some static checker warnings 2021-06-12 00:00:59 -04:00
vmwgfx_scrn.c drm/vmwgfx: Add basic support for SVGA3 2021-05-11 13:37:15 -04:00
vmwgfx_shader.c drm/ttm: rename bo->mem and make it a pointer 2021-06-02 11:07:25 +02:00
vmwgfx_simple_resource.c drm/vmwgfx: Remove the reservation semaphore 2021-05-11 13:37:15 -04:00
vmwgfx_so.c drm/vmwgfx: Fix some static checker warnings 2021-06-12 00:00:59 -04:00
vmwgfx_so.h
vmwgfx_stdu.c drm/vmwgfx: Update device headers 2021-06-16 14:27:00 -04:00
vmwgfx_streamoutput.c drm/ttm: rename bo->mem and make it a pointer 2021-06-02 11:07:25 +02:00
vmwgfx_surface.c drm/vmwgfx: Update device headers 2021-06-16 14:27:00 -04:00
vmwgfx_thp.c drm/ttm: flip the switch for driver allocated resources v2 2021-06-04 15:16:46 +02:00
vmwgfx_ttm_buffer.c drm/vmwgfx: inline access to the pages from the piter 2021-06-12 00:01:02 -04:00
vmwgfx_ttm_glue.c drm/vmwgfx: Inline vmw_verify_access() 2021-05-26 20:56:52 +02:00
vmwgfx_va.c
vmwgfx_validation.c drm/vmwgfx: Fix some static checker warnings 2021-06-12 00:00:59 -04:00
vmwgfx_validation.h