XLibre/xf86-video-vmware
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-vmware.git synced 2026-03-24 01:24:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

DRI XFree86-4_3_99_12-merge import

Browse Source
This commit is contained in:
Eric Anholt
2004-06-16 09:22:38 +00:00
parent 2e4ba05c72
commit a3bdeecbb9
16 changed files with 52 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@@ -539,4 +539,4 @@ the first bits of the next scanline should use them.
The bitmap data as a whole must be 4 byte aligned.
$XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/README,v 1.2 2001/04/05 21:09:37 dawes Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/README,v 1.5 2002/10/16 22:12:53 alanh Exp $

7
man/vmware.man
View File

@@ -1,3 +1,4 @@
.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vmware.man,v 1.2 2001/04/06 17:44:58 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH VMWARE __drivermansuffix__ __vendorversion__
@@ -13,9 +14,9 @@ vmware \- VMware SVGA video driver
.fi
.SH DESCRIPTION
.B vmware
is an __xservername__ driver for VMware virtual video cards.
is an XFree86 driver for VMware virtual video cards.
.SH CONFIGURATION DETAILS
Please refer to __xconfigfile__(__filemansuffix__) for general configuration
Please refer to XF86Config(__filemansuffix__) for general configuration
details. This section only covers configuration details specific to this
driver.
.PP
@@ -31,6 +32,6 @@ Enable or disable the HW cursor. Default: off.
.BI "Option \*qNoAccel\*q \*q" boolean \*q
Disable or enable acceleration. Default: acceleration is enabled.
.SH "SEE ALSO"
__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
.SH AUTHORS
Copyright (c) 1999-2001 VMware, Inc.

2
src/bits2pixels.c
View File

@@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/bits2pixels.c,v 1.1 2001/04/05 19:29:43 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/bits2pixels.c,v 1.2 2002/12/11 17:07:58 dawes Exp $ */
/* **********************************************************
* Copyright (C) 1999-2001 VMware, Inc.
* All Rights Reserved

2
src/bits2pixels.h
View File

@@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/bits2pixels.h,v 1.1 2001/04/05 19:29:44 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/bits2pixels.h,v 1.2 2002/12/11 17:07:58 dawes Exp $ */
/* **********************************************************
* Copyright (C) 1999-2001 VMware, Inc.
* All Rights Reserved

2
src/guest_os.h
View File

@@ -1,4 +1,4 @@
/* $XFree86$ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/guest_os.h,v 1.1 2001/04/05 19:29:44 dawes Exp $ */
/* *********************************************************
* Copyright (C) 1999-2001 VMware, Inc.
* All Rights Reserved

2
src/includeCheck.h
View File

@@ -1,3 +1,3 @@
/* This space intentionally left blank. */
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/includeCheck.h,v 1.2 2001/04/06 17:44:58 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/includeCheck.h,v 1.3 2002/10/16 22:12:53 alanh Exp $ */

2
src/offscreen_manager.c
View File

@@ -2,7 +2,7 @@
* Copyright (C) 1998-2002 VMware, Inc.
* All Rights Reserved
* **********************************************************/
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/offscreen_manager.c,v 1.1 2002/12/10 04:17:19 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/offscreen_manager.c,v 1.2 2002/12/11 17:07:58 dawes Exp $ */
#include "vmware.h"

2
src/offscreen_manager.h
View File

@@ -2,7 +2,7 @@
* Copyright (C) 1998-2002 VMware, Inc.
* All Rights Reserved
* **********************************************************/
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/offscreen_manager.h,v 1.1 2002/12/10 04:17:19 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/offscreen_manager.h,v 1.2 2002/12/11 17:07:58 dawes Exp $ */
#ifndef OFFSCREEN_MANAGER_H
#define OFFSCREEN_MANAGER_H

2
src/svga_limits.h
View File

@@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/svga_limits.h,v 1.1 2001/04/05 19:29:44 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/svga_limits.h,v 1.2 2002/10/16 22:12:53 alanh Exp $ */
/* **********************************************************
* Copyright (C) 1998-2001 VMware, Inc.
* All Rights Reserved

2
src/svga_reg.h
View File

@@ -9,7 +9,7 @@
*
* SVGA hardware definitions
*/
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/svga_reg.h,v 1.7 2002/12/10 04:17:19 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/svga_reg.h,v 1.8 2003/02/04 01:39:53 dawes Exp $ */
#ifndef _SVGA_REG_H_
#define _SVGA_REG_H_

2
src/vm_basic_types.h
View File

@@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vm_basic_types.h,v 1.4 2001/04/25 16:44:58 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vm_basic_types.h,v 1.5 2002/01/07 20:38:29 dawes Exp $ */
/* **********************************************************
* Copyright (C) 1998-2001 VMware, Inc.
* All Rights Reserved

2
src/vm_device_version.h
View File

@@ -1,4 +1,4 @@
/* $XFree86$ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vm_device_version.h,v 1.1 2001/04/05 19:29:44 dawes Exp $ */
/* **********************************************************
* Copyright (C) 1998-2001 VMware, Inc.
* All Rights Reserved

18
src/vmware.c
View File

@@ -6,7 +6,7 @@
char rcsId_vmware[] =
"Id: vmware.c,v 1.11 2001/02/23 02:10:39 yoel Exp $";
#endif
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vmware.c,v 1.18 2003/09/24 02:43:31 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vmware.c,v 1.17 2003/02/18 19:10:36 alanh Exp $ */
/*
* TODO: support the vmware linux kernel fb driver (Option "UseFBDev").
@@ -130,7 +130,7 @@ static XF86ModuleVersionInfo vmwareVersRec = {
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
XORG_VERSION_CURRENT,
XF86_VERSION_CURRENT,
VMWARE_MAJOR_VERSION, VMWARE_MINOR_VERSION, VMWARE_PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
@@ -432,7 +432,7 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags)
pVMWARE->PciInfo->ioBase[0] + SVGA_VALUE_PORT;
}
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
"VMware SVGA regs at (0x%04lx, 0x%04lx)\n",
"VMware SVGA regs at (0x%04x, 0x%04x)\n",
pVMWARE->indexReg, pVMWARE->valueReg);
id = VMXGetVMwareSvgaId(pVMWARE);
@@ -494,7 +494,7 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags)
xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED, 2, "bpp: %d\n", pVMWARE->bitsPerPixel);
xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED, 2, "vram: %d\n", pVMWARE->videoRam);
xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED, 2, "pbase: 0x%08lx\n", pVMWARE->memPhysBase);
xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED, 2, "pbase: %p\n", pVMWARE->memPhysBase);
xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED, 2, "mwidt: %d\n", pVMWARE->maxWidth);
xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED, 2, "mheig: %d\n", pVMWARE->maxHeight);
@@ -578,11 +578,11 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags)
xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED,
2, "bpp: %d\n", pVMWARE->bitsPerPixel);
xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED,
2, "w.red: %d\n", (int)pVMWARE->weight.red);
2, "w.red: %d\n", pVMWARE->weight.red);
xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED,
2, "w.grn: %d\n", (int)pVMWARE->weight.green);
2, "w.grn: %d\n", pVMWARE->weight.green);
xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED,
2, "w.blu: %d\n", (int)pVMWARE->weight.blue);
2, "w.blu: %d\n", pVMWARE->weight.blue);
xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED,
2, "vis: %d\n", pVMWARE->defaultVisual);
@@ -646,7 +646,7 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags)
pScrn->chipset = (char*)xf86TokenToString(VMWAREChipsets, pVMWARE->PciInfo->chipType);
if (!pScrn->chipset) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "ChipID 0x%04x is not recognised\n", pVMWARE->PciInfo->chipType);
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "ChipID 0x%04 is not recognised\n", pVMWARE->PciInfo->chipType);
return FALSE;
}
@@ -1303,7 +1303,7 @@ VMWAREFreeScreen(int scrnIndex, int flags)
VMWAREFreeRec(xf86Screens[scrnIndex]);
}
static ModeStatus
static Bool
VMWAREValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
{
return MODE_OK;

26
src/vmware.h
View File

@@ -180,61 +180,87 @@ extern const char *vmwareXaaSymbols[];
#define ACCELERATE_OPS
void vmwareWriteReg(
#if NeedFunctionPrototypes
VMWAREPtr pVMWARE, int index, CARD32 value
#endif
);
CARD32 vmwareReadReg(
#if NeedFunctionPrototypes
VMWAREPtr pVMWARE, int index
#endif
);
void vmwareWriteWordToFIFO(
#if NeedFunctionPrototypes
VMWAREPtr pVMWARE, CARD32 value
#endif
);
void vmwareWaitForFB(
#ifdef NeedFunctionPrototypes
VMWAREPtr pVMWARE
#endif
);
void vmwareSendSVGACmdUpdate(
#if NeedFunctionPrototypes
VMWAREPtr pVMWARE, BoxPtr pBB
#endif
);
/* vmwarecurs.c */
Bool vmwareCursorInit(
#if NeedFunctionPrototypes
ScreenPtr pScr
#endif
);
void vmwareCursorModeInit(
#if NeedFunctionPrototypes
ScrnInfoPtr pScrn,
DisplayModePtr mode
#endif
);
void vmwareCursorCloseScreen(
#if NeedFunctionPrototypes
ScreenPtr pScr
#endif
);
void vmwareWriteCursorRegs(
#if NeedFunctionPrototypes
VMWAREPtr pVMWARE,
Bool visible,
Bool force
#endif
);
void vmwareCursorHookWrappers(
#if NeedFunctionPrototypes
ScreenPtr pScreen
#endif
);
/* vmwarexaa.c */
Bool vmwareXAAScreenInit(
#if NeedFunctionPrototypes
ScreenPtr pScreen
#endif
);
Bool vmwareXAAModeInit(
#if NeedFunctionPrototypes
ScrnInfoPtr pScrn, DisplayModePtr mode
#endif
);
void vmwareXAACloseScreen(
#if NeedFunctionPrototypes
ScreenPtr pScreen
#endif
);
#endif

2
src/vmwarecurs.c
View File

@@ -6,7 +6,7 @@
char rcsId_vmwarecurs[] =
"Id: vmwarecurs.c,v 1.5 2001/01/30 23:33:02 bennett Exp $";
#endif
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vmwarecurs.c,v 1.10 2003/02/04 01:39:53 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vmwarecurs.c,v 1.11 2003/02/05 12:47:42 dawes Exp $ */
#include "vmware.h"
#include "bits2pixels.h"

2
src/vmwarexaa.c
View File

@@ -6,7 +6,7 @@
char rcsId_vmwarexaa[] =
"Id: $";
#endif
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vmwarexaa.c,v 1.5 2003/02/04 01:39:53 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vmwarexaa.c,v 1.6 2003/04/13 18:09:27 dawes Exp $ */
#include "vmware.h"