diff options
| author | Eric Anholt <anholt@freebsd.org> | 2005-11-15 09:22:09 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2005-11-15 09:22:09 +0000 |
| commit | c575b7e19ec83e663af91b431ac8c0a9e16a3a5d (patch) | |
| tree | 7094b4360ce8721517a46433713fbc3340929566 /bsd-core | |
| parent | 19c5c56779250e5615a88e3581dc3bd89598b9be (diff) | |
Fix compiling and reenable build of i915 driver.
Diffstat (limited to 'bsd-core')
| -rw-r--r-- | bsd-core/Makefile | 2 | ||||
| -rw-r--r-- | bsd-core/i915_drv.c | 41 |
2 files changed, 22 insertions, 21 deletions
diff --git a/bsd-core/Makefile b/bsd-core/Makefile index 96b878c0..db563a65 100644 --- a/bsd-core/Makefile +++ b/bsd-core/Makefile @@ -55,7 +55,7 @@ SHAREDFILES= drm.h \ via_verifier.h \ via_video.c -SUBDIR = drm mach64 mga r128 radeon savage sis tdfx # via i915 +SUBDIR = drm mach64 mga r128 radeon savage sis tdfx i915 # via CLEANFILES+= ${SHAREDFILES} diff --git a/bsd-core/i915_drv.c b/bsd-core/i915_drv.c index 5c9961b6..c571b389 100644 --- a/bsd-core/i915_drv.c +++ b/bsd-core/i915_drv.c @@ -42,29 +42,30 @@ static drm_pci_id_list_t i915_pciidlist[] = { static void i915_configure(drm_device_t *dev) { - dev->buf_priv_size = 1; /* No dev_priv */ - dev->preclose = i915_driver_preclose; - dev->lastclose = i915_driver_lastclose; - dev->device_is_agp = i915_driver_device_is_agp, - dev->irq_preinstall = i915_driver_irq_preinstall; - dev->irq_postinstall = i915_driver_irq_postinstall; - dev->irq_uninstall = i915_driver_irq_uninstall; - dev->irq_handler = i915_driver_irq_handler; + dev->driver.buf_priv_size = 1; /* No dev_priv */ + dev->driver.load = i915_driver_load; + dev->driver.preclose = i915_driver_preclose; + dev->driver.lastclose = i915_driver_lastclose; + dev->driver.device_is_agp = i915_driver_device_is_agp, + dev->driver.irq_preinstall = i915_driver_irq_preinstall; + dev->driver.irq_postinstall = i915_driver_irq_postinstall; + dev->driver.irq_uninstall = i915_driver_irq_uninstall; + dev->driver.irq_handler = i915_driver_irq_handler; - dev->ioctls = i915_ioctls; - dev->max_ioctl = i915_max_ioctl; + dev->driver.ioctls = i915_ioctls; + dev->driver.max_ioctl = i915_max_ioctl; - dev->driver_name = DRIVER_NAME; - dev->driver_desc = DRIVER_DESC; - dev->driver_date = DRIVER_DATE; - dev->driver_major = DRIVER_MAJOR; - dev->driver_minor = DRIVER_MINOR; - dev->driver_patchlevel = DRIVER_PATCHLEVEL; + dev->driver.name = DRIVER_NAME; + dev->driver.desc = DRIVER_DESC; + dev->driver.date = DRIVER_DATE; + dev->driver.major = DRIVER_MAJOR; + dev->driver.minor = DRIVER_MINOR; + dev->driver.patchlevel = DRIVER_PATCHLEVEL; - dev->use_agp = 1; - dev->require_agp = 1; - dev->use_mtrr = 1; - dev->use_irq = 1; + dev->driver.use_agp = 1; + dev->driver.require_agp = 1; + dev->driver.use_mtrr = 1; + dev->driver.use_irq = 1; } #ifdef __FreeBSD__ |