hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-11-01 03:03:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into randr-1.2

Browse source
This commit is contained in:
Keith Packard 2006-10-04 14:46:04 -07:00
commit b4659faf9b
54 changed files with 8766 additions and 1558 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/xfree86/os-support/bus/linuxPci.c
View file

@ -85,7 +85,7 @@ static pciBusFuncs_t linuxFuncs0 = {
/* pciAddrHostToBus */ pciAddrNOOP,
/* linuxTransAddrBusToHost is busted on sparc64 but the PCI rework tree
* makes it all moot, so we kludge it for now */
#if defined(__sparc64__)
#if defined(__sparc__)
/* pciAddrBusToHost */ pciAddrNOOP,
#else
/* pciAddrBusToHost */ linuxTransAddrBusToHost,

16
hw/xfree86/os-support/drm/xf86drm.c
View file

@ -1388,6 +1388,22 @@ int drmDestroyDrawable(int fd, drm_drawable_t handle)
return 0;
}
int drmUpdateDrawableInfo(int fd, drm_drawable_t handle,
drm_drawable_info_type_t type, unsigned int num,
void *data)
{
drm_update_draw_t update;
update.handle = handle;
update.type = type;
update.num = num;
update.data = (unsigned long long)(unsigned long)data;
if (ioctl(fd, DRM_IOCTL_UPDATE_DRAW, &update)) return -errno;
return 0;
}
/**
* Acquire the AGP device.
*

3
hw/xfree86/os-support/xf86drm.h
View file

@ -543,6 +543,9 @@ extern int drmSwitchToContext(int fd, drm_context_t context);
extern int drmDestroyContext(int fd, drm_context_t handle);
extern int drmCreateDrawable(int fd, drm_drawable_t * handle);
extern int drmDestroyDrawable(int fd, drm_drawable_t handle);
extern int drmUpdateDrawableInfo(int fd, drm_drawable_t handle,
drm_drawable_info_type_t type,
unsigned int num, void *data);
extern int drmCtlInstHandler(int fd, int irq);
extern int drmCtlUninstHandler(int fd);
extern int drmInstallSIGIOHandler(int fd,