diff options
| author | Eric Anholt <anholt@freebsd.org> | 2005-08-15 18:07:12 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2005-08-15 18:07:12 +0000 |
| commit | 8c21b783c3e38aa2c2d16e11ec01cf695f8e7f8a (patch) | |
| tree | c40ed75e583b24b7a9947221766c82d5a4cd061d /shared-core/via_drv.c | |
| parent | 4f5961eeeee806a2d6e08e159c56262d4f060cba (diff) | |
Port the VIA DRM to FreeBSD. Original patch by Jake, with some cleanup by
me to match other drivers and avoid ifdeffing. The linux via_drv.c will
be moved from shared-core to linux-core soon by repocopy.
Submitted by: Jake Burkholder <jake@FreeBSD.org> Tested by: unichrome
Diffstat (limited to 'shared-core/via_drv.c')
| -rw-r--r-- | shared-core/via_drv.c | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/shared-core/via_drv.c b/shared-core/via_drv.c index fd0dbcc9..8291ae8e 100644 --- a/shared-core/via_drv.c +++ b/shared-core/via_drv.c @@ -39,30 +39,16 @@ static struct pci_device_id pciidlist[] = { viadrv_PCI_IDS }; -/* - * {function, auth_needed, master, root_only} - */ - -static drm_ioctl_desc_t ioctls[] = { - [DRM_IOCTL_NR(DRM_VIA_ALLOCMEM)] = {via_mem_alloc, 1, 0, 0}, - [DRM_IOCTL_NR(DRM_VIA_FREEMEM)] = {via_mem_free, 1, 0, 0}, - [DRM_IOCTL_NR(DRM_VIA_AGP_INIT)] = {via_agp_init, 1, 1, 0}, - [DRM_IOCTL_NR(DRM_VIA_FB_INIT)] = {via_fb_init, 1, 1, 0}, - [DRM_IOCTL_NR(DRM_VIA_MAP_INIT)] = {via_map_init, 1, 1, 0}, - [DRM_IOCTL_NR(DRM_VIA_DEC_FUTEX)] = {via_decoder_futex, 1, 0, 0}, - [DRM_IOCTL_NR(DRM_VIA_DMA_INIT)] = {via_dma_init, 1, 0, 0}, - [DRM_IOCTL_NR(DRM_VIA_CMDBUFFER)] = {via_cmdbuffer, 1, 0, 0}, - [DRM_IOCTL_NR(DRM_VIA_FLUSH)] = {via_flush_ioctl, 1, 0, 0}, - [DRM_IOCTL_NR(DRM_VIA_PCICMD)] = {via_pci_cmdbuffer, 1, 0, 0}, - [DRM_IOCTL_NR(DRM_VIA_CMDBUF_SIZE)] = {via_cmdbuf_size, 1, 0, 0}, - [DRM_IOCTL_NR(DRM_VIA_WAIT_IRQ)] = {via_wait_irq, 1, 0, 0} -}; +extern drm_ioctl_desc_t via_ioctls[]; +extern int via_max_ioctl; static int probe(struct pci_dev *pdev, const struct pci_device_id *ent); static struct drm_driver driver = { .driver_features = DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_IRQ_VBL, + .load = via_driver_load, + .unload = via_driver_unload, .context_ctor = via_init_context, .context_dtor = via_final_context, .vblank_wait = via_driver_vblank_wait, @@ -75,8 +61,7 @@ static struct drm_driver driver = { .reclaim_buffers = drm_core_reclaim_buffers, .get_map_ofs = drm_core_get_map_ofs, .get_reg_ofs = drm_core_get_reg_ofs, - .ioctls = ioctls, - .num_ioctls = DRM_ARRAY_SIZE(ioctls), + .ioctls = via_ioctls, .fops = { .owner = THIS_MODULE, .open = drm_open, @@ -108,6 +93,8 @@ static int probe(struct pci_dev *pdev, const struct pci_device_id *ent) static int __init via_init(void) { + driver.num_ioctls = via_max_ioctl; + via_init_command_verifier(); return drm_init(&driver, pciidlist); } |