Add support for tracking drawable information to core

Actually make the existing ioctls for adding and removing drawables do
something useful, and add another ioctl for the X server to update drawable
information. The only kind of drawable information tracked so far is cliprects.
(cherry picked from 29598e5253 commit)
main
Michel Dänzer 2006-08-22 16:40:07 +02:00
parent a7b8c8d523
commit 9810ec2737
9 changed files with 314 additions and 109 deletions

View File

@ -1,51 +0,0 @@
/* drm_drawable.h -- IOCTLs for drawables -*- linux-c -*-
* Created: Tue Feb 2 08:37:54 1999 by faith@valinux.com
*/
/*-
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* 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 (including the next
* paragraph) 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
* VA LINUX SYSTEMS AND/OR ITS SUPPLIERS 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.
*
* Authors:
* Rickard E. (Rik) Faith <faith@valinux.com>
* Gareth Hughes <gareth@valinux.com>
*
*/
#include "drmP.h"
int drm_adddraw(DRM_IOCTL_ARGS)
{
drm_draw_t draw;
draw.handle = 0; /* NOOP */
DRM_DEBUG("%d\n", draw.handle);
DRM_COPY_TO_USER_IOCTL( (drm_draw_t *)data, draw, sizeof(draw) );
return 0;
}
int drm_rmdraw(DRM_IOCTL_ARGS)
{
return 0; /* NOOP */
}

1
bsd-core/drm_drawable.c Symbolic link
View File

@ -0,0 +1 @@
../shared-core/drm_drawable.c

View File

@ -1398,6 +1398,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.
*

View File

@ -545,6 +545,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);

View File

@ -75,8 +75,8 @@ DRM_MODULES ?= $(MODULE_LIST)
# These definitions are for handling dependencies in the out of kernel build.
DRMSHARED = drm.h drm_sarea.h
DRMHEADERS = drmP.h drm_compat.h drm_os_linux.h $(DRMSHARED)
DRMSHARED = drm.h drm_sarea.h drm_drawable.c
DRMHEADERS = drmP.h drm_compat.h drm_os_linux.h drm.h drm_sarea.h
COREHEADERS = drm_core.h drm_sman.h drm_hashtab.h
TDFXHEADERS = tdfx_drv.h $(DRMHEADERS)

View File

