vmware/xorg: Create a small driver that sits ontop of st/xorg
This commit is contained in:
Jakob Bornecrantz
parent
bb80a93c9e
commit
64102a5625
|
|
@ -1,10 +1,15 @@
|
|||
TARGET = vmwgfx_drv.so
|
||||
CFILES = $(wildcard ./*.c)
|
||||
OBJECTS = $(patsubst ./%.c,./%.o,$(CFILES))
|
||||
TOP = ../../../../../..
|
||||
|
||||
include $(TOP)/configs/current
|
||||
|
||||
TARGET = vmwgfx_drv.so
|
||||
|
||||
CFILES = \
|
||||
vmw_xorg.c \
|
||||
vmw_screen.c
|
||||
|
||||
OBJECTS = $(patsubst %.c,%.o,$(CFILES))
|
||||
|
||||
INCLUDES = \
|
||||
$(shell pkg-config --cflags-only-I pixman-1 xorg-server libdrm xproto) \
|
||||
-I$(TOP)/src/gallium/include \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,55 @@
|
|||
/**********************************************************
|
||||
* Copyright 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.
|
||||
*
|
||||
**********************************************************/
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains the shared resources for VMware Xorg driver
|
||||
* that sits ontop of the Xorg State Traker.
|
||||
*
|
||||
* It is initialized in vmw_screen.c.
|
||||
*
|
||||
* @author Jakob Bornecrantz <jakob@vmware.com>
|
||||
*/
|
||||
|
||||
#ifndef VMW_DRIVER_H_
|
||||
#define VMW_DRIVER_H_
|
||||
|
||||
#include "state_trackers/xorg/xorg_tracker.h"
|
||||
|
||||
struct vmw_driver
|
||||
{
|
||||
int fd;
|
||||
|
||||
};
|
||||
|
||||
static INLINE struct vmw_driver *
|
||||
vmw_driver(ScrnInfoPtr pScrn)
|
||||
{
|
||||
modesettingPtr ms = modesettingPTR(pScrn);
|
||||
return ms ? (struct vmw_driver *)ms->winsys_priv : NULL;
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
/**********************************************************
|
||||
* Copyright 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.
|
||||
*
|
||||
**********************************************************/
|
||||
|
||||
#ifndef VMW_HOOK_H_
|
||||
#define VMW_HOOK_H_
|
||||
|
||||
#include "state_trackers/xorg/xorg_winsys.h"
|
||||
|
||||
|
||||
/***********************************************************************
|
||||
* vmw_screen.c
|
||||
*/
|
||||
|
||||
void vmw_screen_set_functions(ScrnInfoPtr pScrn);
|
||||
|
||||
|
||||
#endif
|
||||
|
|
@ -0,0 +1,100 @@
|
|||
/**********************************************************
|
||||
* Copyright 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.
|
||||
*
|
||||
**********************************************************/
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains the init code for the VMware Xorg driver.
|
||||
*
|
||||
* @author Jakob Bornecrantz <jakob@vmware.com>
|
||||
*/
|
||||
|
||||
#include "vmw_hook.h"
|
||||
#include "vmw_driver.h"
|
||||
|
||||
static Bool
|
||||
vmw_screen_init(ScrnInfoPtr pScrn)
|
||||
{
|
||||
modesettingPtr ms = modesettingPTR(pScrn);
|
||||
struct vmw_driver *vmw;
|
||||
|
||||
/* if gallium is used then we don't need to do anything. */
|
||||
if (ms->screen)
|
||||
return TRUE;
|
||||
|
||||
vmw = xnfcalloc(sizeof(*vmw), 1);
|
||||
if (!vmw)
|
||||
return FALSE;
|
||||
|
||||
vmw->fd = ms->fd;
|
||||
ms->winsys_priv = vmw;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static Bool
|
||||
vmw_screen_close(ScrnInfoPtr pScrn)
|
||||
{
|
||||
modesettingPtr ms = modesettingPTR(pScrn);
|
||||
struct vmw_driver *vmw = vmw_driver(pScrn);
|
||||
|
||||
if (!vmw)
|
||||
return TRUE;
|
||||
|
||||
ms->winsys_priv = NULL;
|
||||
xfree(vmw);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/*
|
||||
* Functions for setting up hooks into the xorg state tracker
|
||||
*/
|
||||
|
||||
static Bool (*vmw_screen_pre_init_saved)(ScrnInfoPtr pScrn, int flags) = NULL;
|
||||
|
||||
static Bool
|
||||
vmw_screen_pre_init(ScrnInfoPtr pScrn, int flags)
|
||||
{
|
||||
modesettingPtr ms;
|
||||
|
||||
pScrn->PreInit = vmw_screen_pre_init_saved;
|
||||
if (!pScrn->PreInit(pScrn, flags))
|
||||
return FALSE;
|
||||
|
||||
ms = modesettingPTR(pScrn);
|
||||
ms->winsys_screen_init = vmw_screen_init;
|
||||
ms->winsys_screen_close = vmw_screen_close;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void
|
||||
vmw_screen_set_functions(ScrnInfoPtr pScrn)
|
||||
{
|
||||
assert(!vmw_screen_pre_init_saved);
|
||||
|
||||
vmw_screen_pre_init_saved = pScrn->PreInit;
|
||||
pScrn->PreInit = vmw_screen_pre_init;
|
||||
}
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
* @author Jakob Bornecrantz <wallbraker@gmail.com>
|
||||
*/
|
||||
|
||||
#include "state_trackers/xorg/xorg_winsys.h"
|
||||
#include "vmw_hook.h"
|
||||
|
||||
static void vmw_xorg_identify(int flags);
|
||||
static Bool vmw_xorg_pci_probe(DriverPtr driver,
|
||||
|
|
@ -145,6 +145,8 @@ vmw_xorg_pci_probe(DriverPtr driver,
|
|||
|
||||
/* Use all the functions from the xorg tracker */
|
||||
xorg_tracker_set_functions(scrn);
|
||||
|
||||
vmw_screen_set_functions(scrn);
|
||||
}
|
||||
return scrn != NULL;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue