From cb5aaa89871c051098ae8067d0e386840b7bdc59 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Sat, 6 Nov 2004 23:02:07 +0000 Subject: Convert more drivers for bsd-core, moving the ioctl definitions to shared code. Remove the "drv" from sisdrv, as it's unnecessary. Use the drm_pci functions in i915 instead of per-os implementations of the same. Avoid whitespace within fields in drm_pciids.txt (one of the r300 definitions), since it breaks the bsd pciids script. Tested on sis, mga, r128. i915 needs more work. --- linux-core/mach64_drv.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) (limited to 'linux-core/mach64_drv.c') diff --git a/linux-core/mach64_drv.c b/linux-core/mach64_drv.c index 3f736aa3..17ba250c 100644 --- a/linux-core/mach64_drv.c +++ b/linux-core/mach64_drv.c @@ -64,22 +64,8 @@ static struct pci_device_id pciidlist[] = { mach64_PCI_IDS }; -/* Interface history: - * - * 1.0 - Initial mach64 DRM - * - */ -static drm_ioctl_desc_t ioctls[] = { - [DRM_IOCTL_NR(DRM_MACH64_INIT)] = {mach64_dma_init, 1, 1}, - [DRM_IOCTL_NR(DRM_MACH64_CLEAR)] = {mach64_dma_clear, 1, 0}, - [DRM_IOCTL_NR(DRM_MACH64_SWAP)] = {mach64_dma_swap, 1, 0}, - [DRM_IOCTL_NR(DRM_MACH64_IDLE)] = {mach64_dma_idle, 1, 0}, - [DRM_IOCTL_NR(DRM_MACH64_RESET)] = {mach64_engine_reset, 1, 0}, - [DRM_IOCTL_NR(DRM_MACH64_VERTEX)] = {mach64_dma_vertex, 1, 0}, - [DRM_IOCTL_NR(DRM_MACH64_BLIT)] = {mach64_dma_blit, 1, 0}, - [DRM_IOCTL_NR(DRM_MACH64_FLUSH)] = {mach64_dma_flush, 1, 0}, - [DRM_IOCTL_NR(DRM_MACH64_GETPARAM)] = {mach64_get_param, 1, 0}, -}; +extern drm_ioctl_desc_t mach64_ioctls[]; +extern int mach64_max_ioctl; static int probe(struct pci_dev *pdev, const struct pci_device_id *ent); static struct drm_driver driver = { @@ -97,8 +83,8 @@ 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 = mach64_ioctls, + .num_ioctls = mach64_max_ioctl, .dma_ioctl = mach64_dma_buffers, .fops = { .owner = THIS_MODULE, -- cgit v1.2.3