@ -954,6 +954,14 @@ typedef struct drm_device {
drm_fence_manager_t fm;
drm_buffer_manager_t bm;
/** \name Drawable information */
/*@{ */
spinlock_t drw_lock;
unsigned int drw_bitfield_length;
u32 *drw_bitfield;
unsigned int drw_info_length;
drm_drawable_info_t **drw_info;
/*@} */
} drm_device_t;
#if __OS_HAS_AGP
@ -1161,6 +1169,8 @@ extern int drm_adddraw(struct inode *inode, struct file *filp,
unsigned int cmd, unsigned long arg);
extern int drm_rmdraw(struct inode *inode, struct file *filp,
unsigned int cmd, unsigned long arg);
extern drm_drawable_info_t *drm_get_drawable_info(drm_device_t *dev,
drm_drawable_t id);
/* Authentication IOCTL support (drm_auth.h) */
extern int drm_getmagic(struct inode *inode, struct file *filp,

View File

@ -1,56 +0,0 @@
/**
* \file drm_drawable.c
* IOCTLs for drawables
*
* \author Rickard E. (Rik) Faith <faith@valinux.com>
* \author Gareth Hughes <gareth@valinux.com>
*/
/*
* Created: Tue Feb 2 08:37:54 1999 by faith@valinux.com
*
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* 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 (including the next
* paragraph) 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
* VA LINUX SYSTEMS AND/OR ITS SUPPLIERS 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.
*/
#include "drmP.h"
/** No-op. */
int drm_adddraw(struct inode *inode, struct file *filp,
unsigned int cmd, unsigned long arg)
{
drm_draw_t draw;
draw.handle = 0; /* NOOP */
DRM_DEBUG("%d\n", draw.handle);
if (copy_to_user((drm_draw_t __user *) arg, &draw, sizeof(draw)))
return -EFAULT;
return 0;
}
/** No-op. */
int drm_rmdraw(struct inode *inode, struct file *filp,
unsigned int cmd, unsigned long arg)
{
return 0; /* NOOP */
}

1
linux-core/drm_drawable.c Symbolic link
View File

@ -0,0 +1 @@
../shared-core/drm_drawable.c

View File

@ -67,6 +67,7 @@ static int drm_fill_in_dev(drm_device_t * dev, struct pci_dev *pdev,
int retcode;
spin_lock_init(&dev->count_lock);
spin_lock_init(&dev->drw_lock);
init_timer(&dev->timer);
mutex_init(&dev->struct_mutex);
mutex_init(&dev->ctxlist_mutex);

View File

@ -164,6 +164,14 @@ typedef struct drm_clip_rect {
unsigned short y2;
} drm_clip_rect_t;
/**
* Drawable information.
*/
typedef struct drm_drawable_info {
unsigned int num_rects;
drm_clip_rect_t *rects;
} drm_drawable_info_t;
/**
* Texture region,
*/
@ -514,6 +522,20 @@ typedef struct drm_draw {
drm_drawable_t handle;
} drm_draw_t;
/**
* DRM_IOCTL_UPDATE_DRAW ioctl argument type.
*/
typedef enum {
DRM_DRAWABLE_CLIPRECTS,
} drm_drawable_info_type_t;
typedef struct drm_update_draw {
drm_drawable_t handle;
unsigned int type;
unsigned int num;
unsigned long long data;
} drm_update_draw_t;
/**
* DRM_IOCTL_GET_MAGIC and DRM_IOCTL_AUTH_MAGIC ioctl argument type.
*/
@ -901,6 +923,8 @@ typedef union drm_mm_init_arg{
#define DRM_IOCTL_MM_INIT DRM_IOWR(0x3e, drm_mm_init_arg_t)
#endif
#define DRM_IOCTL_UPDATE_DRAW DRM_IOW(0x3f, drm_update_draw_t)
/*@}*/
/**

256
shared-core/drm_drawable.c Normal file
View File

@ -0,0 +1,256 @@
/**
* \file drm_drawable.c
* IOCTLs for drawables
*
* \author Rickard E. (Rik) Faith <faith@valinux.com>
* \author Gareth Hughes <gareth@valinux.com>
* \author Michel Dänzer <michel@tungstengraphics.com>
*/
/*
* Created: Tue Feb 2 08:37:54 1999 by faith@valinux.com
*
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* 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 (including the next
* paragraph) 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
* VA LINUX SYSTEMS AND/OR ITS SUPPLIERS 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.
*/
#include "drmP.h"
/** No-op. */
int drm_adddraw(DRM_IOCTL_ARGS)
{
DRM_DEVICE;
unsigned int irqflags;
int i, j = 0;
drm_draw_t draw;
spin_lock_irqsave(&dev->drw_lock, irqflags);
for (i = 0; i < dev->drw_bitfield_length; i++) {
u32 bitfield = dev->drw_bitfield[i];
if (bitfield == ~0)
continue;
for (; j < sizeof(bitfield); j++)
if (!(bitfield & (1 << j)))
goto done;
}
done:
if (i == dev->drw_bitfield_length) {
u32 *new_bitfield = drm_realloc(dev->drw_bitfield, i * 4,
(i + 1) * 4, DRM_MEM_BUFS);
if (!new_bitfield) {
DRM_ERROR("Failed to allocate new drawable bitfield\n");
spin_unlock_irqrestore(&dev->drw_lock, irqflags);
return DRM_ERR(ENOMEM);
}
if (32 * (i + 1) > dev->drw_info_length) {
void *new_info = drm_realloc(dev->drw_info,
dev->drw_info_length *
sizeof(drm_drawable_info_t*),
32 * (i + 1) *
sizeof(drm_drawable_info_t*),
DRM_MEM_BUFS);
if (!new_info) {
DRM_ERROR("Failed to allocate new drawable info"
" array\n");
drm_free(new_bitfield, (i + 1) * 4, DRM_MEM_BUFS);
spin_unlock_irqrestore(&dev->drw_lock, irqflags);
return DRM_ERR(ENOMEM);
}
dev->drw_info = (drm_drawable_info_t**)new_info;
}
new_bitfield[i] = 0;
dev->drw_bitfield = new_bitfield;
dev->drw_bitfield_length++;
}
dev->drw_bitfield[i] |= 1 << j;
draw.handle = i * sizeof(u32) + j;
DRM_DEBUG("%d\n", draw.handle);
dev->drw_info[draw.handle] = NULL;
spin_unlock_irqrestore(&dev->drw_lock, irqflags);
DRM_COPY_TO_USER_IOCTL((drm_draw_t __user *)data, draw, sizeof(draw));
return 0;
}
/** No-op. */
int drm_rmdraw(DRM_IOCTL_ARGS)
{
DRM_DEVICE;
drm_draw_t draw;
unsigned int idx, mod;
unsigned int irqflags;
DRM_COPY_FROM_USER_IOCTL(draw, (drm_draw_t __user *) data,
sizeof(draw));
idx = draw.handle / 32;
mod = draw.handle % 32;
spin_lock_irqsave(&dev->drw_lock, irqflags);
if (idx >= dev->drw_bitfield_length ||
!(dev->drw_bitfield[idx] & (1 << mod))) {
DRM_DEBUG("No such drawable %d\n", draw.handle);
spin_unlock_irqrestore(&dev->drw_lock, irqflags);
return 0;
}
dev->drw_bitfield[idx] &= ~(1 << mod);
if (idx == (dev->drw_bitfield_length - 1)) {
while (idx >= 0 && !dev->drw_bitfield[idx])
--idx;
if (idx != draw.handle / 32) {
u32 *new_bitfield = drm_realloc(dev->drw_bitfield,
dev->drw_bitfield_length * 4,
(idx + 1) * 4,
DRM_MEM_BUFS);
if (new_bitfield || idx == -1) {
dev->drw_bitfield = new_bitfield;
dev->drw_bitfield_length = idx + 1;
}
}
}
if (32 * dev->drw_bitfield_length < dev->drw_info_length) {
void *new_info = drm_realloc(dev->drw_info,
dev->drw_info_length *
sizeof(drm_drawable_info_t*),
32 * dev->drw_bitfield_length *
sizeof(drm_drawable_info_t*),
DRM_MEM_BUFS);
if (new_info || !dev->drw_bitfield_length) {
dev->drw_info = (drm_drawable_info_t**)new_info;
dev->drw_info_length = 32 * dev->drw_bitfield_length;
}
}
spin_unlock_irqrestore(&dev->drw_lock, irqflags);
return 0;
}
int drm_update_drawable_info(DRM_IOCTL_ARGS) {
DRM_DEVICE;
drm_update_draw_t update;
unsigned int id, idx, mod;
unsigned int irqflags;
drm_drawable_info_t *info;
void *new_data;
DRM_COPY_FROM_USER_IOCTL(update, (drm_update_draw_t __user *) data,
sizeof(update));
id = update.handle;
idx = id / 32;
mod = id % 32;
spin_lock_irqsave(&dev->drw_lock, irqflags);
if (idx >= dev->drw_bitfield_length ||
!(dev->drw_bitfield[idx] & (1 << mod))) {
DRM_ERROR("No such drawable %d\n", update.handle);
spin_unlock_irqrestore(&dev->drw_lock, irqflags);
return DRM_ERR(EINVAL);
}
info = dev->drw_info[id];
if (!info) {
info = drm_calloc(1, sizeof(drm_drawable_info_t), DRM_MEM_BUFS);
if (!info) {
DRM_ERROR("Failed to allocate drawable info memory\n");
spin_unlock_irqrestore(&dev->drw_lock, irqflags);
return DRM_ERR(ENOMEM);
}
dev->drw_info[id] = info;
}
switch (update.type) {
case DRM_DRAWABLE_CLIPRECTS:
new_data = drm_alloc(update.num * sizeof(drm_clip_rect_t),
DRM_MEM_BUFS);
if (!new_data) {
DRM_ERROR("Failed to allocate cliprect memory\n");
spin_unlock_irqrestore(&dev->drw_lock, irqflags);
return DRM_ERR(ENOMEM);
}
if (DRM_COPY_FROM_USER(new_data,
(drm_clip_rect_t __user *)
(unsigned long)update.data,
update.num * sizeof(drm_clip_rect_t))) {
DRM_ERROR("Failed to copy cliprects from userspace\n");
spin_unlock_irqrestore(&dev->drw_lock, irqflags);
return DRM_ERR(EFAULT);
}
drm_free(info->rects, info->num_rects * sizeof(drm_clip_rect_t),
DRM_MEM_BUFS);
info->rects = new_data;
info->num_rects = update.num;
break;
}
spin_unlock_irqrestore(&dev->drw_lock, irqflags);
return 0;
}
/**
* Caller must hold the drawable spinlock!
*/
drm_drawable_info_t *drm_get_drawable_info(drm_device_t *dev, drm_drawable_t id) {
unsigned int idx = id / 32, mod = id % 32;
if (idx >= dev->drw_bitfield_length ||
!(dev->drw_bitfield[idx] & (1 << mod))) {
DRM_DEBUG("No such drawable %d\n", id);
return NULL;
}
return dev->drw_info[id];
}