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

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/

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

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

/**********************************************************

 * Copyright 2007-2009 VMware, Inc.  All rights reserved.

 *

 * Permission is hereby granted, free of charge, to any person

 * obtaining a copy of this software and associated documentation

 * files (the "Software"), to deal in the Software without

 * restriction, including without limitation the rights to use, copy,

 * modify, merge, publish, distribute, sublicense, and/or sell copies

 * of the Software, and to permit persons to whom the Software is

 * furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be

 * included in all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 *

 **********************************************************/

/*

 * svga_escape.h --

 *

 *    Definitions for our own (vendor-specific) SVGA Escape commands.

 */

#ifndef _SVGA_ESCAPE_H_

#define _SVGA_ESCAPE_H_

/*

 * Namespace IDs for the escape command

 */

#define SVGA_ESCAPE_NSID_VMWARE 0x00000000

#define SVGA_ESCAPE_NSID_DEVEL  0xFFFFFFFF

/*

 * Within SVGA_ESCAPE_NSID_VMWARE, we multiplex commands according to

 * the first DWORD of escape data (after the nsID and size). As a

 * guideline we're using the high word and low word as a major and

 * minor command number, respectively.

 *

 * Major command number allocation:

 *

 *   0000: Reserved

 *   0001: SVGA_ESCAPE_VMWARE_LOG (svga_binary_logger.h)

 *   0002: SVGA_ESCAPE_VMWARE_VIDEO (svga_overlay.h)

 *   0003: SVGA_ESCAPE_VMWARE_HINT (svga_escape.h)

 */

#define SVGA_ESCAPE_VMWARE_MAJOR_MASK  0xFFFF0000

/*

 * SVGA Hint commands.

 *

 * These escapes let the SVGA driver provide optional information to

 * he host about the state of the guest or guest applications. The

 * host can use these hints to make user interface or performance

 * decisions.

 *

 * Notes:

 *

 *   - SVGA_ESCAPE_VMWARE_HINT_FULLSCREEN is deprecated for guests

 *     that use the SVGA Screen Object extension. Instead of sending

 *     this escape, use the SVGA_SCREEN_FULLSCREEN_HINT flag on your

 *     Screen Object.

 */

#define SVGA_ESCAPE_VMWARE_HINT               0x00030000

#define SVGA_ESCAPE_VMWARE_HINT_FULLSCREEN    0x00030001  // Deprecated

typedef

struct {

   uint32 command;

   uint32 fullscreen;

   struct {

      int32 x, y;

   } monitorPosition;

} SVGAEscapeHintFullscreen;

#endif /* _SVGA_ESCAPE_H_ */