diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-11-06 11:32:58 +1000 | 
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-11-06 12:16:07 +1000 | 
| commit | 9493ce6ca39b65b9f955943a043c0741a5c59f7c (patch) | |
| tree | 6df40949bf36db04ddf95698eaf2b5cd3dda54ce /linux-core | |
| parent | 427cc561b3dfbd504472e284e5fc16b63acd1816 (diff) | |
i915: cleanup most of the whitespace
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/i915_buffer.c | 31 | ||||
| -rw-r--r-- | linux-core/i915_fence.c | 13 | 
2 files changed, 22 insertions, 22 deletions
| diff --git a/linux-core/i915_buffer.c b/linux-core/i915_buffer.c index 1f88a513..fb063ee7 100644 --- a/linux-core/i915_buffer.c +++ b/linux-core/i915_buffer.c @@ -33,14 +33,14 @@  #include "i915_drm.h"  #include "i915_drv.h" -struct drm_ttm_backend *i915_create_ttm_backend_entry(struct drm_device * dev) +struct drm_ttm_backend *i915_create_ttm_backend_entry(struct drm_device *dev)  {  	return drm_agp_init_ttm(dev);  }  int i915_fence_types(struct drm_buffer_object *bo, -		     uint32_t * fclass, -		     uint32_t * type) +		     uint32_t *fclass, +		     uint32_t *type)  {  	if (bo->mem.mask & (DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE))  		*type = 3; @@ -49,7 +49,7 @@ int i915_fence_types(struct drm_buffer_object *bo,  	return 0;  } -int i915_invalidate_caches(struct drm_device * dev, uint64_t flags) +int i915_invalidate_caches(struct drm_device *dev, uint64_t flags)  {  	/*  	 * FIXME: Only emit once per batchbuffer submission. @@ -65,8 +65,8 @@ int i915_invalidate_caches(struct drm_device * dev, uint64_t flags)  	return i915_emit_mi_flush(dev, flush_cmd);  } -int i915_init_mem_type(struct drm_device * dev, uint32_t type, -		       struct drm_mem_type_manager * man) +int i915_init_mem_type(struct drm_device *dev, uint32_t type, +		       struct drm_mem_type_manager *man)  {  	switch (type) {  	case DRM_BO_MEM_LOCAL: @@ -226,25 +226,24 @@ out_cleanup:  #endif  /* - * Disable i915_move_flip for now, since we can't guarantee that the hardware lock - * is held here. To re-enable we need to make sure either + * Disable i915_move_flip for now, since we can't guarantee that the hardware + * lock is held here. To re-enable we need to make sure either   * a) The X server is using DRM to submit commands to the ring, or - * b) DRM can use the HP ring for these blits. This means i915 needs to implement - *    a new ring submission mechanism and fence class. + * b) DRM can use the HP ring for these blits. This means i915 needs to + *    implement a new ring submission mechanism and fence class.   */ - -int i915_move(struct drm_buffer_object * bo, -	      int evict, int no_wait, struct drm_bo_mem_reg * new_mem) +int i915_move(struct drm_buffer_object *bo, +	      int evict, int no_wait, struct drm_bo_mem_reg *new_mem)  {  	struct drm_bo_mem_reg *old_mem = &bo->mem;  	if (old_mem->mem_type == DRM_BO_MEM_LOCAL) {  		return drm_bo_move_memcpy(bo, evict, no_wait, new_mem);  	} else if (new_mem->mem_type == DRM_BO_MEM_LOCAL) { -		if (0 /*i915_move_flip(bo, evict, no_wait, new_mem)*/) +		if (0) /*i915_move_flip(bo, evict, no_wait, new_mem)*/  			return drm_bo_move_memcpy(bo, evict, no_wait, new_mem);  	} else { -		if (0 /*i915_move_blit(bo, evict, no_wait, new_mem)*/) +		if (0) /*i915_move_blit(bo, evict, no_wait, new_mem)*/  			return drm_bo_move_memcpy(bo, evict, no_wait, new_mem);  	}  	return 0; @@ -259,7 +258,7 @@ static inline void clflush(volatile void *__p)  static inline void drm_cache_flush_addr(void *virt)  { -        int i; +	int i;  	for (i = 0; i < PAGE_SIZE; i += boot_cpu_data.x86_clflush_size)  		clflush(virt+i); diff --git a/linux-core/i915_fence.c b/linux-core/i915_fence.c index f2c29828..e3c76df6 100644 --- a/linux-core/i915_fence.c +++ b/linux-core/i915_fence.c @@ -38,7 +38,7 @@   * Implements an intel sync flush operation.   */ -static void i915_perform_flush(struct drm_device * dev) +static void i915_perform_flush(struct drm_device *dev)  {  	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;  	struct drm_fence_manager *fm = &dev->fm; @@ -63,7 +63,7 @@ static void i915_perform_flush(struct drm_device * dev)  		diff = (sequence - fc->last_exe_flush) & BREADCRUMB_MASK;  		if (diff < driver->wrap_diff && diff != 0) { -		        drm_fence_handler(dev, 0, sequence, +			drm_fence_handler(dev, 0, sequence,  					  DRM_FENCE_TYPE_EXE, 0);  		} @@ -110,7 +110,7 @@ static void i915_perform_flush(struct drm_device * dev)  } -void i915_poke_flush(struct drm_device * dev, uint32_t class) +void i915_poke_flush(struct drm_device *dev, uint32_t class)  {  	struct drm_fence_manager *fm = &dev->fm;  	unsigned long flags; @@ -120,8 +120,9 @@ void i915_poke_flush(struct drm_device * dev, uint32_t class)  	write_unlock_irqrestore(&fm->lock, flags);  } -int i915_fence_emit_sequence(struct drm_device * dev, uint32_t class, uint32_t flags, -			     uint32_t * sequence, uint32_t * native_type) +int i915_fence_emit_sequence(struct drm_device *dev, uint32_t class, +			     uint32_t flags, uint32_t *sequence, +			     uint32_t *native_type)  {  	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;  	if (!dev_priv) @@ -136,7 +137,7 @@ int i915_fence_emit_sequence(struct drm_device * dev, uint32_t class, uint32_t f  	return 0;  } -void i915_fence_handler(struct drm_device * dev) +void i915_fence_handler(struct drm_device *dev)  {  	struct drm_fence_manager *fm = &dev->fm; | 
