From: Thomas Hellstrom (VMware) thomas@shipmail.org

Dave, Daniel

A couple of independent patches extracted from the 5.3 pull request, fixed for merge conflicts.

And the drmP.h removal from Sam.

/Thomas

The following changes since commit e7f7287bf5f746d29f3607178851246a005dd398:

Merge tag 'drm-next-5.4-2019-08-09' of git://people.freedesktop.org/~agd5f/linux into drm-next (2019-08-12 14:20:21 +1000)

are available in the Git repository at:

git://people.freedesktop.org/~thomash/linux/ vmwgfx-next

for you to fetch changes up to a4513daaab5c5c1e6bc7c1fda932a88c62ebda43:

drm/vmwgfx: Assign eviction priorities to resources (2019-08-14 09:18:41 +0200)

---------------------------------------------------------------- Deepak Rawat (2): drm/vmwgfx: Add debug message for layout change ioctl drm/vmwgfx: Use VMW_DEBUG_KMS for vmwgfx mode-setting user errors

Sam Ravnborg (2): drm/vmwgfx: drop use of drmP.h in header files drm/vmwgfx: drop reminaing users of drmP.h

Thomas Hellstrom (2): drm/vmwgfx: Kill unneeded legacy security features drm/vmwgfx: Assign eviction priorities to resources

drivers/gpu/drm/vmwgfx/ttm_lock.c | 100 -------------- drivers/gpu/drm/vmwgfx/ttm_lock.h | 32 +---- drivers/gpu/drm/vmwgfx/ttm_object.h | 7 +- drivers/gpu/drm/vmwgfx/vmwgfx_binding.h | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 3 + drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 4 + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 13 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 179 ++------------------------ drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 126 ++++++++++++++---- drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 8 +- drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_fence.h | 5 +- drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 33 +++-- drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 2 + drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 11 +- drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 60 ++++++--- drivers/gpu/drm/vmwgfx/vmwgfx_resource_priv.h | 2 + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 8 +- drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 9 +- drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 10 +- drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | 1 - drivers/gpu/drm/vmwgfx/vmwgfx_validation.h | 3 +- 30 files changed, 264 insertions(+), 394 deletions(-)