Merge tag 'vmwgfx-next-4.19-3' of git://people.freedesktop.org/~thomash/linux into...
authorDave Airlie <airlied@redhat.com>
Tue, 10 Jul 2018 01:13:36 +0000 (11:13 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 10 Jul 2018 01:13:39 +0000 (11:13 +1000)
commitb861686b18538eaaf3530255eb37b4133146fbe2
tree7c584e6ddcd387165ac38c1a4a99a5780c451884
parent8038d2a9e6cde825be46359ad98a084da92294fe
parent9b07b287aa3ef49695bfad59c1870cd942f579a8
Merge tag 'vmwgfx-next-4.19-3' of git://people.freedesktop.org/~thomash/linux into drm-next

This introduces a header update and support for multisample surfaces.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/d020efb8-776d-5e8f-9d9f-122591e074d6@vmware.com
15 files changed:
drivers/gpu/drm/vmwgfx/device_include/svga3d_cmd.h
drivers/gpu/drm/vmwgfx/device_include/svga3d_devcaps.h
drivers/gpu/drm/vmwgfx/device_include/svga3d_dx.h
drivers/gpu/drm/vmwgfx/device_include/svga3d_limits.h
drivers/gpu/drm/vmwgfx/device_include/svga3d_surfacedefs.h
drivers/gpu/drm/vmwgfx/device_include/svga3d_types.h
drivers/gpu/drm/vmwgfx/device_include/svga_reg.h
drivers/gpu/drm/vmwgfx/device_include/svga_types.h
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_ioctl.c
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
drivers/gpu/drm/vmwgfx/vmwgfx_surface.c