diff options
| author | Eric Anholt <eric@anholt.net> | 2008-05-30 14:42:08 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-05-30 14:42:08 -0700 |
| commit | 461bfa3da6f85b85c21cd84f81bb4eefa5481418 (patch) | |
| tree | 33e91c8cd024f67922670f9ed6565ceda1e4f3b5 /shared-core/i915_dma.c | |
| parent | 50bce2bc625deb439dd61f504496dddd0cd4f572 (diff) | |
| parent | 6e8a2cff66ac0d6afaf9bb233bc81449c2014078 (diff) | |
Merge commit 'origin/master' into drm-gem
Conflicts:
linux-core/Makefile.kernel
shared-core/i915_drv.h
shared-core/nouveau_state.c
Diffstat (limited to 'shared-core/i915_dma.c')
| -rw-r--r-- | shared-core/i915_dma.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c index 76cd45f1..a948834a 100644 --- a/shared-core/i915_dma.c +++ b/shared-core/i915_dma.c @@ -138,7 +138,7 @@ static int i915_dma_cleanup(struct drm_device * dev) return 0; } - +#if defined(I915_HAVE_BUFFER) #define DRI2_SAREA_BLOCK_TYPE(b) ((b) >> 16) #define DRI2_SAREA_BLOCK_SIZE(b) ((b) & 0xffff) #define DRI2_SAREA_BLOCK_NEXT(p) \ @@ -197,15 +197,16 @@ setup_dri2_sarea(struct drm_device * dev, return 0; } - +#endif static int i915_initialize(struct drm_device * dev, struct drm_file *file_priv, drm_i915_init_t * init) { drm_i915_private_t *dev_priv = dev->dev_private; +#if defined(I915_HAVE_BUFFER) int ret; - +#endif dev_priv->sarea = drm_getsarea(dev); if (!dev_priv->sarea) { DRM_ERROR("can not find sarea!\n"); @@ -297,7 +298,7 @@ static int i915_initialize(struct drm_device * dev, #ifdef I915_HAVE_BUFFER mutex_init(&dev_priv->cmdbuf_mutex); #endif - +#if defined(I915_HAVE_BUFFER) if (init->func == I915_INIT_DMA2) { ret = setup_dri2_sarea(dev, file_priv, init); if (ret) { @@ -306,7 +307,7 @@ static int i915_initialize(struct drm_device * dev, return ret; } } - +#endif return 0; } @@ -832,7 +833,7 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data, return 0; } -#if DRM_DEBUG_CODE +#if defined(DRM_DEBUG_CODE) #define DRM_DEBUG_RELOCATION (drm_debug != 0) #else #define DRM_DEBUG_RELOCATION 0 @@ -1130,7 +1131,7 @@ void i915_driver_lastclose(struct drm_device * dev) i915_do_cleanup_pageflip(dev); if (dev_priv->agp_heap) i915_mem_takedown(&(dev_priv->agp_heap)); - +#if defined(I915_HAVE_BUFFER) if (dev_priv->sarea_kmap.virtual) { drm_bo_kunmap(&dev_priv->sarea_kmap); dev_priv->sarea_kmap.virtual = NULL; @@ -1144,7 +1145,7 @@ void i915_driver_lastclose(struct drm_device * dev) mutex_unlock(&dev->struct_mutex); dev_priv->sarea_bo = NULL; } - +#endif i915_dma_cleanup(dev); } |