diff options
| author | anholt <anholt@FreeBSD.org> | 2006-05-17 06:36:28 +0000 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2006-05-17 06:36:28 +0000 |
| commit | c0e3faf72685e6c02e8509c92408f672e27c7096 (patch) | |
| tree | 208614304ffab07c6036af66afbe1dfd0327faae /sys/dev/drm | |
| parent | 1e618fb39747a281fe2964d37909e16ae0dfff6e (diff) | |
| download | FreeBSD-src-c0e3faf72685e6c02e8509c92408f672e27c7096.zip FreeBSD-src-c0e3faf72685e6c02e8509c92408f672e27c7096.tar.gz | |
Update to current DRM CVS, bringing in a fix for a NULL pointer chase when
running 3d apps on i915.
Diffstat (limited to 'sys/dev/drm')
| -rw-r--r-- | sys/dev/drm/drm.h | 4 | ||||
| -rw-r--r-- | sys/dev/drm/i915_drv.c | 2 | ||||
| -rw-r--r-- | sys/dev/drm/mga_drv.c | 4 | ||||
| -rw-r--r-- | sys/dev/drm/r300_cmdbuf.c | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/sys/dev/drm/drm.h b/sys/dev/drm/drm.h index 54e786f..d4dad8e 100644 --- a/sys/dev/drm/drm.h +++ b/sys/dev/drm/drm.h @@ -82,8 +82,8 @@ __FBSDID("$FreeBSD$"); #define DRM_IOC_WRITE _IOC_WRITE #define DRM_IOC_READWRITE _IOC_READ|_IOC_WRITE #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size) -#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) -#if defined(__FreeBSD__) && defined(IN_MODULE) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) +#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && defined(IN_MODULE) /* Prevent name collision when including sys/ioccom.h */ #undef ioctl #include <sys/ioccom.h> diff --git a/sys/dev/drm/i915_drv.c b/sys/dev/drm/i915_drv.c index 138af37..8a20330 100644 --- a/sys/dev/drm/i915_drv.c +++ b/sys/dev/drm/i915_drv.c @@ -50,6 +50,7 @@ static void i915_configure(drm_device_t *dev) dev->driver.preclose = i915_driver_preclose; dev->driver.lastclose = i915_driver_lastclose; dev->driver.device_is_agp = i915_driver_device_is_agp, + dev->driver.vblank_wait = i915_driver_vblank_wait; dev->driver.irq_preinstall = i915_driver_irq_preinstall; dev->driver.irq_postinstall = i915_driver_irq_postinstall; dev->driver.irq_uninstall = i915_driver_irq_uninstall; @@ -69,6 +70,7 @@ static void i915_configure(drm_device_t *dev) dev->driver.require_agp = 1; dev->driver.use_mtrr = 1; dev->driver.use_irq = 1; + dev->driver.use_vbl_irq = 1; } #ifdef __FreeBSD__ diff --git a/sys/dev/drm/mga_drv.c b/sys/dev/drm/mga_drv.c index 7250043..8bde4fd 100644 --- a/sys/dev/drm/mga_drv.c +++ b/sys/dev/drm/mga_drv.c @@ -82,9 +82,9 @@ static int mga_driver_device_is_agp(drm_device_t * dev) if (pci_get_device(dev->device) == 0x0525 && pci_get_vendor(bus) == 0x3388 && pci_get_device(bus) == 0x0021) - return 0; + return DRM_IS_NOT_AGP; else - return 2; + return DRM_MIGHT_BE_AGP; } static void mga_configure(drm_device_t *dev) diff --git a/sys/dev/drm/r300_cmdbuf.c b/sys/dev/drm/r300_cmdbuf.c index d1e0bdb..d71f8cb 100644 --- a/sys/dev/drm/r300_cmdbuf.c +++ b/sys/dev/drm/r300_cmdbuf.c @@ -725,7 +725,7 @@ static int r300_scratch(drm_radeon_private_t *dev_priv, dev_priv->scratch_ages[header.scratch.reg] ++; - ref_age_base = *(u32 **)cmdbuf->buf; + ref_age_base = (u32 *)(unsigned long)*((uint64_t *)cmdbuf->buf); cmdbuf->buf += sizeof(uint64_t); cmdbuf->bufsz -= sizeof(uint64_t); |
