fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2026-05-05 01:58:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Apply Eric Anholt's fixes

Browse source
This commit is contained in:
Alan Hourihane 2001-08-28 07:43:48 +00:00
parent 4e3c16d6b3
commit 73adb5e130
7 changed files with 51 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
bsd-core/drm_sysctl.c
View file

@ -136,23 +136,25 @@ static int DRM(_vm_info)DRM_SYSCTL_HANDLER_ARGS
error = SYSCTL_OUT(req, buf, strlen(buf));
if (error) return error;
TAILQ_FOREACH(listentry, dev->maplist, link) {
map = listentry->map;
if (map->type < 0 || map->type > 2) type = "??";
else type = types[map->type];
DRM_SYSCTL_PRINT("%4d 0x%08lx 0x%08lx %4.4s 0x%02x 0x%08lx ",
i,
map->offset,
map->size,
type,
map->flags,
(unsigned long)map->handle);
if (map->mtrr < 0) {
DRM_SYSCTL_PRINT("none\n");
} else {
DRM_SYSCTL_PRINT("%4d\n", map->mtrr);
if (dev->maplist != NULL) {
TAILQ_FOREACH(listentry, dev->maplist, link) {
map = listentry->map;
if (map->type < 0 || map->type > 2) type = "??";
else type = types[map->type];
DRM_SYSCTL_PRINT("%4d 0x%08lx 0x%08lx %4.4s 0x%02x 0x%08lx ",
i,
map->offset,
map->size,
type,
map->flags,
(unsigned long)map->handle);
if (map->mtrr < 0) {
DRM_SYSCTL_PRINT("none\n");
} else {
DRM_SYSCTL_PRINT("%4d\n", map->mtrr);
}
i++;
}
i++;
}
SYSCTL_OUT(req, "", 1);

34
bsd/drm_sysctl.h
View file

@ -136,23 +136,25 @@ static int DRM(_vm_info)DRM_SYSCTL_HANDLER_ARGS
error = SYSCTL_OUT(req, buf, strlen(buf));
if (error) return error;
TAILQ_FOREACH(listentry, dev->maplist, link) {
map = listentry->map;
if (map->type < 0 || map->type > 2) type = "??";
else type = types[map->type];
DRM_SYSCTL_PRINT("%4d 0x%08lx 0x%08lx %4.4s 0x%02x 0x%08lx ",
i,
map->offset,
map->size,
type,
map->flags,
(unsigned long)map->handle);
if (map->mtrr < 0) {
DRM_SYSCTL_PRINT("none\n");
} else {
DRM_SYSCTL_PRINT("%4d\n", map->mtrr);
if (dev->maplist != NULL) {
TAILQ_FOREACH(listentry, dev->maplist, link) {
map = listentry->map;
if (map->type < 0 || map->type > 2) type = "??";
else type = types[map->type];
DRM_SYSCTL_PRINT("%4d 0x%08lx 0x%08lx %4.4s 0x%02x 0x%08lx ",
i,
map->offset,
map->size,
type,
map->flags,
(unsigned long)map->handle);
if (map->mtrr < 0) {
DRM_SYSCTL_PRINT("none\n");
} else {
DRM_SYSCTL_PRINT("%4d\n", map->mtrr);
}
i++;
}
i++;
}
SYSCTL_OUT(req, "", 1);

11
linux-core/drm_drv.c
View file

@ -726,7 +726,7 @@ static int DRM(init)( device_t nbdev )
if (!DRM(device)) {
DRM_OS_RETURN(ENOMEM);
}
DRM(minor) = DRM_OS_MALLOC(*(DRM(minor)) * DRM(numdevs));
DRM(minor) = DRM_OS_MALLOC(sizeof(*(DRM(minor))) * DRM(numdevs));
if (!DRM(minor)) {
DRM_OS_FREE(DRM(device));
DRM_OS_RETURN(ENOMEM);
@ -743,6 +743,7 @@ static int DRM(init)( device_t nbdev )
dev = &(DRM(device)[i]);
#endif /* __linux__ */
#ifdef __FreeBSD__
int unit = device_get_unit(nbdev);
/* FIXME??? - multihead !!! */
dev = device_get_softc(nbdev);
#endif /* __FreeBSD__ */
@ -756,15 +757,15 @@ static int DRM(init)( device_t nbdev )
dev->name = DRIVER_NAME;
#endif /* __linux__ */
#ifdef __FreeBSD__
DRM_OS_SPININIT(&dev->count_lock, "drm device");
DRM_OS_SPININIT(dev->count_lock, "drm device");
lockinit(&dev->dev_lock, PZERO, "drmlk", 0, 0);
dev->device = nbdev;
dev->devnode = make_dev(&DRM( cdevsw),
device_get_unit(nbdev),
dev->devnode = make_dev( &DRM(cdevsw),
unit,
DRM_DEV_UID,
DRM_DEV_GID,
DRM_DEV_MODE,
"dri/card0"); /* card0 - FIXME !!! */
"dri/card%d", unit );
dev->name = DRIVER_NAME;
DRM(mem_init)();
DRM(sysctl_init)(dev);

2
linux-core/drm_fops.c
View file

@ -122,7 +122,7 @@ int DRM(open_helper)(dev_t kdev, int flags, int fmt, struct proc *p,
priv = (drm_file_t *) DRM(alloc)(sizeof(*priv), DRM_MEM_FILES);
bzero(priv, sizeof(*priv));
#if __FreeBSD_version >= 500021
priv->uid               = p->p_ucred->cr_svuid;
priv->uid = p->p_ucred->cr_svuid;
#else
priv->uid = p->p_cred->p_svuid;
#endif

11
linux/drm_drv.h
View file

@ -726,7 +726,7 @@ static int DRM(init)( device_t nbdev )
if (!DRM(device)) {
DRM_OS_RETURN(ENOMEM);
}
DRM(minor) = DRM_OS_MALLOC(*(DRM(minor)) * DRM(numdevs));
DRM(minor) = DRM_OS_MALLOC(sizeof(*(DRM(minor))) * DRM(numdevs));
if (!DRM(minor)) {
DRM_OS_FREE(DRM(device));
DRM_OS_RETURN(ENOMEM);
@ -743,6 +743,7 @@ static int DRM(init)( device_t nbdev )
dev = &(DRM(device)[i]);
#endif /* __linux__ */
#ifdef __FreeBSD__
int unit = device_get_unit(nbdev);
/* FIXME??? - multihead !!! */
dev = device_get_softc(nbdev);
#endif /* __FreeBSD__ */
@ -756,15 +757,15 @@ static int DRM(init)( device_t nbdev )
dev->name = DRIVER_NAME;
#endif /* __linux__ */
#ifdef __FreeBSD__
DRM_OS_SPININIT(&dev->count_lock, "drm device");
DRM_OS_SPININIT(dev->count_lock, "drm device");
lockinit(&dev->dev_lock, PZERO, "drmlk", 0, 0);
dev->device = nbdev;
dev->devnode = make_dev(&DRM( cdevsw),
device_get_unit(nbdev),
dev->devnode = make_dev( &DRM(cdevsw),
unit,
DRM_DEV_UID,
DRM_DEV_GID,
DRM_DEV_MODE,
"dri/card0"); /* card0 - FIXME !!! */
"dri/card%d", unit );
dev->name = DRIVER_NAME;
DRM(mem_init)();
DRM(sysctl_init)(dev);

2
linux/drm_fops.h
View file

@ -122,7 +122,7 @@ int DRM(open_helper)(dev_t kdev, int flags, int fmt, struct proc *p,
priv = (drm_file_t *) DRM(alloc)(sizeof(*priv), DRM_MEM_FILES);
bzero(priv, sizeof(*priv));
#if __FreeBSD_version >= 500021
priv->uid               = p->p_ucred->cr_svuid;
priv->uid = p->p_ucred->cr_svuid;
#else
priv->uid = p->p_cred->p_svuid;
#endif

2
linux/drm_lists.h
View file

@ -213,7 +213,7 @@ int DRM(freelist_put)(drm_device_t *dev, drm_freelist_t *bl, drm_buf_t *buf)
atomic_inc(&bl->count);
if (atomic_read(&bl->count) > dma->buf_count) {
DRM_ERROR("%d of %d buffers free after addition of %d\n",
DRM_ERROR("%ld of %d buffers free after addition of %d\n",
atomic_read(&bl->count), dma->buf_count, buf->idx);
return 1;
}