Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fa3577b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-vmware-staging' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 

* 'drm-vmware-staging' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/vmwgfx: Add DRM driver for VMware Virtual GPU
  drm/vmwgfx: Add svga headers for vmwgfx driver
  drm/ttm: Add more driver type enums
parents d4220f98 fb1d9738

drivers/gpu/drm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ obj-$(CONFIG_DRM_I830) += i830/ 
obj-$(CONFIG_DRM_I915)  += i915/

obj-$(CONFIG_DRM_SIS)   += sis/

obj-$(CONFIG_DRM_SAVAGE)+= savage/

obj-$(CONFIG_DRM_VMWGFX)+= vmwgfx/

obj-$(CONFIG_DRM_VIA)	+=via/

obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/

obj-y			+= i2c/

drivers/gpu/drm/vmwgfx/Kconfig

0 → 100644
+13 −0
Original line number Diff line number Diff line 
config DRM_VMWGFX

	tristate "DRM driver for VMware Virtual GPU"

	depends on DRM && PCI

	select FB_DEFERRED_IO

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT

	select DRM_TTM

	help

	  KMS enabled DRM driver for SVGA2 virtual hardware.



	  If unsure say n. The compiled module will be

	  called vmwgfx.ko

drivers/gpu/drm/vmwgfx/Makefile

0 → 100644
+9 −0
Original line number Diff line number Diff line 


ccflags-y := -Iinclude/drm



vmwgfx-y := vmwgfx_execbuf.o vmwgfx_gmr.o vmwgfx_kms.o vmwgfx_drv.o \

	    vmwgfx_fb.o vmwgfx_ioctl.o vmwgfx_resource.o vmwgfx_buffer.o \

	    vmwgfx_fifo.o vmwgfx_irq.o vmwgfx_ldu.o vmwgfx_ttm_glue.o \

	    vmwgfx_overlay.o



obj-$(CONFIG_DRM_VMWGFX) := vmwgfx.o