diff options
| author | Dave Airlie <airlied@linux.ie> | 2005-02-01 10:18:27 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-02-01 10:18:27 +0000 |
| commit | 8d4c731aa1e0936d8187ad77b5c779a79e22566d (patch) | |
| tree | 871deca55872aa5f041fcb3ac6a857d045fe0316 /linux-core/i810_drv.c | |
| parent | 4b23b5fc3ebe5660ad8d5eed8057877a9c7592ea (diff) | |
make more functions static in i810 and fix pageflip cleanup
Diffstat (limited to 'linux-core/i810_drv.c')
| -rw-r--r-- | linux-core/i810_drv.c | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/linux-core/i810_drv.c b/linux-core/i810_drv.c index 24a5a50d..3a7ae24a 100644 --- a/linux-core/i810_drv.c +++ b/linux-core/i810_drv.c @@ -74,23 +74,8 @@ static struct pci_device_id pciidlist[] = { i810_PCI_IDS }; -static drm_ioctl_desc_t ioctls[] = { - [DRM_IOCTL_NR(DRM_I810_INIT)] = {i810_dma_init, 1, 1}, - [DRM_IOCTL_NR(DRM_I810_VERTEX)] = {i810_dma_vertex, 1, 0}, - [DRM_IOCTL_NR(DRM_I810_CLEAR)] = {i810_clear_bufs, 1, 0}, - [DRM_IOCTL_NR(DRM_I810_FLUSH)] = {i810_flush_ioctl, 1, 0}, - [DRM_IOCTL_NR(DRM_I810_GETAGE)] = {i810_getage, 1, 0}, - [DRM_IOCTL_NR(DRM_I810_GETBUF)] = {i810_getbuf, 1, 0}, - [DRM_IOCTL_NR(DRM_I810_SWAP)] = {i810_swap_bufs, 1, 0}, - [DRM_IOCTL_NR(DRM_I810_COPY)] = {i810_copybuf, 1, 0}, - [DRM_IOCTL_NR(DRM_I810_DOCOPY)] = {i810_docopy, 1, 0}, - [DRM_IOCTL_NR(DRM_I810_OV0INFO)] = {i810_ov0_info, 1, 0}, - [DRM_IOCTL_NR(DRM_I810_FSTATUS)] = {i810_fstatus, 1, 0}, - [DRM_IOCTL_NR(DRM_I810_OV0FLIP)] = {i810_ov0_flip, 1, 0}, - [DRM_IOCTL_NR(DRM_I810_MC)] = {i810_dma_mc, 1, 1}, - [DRM_IOCTL_NR(DRM_I810_RSTATUS)] = {i810_rstatus, 1, 0}, - [DRM_IOCTL_NR(DRM_I810_FLIP)] = {i810_flip_bufs, 1, 0} -}; +extern drm_ioctl_desc_t i810_ioctls[]; +extern int i810_max_ioctl; static int probe(struct pci_dev *pdev, const struct pci_device_id *ent); static struct drm_driver driver = { @@ -99,6 +84,7 @@ static struct drm_driver driver = { DRIVER_HAVE_DMA | DRIVER_DMA_QUEUE, .dev_priv_size = sizeof(drm_i810_buf_priv_t), .pretakedown = i810_driver_pretakedown, + .prerelease = i810_driver_prerelease, .release = i810_driver_release, .dma_quiescent = i810_driver_dma_quiescent, .reclaim_buffers = i810_reclaim_buffers, @@ -106,8 +92,7 @@ static struct drm_driver driver = { .get_reg_ofs = drm_core_get_reg_ofs, .postinit = postinit, .version = version, - .ioctls = ioctls, - .num_ioctls = DRM_ARRAY_SIZE(ioctls), + .ioctls = i810_ioctls, .fops = { .owner = THIS_MODULE, .open = drm_open, @@ -132,6 +117,7 @@ static int probe(struct pci_dev *pdev, const struct pci_device_id *ent) static int __init i810_init(void) { + driver.num_ioctls = i810_max_ioctl; return drm_init(&driver, pciidlist); } |