diff options
| author | Dave Airlie <airlied@redhat.com> | 2007-10-31 11:27:44 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2007-10-31 11:27:44 +1100 |
| commit | 2489062a3319c72197914ee06b089ae581c5f0a8 (patch) | |
| tree | 070b5a914d11d17ded36b31d6bb4472072bc2cb7 /shared-core | |
| parent | c106a7d8b9ddc1f6da3d462e3114af2ca72b3b46 (diff) | |
i915: add backwards compat chipset flushing code
Diffstat (limited to 'shared-core')
| -rw-r--r-- | shared-core/i915_dma.c | 6 | ||||
| -rw-r--r-- | shared-core/i915_drv.h | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c index 24a4ec4a..5d0c0001 100644 --- a/shared-core/i915_dma.c +++ b/shared-core/i915_dma.c @@ -1317,6 +1317,9 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) ret = drm_addmap(dev, base, size, _DRM_REGISTERS, _DRM_KERNEL, &dev_priv->mmio_map); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) + intel_init_chipset_flush_compat(dev); +#endif return ret; } @@ -1329,6 +1332,9 @@ int i915_driver_unload(struct drm_device *dev) drm_free(dev->dev_private, sizeof(drm_i915_private_t), DRM_MEM_DRIVER); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) + intel_fini_chipset_flush_compat(dev); +#endif return 0; } diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h index 9f69d841..6ff34eb7 100644 --- a/shared-core/i915_drv.h +++ b/shared-core/i915_drv.h @@ -313,6 +313,11 @@ extern int i915_move(struct drm_buffer_object *bo, int evict, void i915_flush_ttm(struct drm_ttm *ttm); #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) +extern void intel_init_chipset_flush_compat(struct drm_device *dev); +extern void intel_fini_chipset_flush_compat(struct drm_device *dev); +#endif + #define I915_READ(reg) DRM_READ32(dev_priv->mmio_map, (reg)) #define I915_WRITE(reg,val) DRM_WRITE32(dev_priv->mmio_map, (reg), (val)) #define I915_READ16(reg) DRM_READ16(dev_priv->mmio_map, (reg)) |