OSDN Git Service

Revert "Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux...
authorDave Airlie <airlied@redhat.com>
Mon, 15 Jul 2019 18:07:13 +0000 (04:07 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 15 Jul 2019 18:07:13 +0000 (04:07 +1000)
commit3729fe2bc2a01f4cc1aa88be8f64af06084c87d6
tree462102b65a8cec402bc4726eef6946bdd9113111
parent7e4b4dfc98d54bc79f7ca29c8bc6307ed2948014
Revert "Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm-next"

This reverts commit 031e610a6a21448a63dff7a0416e5e206724caac, reversing
changes made to 52d2d44eee8091e740d0d275df1311fb8373c9a9.

The mm changes in there we premature and not fully ack or reviewed by core mm folks,
I dropped the ball by merging them via this tree, so lets take em all back out.

Signed-off-by: Dave Airlie <airlied@redhat.com>
30 files changed:
MAINTAINERS
drivers/gpu/drm/ttm/ttm_bo.c
drivers/gpu/drm/ttm/ttm_bo_vm.c
drivers/gpu/drm/vmwgfx/Kconfig
drivers/gpu/drm/vmwgfx/Makefile
drivers/gpu/drm/vmwgfx/device_include/svga3d_surfacedefs.h
drivers/gpu/drm/vmwgfx/ttm_lock.c
drivers/gpu/drm/vmwgfx/ttm_lock.h
drivers/gpu/drm/vmwgfx/vmwgfx_bo.c
drivers/gpu/drm/vmwgfx/vmwgfx_context.c
drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c [deleted file]
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
drivers/gpu/drm/vmwgfx/vmwgfx_resource_priv.h
drivers/gpu/drm/vmwgfx/vmwgfx_shader.c
drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
drivers/gpu/drm/vmwgfx/vmwgfx_validation.c
drivers/gpu/drm/vmwgfx/vmwgfx_validation.h
include/drm/ttm/ttm_bo_api.h
include/drm/ttm/ttm_bo_driver.h
include/linux/mm.h
include/uapi/drm/vmwgfx_drm.h
mm/Kconfig
mm/Makefile
mm/as_dirty_helpers.c [deleted file]
mm/memory.c