Commit 9354eafd authored Jan 20, 2014 by Dave Airlie

linux into drm-next

Pull request of 2014-01-17

Pull request for 3.14. One not so urgent fix, One huge device update.

The pull request corresponds to the patches sent out on dri-devel, except:
[PATCH 02/33], review tag typo pointed out by Matt Turner.
[PATCH 04/33], dropped. The new surface formats are never used.

The upcoming vmware svga2 hardware version 11 will introduce the concept
of "guest backed objects" or -resources. The device will in principle
get all
of its memory from the guest, which has big advantages from the device
point of view.

This means that vmwgfx contexts, shaders and surfaces need to be backed
by guest memory in the form of buffer objects called MOBs, presumably
short for MemoryOBjects, which are bound to the device in a special way.

This patch series introduces guest backed object support. Some new IOCTLs
are added to allocate these new guest backed object, and to optionally
provide
them with a backing MOB.

There is an update to the gallium driver that comes with this update, and
it will be pushed in the near timeframe presumably to a separate mesa branch
before merged to master.

* tag 'vmwgfx-next-2014-01-17' of git://people.freedesktop.org/~thomash/linux: (33 commits)
drm/vmwgfx: Invalidate surface on non-readback unbind
drm/vmwgfx: Silence the device command verifier
drm/vmwgfx: Implement 64-bit Otable- and MOB binding v2
drm/vmwgfx: Fix surface framebuffer check for guest-backed surfaces
drm/vmwgfx: Update otable definitions
drm/vmwgfx: Use the linux DMA api also for MOBs
drm/vmwgfx: Ditch the vmw_dummy_query_bo_prepare function
drm/vmwgfx: Persistent tracking of context bindings
drm/vmwgfx: Track context bindings and scrub them upon exiting execbuf
drm/vmwgfx: Block the BIND_SHADERCONSTS command
drm/vmwgfx: Add a parameter to get max MOB memory size
drm/vmwgfx: Implement a buffer object synccpu ioctl.
drm/vmwgfx: Make sure that the multisampling is off
drm/vmwgfx: Extend the command verifier to handle guest-backed on / off
drm/vmwgfx: Fix up the vmwgfx_drv.h header for new files
drm/vmwgfx: Enable 3D for new hardware version
drm/vmwgfx: Add new unused (by user-space) commands to the verifier
drm/vmwgfx: Validate guest-backed shader const commands
drm/vmwgfx: Add guest-backed shaders
drm/vmwgfx: Hook up guest-backed surfaces
...

parents 53dac830 1985f999

drivers/gpu/drm/vmwgfx/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,6 +6,6 @@ vmwgfx-y := vmwgfx_execbuf.o vmwgfx_gmr.o vmwgfx_kms.o vmwgfx_drv.o \
		vmwgfx_fifo.o vmwgfx_irq.o vmwgfx_ldu.o vmwgfx_ttm_glue.o \
		vmwgfx_overlay.o vmwgfx_marker.o vmwgfx_gmrid_manager.o \
		vmwgfx_fence.o vmwgfx_dmabuf.o vmwgfx_scrn.o vmwgfx_context.o \
		vmwgfx_surface.o vmwgfx_prime.o
		vmwgfx_surface.o vmwgfx_prime.o vmwgfx_mob.o vmwgfx_shader.o

		obj-$(CONFIG_DRM_VMWGFX) := vmwgfx.o

drivers/gpu/drm/vmwgfx/svga3d_reg.h

+704 −14

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/vmwgfx/svga_reg.h

+8 −2

Original line number	Diff line number	Diff line
		@@ -169,7 +169,10 @@ enum {
		SVGA_REG_TRACES = 45, /* Enable trace-based updates even when FIFO is on */
		SVGA_REG_GMRS_MAX_PAGES = 46, /* Maximum number of 4KB pages for all GMRs */
		SVGA_REG_MEMORY_SIZE = 47, /* Total dedicated device memory excluding FIFO */
		SVGA_REG_TOP = 48, /* Must be 1 more than the last register */
		SVGA_REG_MAX_PRIMARY_BOUNDING_BOX_MEM = 50, /* Max primary memory */
		SVGA_REG_SUGGESTED_GBOBJECT_MEM_SIZE_KB = 51, /* Suggested limit on mob mem */
		SVGA_REG_DEV_CAP = 52, /* Write dev cap index, read value */
		SVGA_REG_TOP = 53, /* Must be 1 more than the last register */

		SVGA_PALETTE_BASE = 1024, /* Base of SVGA color map */
		/* Next 768 (== 2563) registers exist for colormap /
		@@ -431,7 +434,10 @@ struct SVGASignedPoint {
		#define SVGA_CAP_TRACES 0x00200000
		#define SVGA_CAP_GMR2 0x00400000
		#define SVGA_CAP_SCREEN_OBJECT_2 0x00800000

		#define SVGA_CAP_COMMAND_BUFFERS 0x01000000
		#define SVGA_CAP_DEAD1 0x02000000
		#define SVGA_CAP_CMD_BUFFERS_2 0x04000000
		#define SVGA_CAP_GBOBJECTS 0x08000000

		/*
		* FIFO register indices.

drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c

+167 −7

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/vmwgfx/vmwgfx_context.c

+531 −0

File changed.

Preview size limit exceeded, changes collapsed.

Admin message