From 62e0a58ecf03fe85de6e671fe2fc7f613ba39b37 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 1 Feb 2005 10:33:51 +0000 Subject: update i830 similiar to the kernel, add statics --- linux-core/i830_drv.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) (limited to 'linux-core/i830_drv.c') diff --git a/linux-core/i830_drv.c b/linux-core/i830_drv.c index 0b4a24e4..e5e069b8 100644 --- a/linux-core/i830_drv.c +++ b/linux-core/i830_drv.c @@ -76,22 +76,8 @@ static struct pci_device_id pciidlist[] = { i830_PCI_IDS }; -static drm_ioctl_desc_t ioctls[] = { - [DRM_IOCTL_NR(DRM_I830_INIT)] = {i830_dma_init, 1, 1}, - [DRM_IOCTL_NR(DRM_I830_VERTEX)] = {i830_dma_vertex, 1, 0}, - [DRM_IOCTL_NR(DRM_I830_CLEAR)] = {i830_clear_bufs, 1, 0}, - [DRM_IOCTL_NR(DRM_I830_FLUSH)] = {i830_flush_ioctl, 1, 0}, - [DRM_IOCTL_NR(DRM_I830_GETAGE)] = {i830_getage, 1, 0}, - [DRM_IOCTL_NR(DRM_I830_GETBUF)] = {i830_getbuf, 1, 0}, - [DRM_IOCTL_NR(DRM_I830_SWAP)] = {i830_swap_bufs, 1, 0}, - [DRM_IOCTL_NR(DRM_I830_COPY)] = {i830_copybuf, 1, 0}, - [DRM_IOCTL_NR(DRM_I830_DOCOPY)] = {i830_docopy, 1, 0}, - [DRM_IOCTL_NR(DRM_I830_FLIP)] = {i830_flip_bufs, 1, 0}, - [DRM_IOCTL_NR(DRM_I830_IRQ_EMIT)] = {i830_irq_emit, 1, 0}, - [DRM_IOCTL_NR(DRM_I830_IRQ_WAIT)] = {i830_irq_wait, 1, 0}, - [DRM_IOCTL_NR(DRM_I830_GETPARAM)] = {i830_getparam, 1, 0}, - [DRM_IOCTL_NR(DRM_I830_SETPARAM)] = {i830_setparam, 1, 0} -}; +extern drm_ioctl_desc_t i830_ioctls[]; +extern int i830_max_ioctl; static int probe(struct pci_dev *pdev, const struct pci_device_id *ent); static struct drm_driver driver = { @@ -103,6 +89,7 @@ static struct drm_driver driver = { #endif .dev_priv_size = sizeof(drm_i830_buf_priv_t), .pretakedown = i830_driver_pretakedown, + .prerelease = i830_driver_prerelease, .release = i830_driver_release, .dma_quiescent = i830_driver_dma_quiescent, .reclaim_buffers = i830_reclaim_buffers, @@ -116,8 +103,7 @@ static struct drm_driver driver = { #endif .postinit = postinit, .version = version, - .ioctls = ioctls, - .num_ioctls = DRM_ARRAY_SIZE(ioctls), + .ioctls = i830_ioctls, .fops = { .owner = THIS_MODULE, .open = drm_open, @@ -143,6 +129,7 @@ static int probe(struct pci_dev *pdev, const struct pci_device_id *ent) static int __init i830_init(void) { + driver.num_ioctls = i830_max_ioctl; return drm_init(&driver, pciidlist); } -- cgit v1.2.3