Merge branch 'ttm-transhuge' of git://people.freedesktop.org/~thomash/linux into...

Huge page-table entries for TTM

In order to reduce CPU usage [1] and in theory TLB misses this patchset enables
huge- and giant page-table entries for TTM and TTM-enabled graphics drivers.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Hellstrom (VMware) <thomas_os@shipmail.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200325073102.6129-1-thomas_os@shipmail.org

diff --cc drivers/gpu/drm/vmwgfx/Makefile
index 5c3515e8cce129dbe82f4a40dd25c360270b776f,421dd2a497a547206856cce1575c40ae088ea730..31f85f09f1fcaa7105b755e7a03d4b40c2ef8b32
--- 1/drivers/gpu/drm/vmwgfx/Makefile
--- 2/drivers/gpu/drm/vmwgfx/Makefile
+++ b/drivers/gpu/drm/vmwgfx/Makefile
@@@ -8,7 -8,8 +8,8 @@@ vmwgfx-y := vmwgfx_execbuf.o vmwgfx_gmr
            vmwgfx_cmdbuf_res.o vmwgfx_cmdbuf.o vmwgfx_stdu.o \
            vmwgfx_cotable.o vmwgfx_so.o vmwgfx_binding.o vmwgfx_msg.o \
            vmwgfx_simple_resource.o vmwgfx_va.o vmwgfx_blit.o \
 -          vmwgfx_validation.o vmwgfx_page_dirty.o \
 +          vmwgfx_validation.o vmwgfx_page_dirty.o vmwgfx_streamoutput.o \
            ttm_object.o ttm_lock.o
  
+ vmwgfx-$(CONFIG_TRANSPARENT_HUGEPAGE) += vmwgfx_thp.o
  obj-$(CONFIG_DRM_VMWGFX) := vmwgfx.o

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
Simple merge

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
Simple merge

diff --cc include/linux/fs.h
Simple merge