Merge branch 'master' of ssh+git://git.freedesktop.org/git/mesa/drm into xgi-0-0-2

Conflicts:

	linux-core/drmP.h
	linux-core/drm_scatter.c

1 files changed, 17 insertions, 18 deletions

diff --git a/linux-core/i915_buffer.c b/linux-core/i915_buffer.c
index 8589f467..bf500cc6 100644
--- a/linux-core/i915_buffer.c
+++ b/linux-core/i915_buffer.c
@@ -33,14 +33,13 @@
 #include "i915_drm.h"
 #include "i915_drv.h"
 
-drm_ttm_backend_t *i915_create_ttm_backend_entry(drm_device_t * dev)
+struct drm_ttm_backend *i915_create_ttm_backend_entry(struct drm_device * dev)
 {
 	return drm_agp_init_ttm(dev);
 }
 
-int i915_fence_types(drm_buffer_object_t *bo, uint32_t * class, uint32_t * type)
+int i915_fence_types(struct drm_buffer_object *bo, uint32_t * type)
 {
-	*class = 0;
 	if (bo->mem.flags & (DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE))
 		*type = 3;
 	else
@@ -48,7 +47,7 @@ int i915_fence_types(drm_buffer_object_t *bo, uint32_t * class, uint32_t * type)
 	return 0;
 }
 
-int i915_invalidate_caches(drm_device_t * dev, uint32_t flags)
+int i915_invalidate_caches(struct drm_device * dev, uint64_t flags)
 {
 	/*
 	 * FIXME: Only emit once per batchbuffer submission.
@@ -64,8 +63,8 @@ int i915_invalidate_caches(drm_device_t * dev, uint32_t flags)
 	return i915_emit_mi_flush(dev, flush_cmd);
 }
 
-int i915_init_mem_type(drm_device_t * dev, uint32_t type,
-		       drm_mem_type_manager_t * 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:
@@ -106,7 +105,7 @@ int i915_init_mem_type(drm_device_t * dev, uint32_t type,
 	return 0;
 }
 
-uint32_t i915_evict_mask(drm_buffer_object_t *bo)
+uint32_t i915_evict_mask(struct drm_buffer_object *bo)
 {
 	switch (bo->mem.mem_type) {
 	case DRM_BO_MEM_LOCAL:
@@ -117,7 +116,7 @@ uint32_t i915_evict_mask(drm_buffer_object_t *bo)
 	}
 }
 
-static void i915_emit_copy_blit(drm_device_t * dev,
+static void i915_emit_copy_blit(struct drm_device * dev,
 				uint32_t src_offset,
 				uint32_t dst_offset,
 				uint32_t pages, int direction)
@@ -151,10 +150,10 @@ static void i915_emit_copy_blit(drm_device_t * dev,
 	return;
 }
 
-static int i915_move_blit(drm_buffer_object_t * bo,
-			  int evict, int no_wait, drm_bo_mem_reg_t * new_mem)
+static int i915_move_blit(struct drm_buffer_object * bo,
+			  int evict, int no_wait, struct drm_bo_mem_reg * new_mem)
 {
-	drm_bo_mem_reg_t *old_mem = &bo->mem;
+	struct drm_bo_mem_reg *old_mem = &bo->mem;
 	int dir = 0;
 
 	if ((old_mem->mem_type == new_mem->mem_type) &&
@@ -181,11 +180,11 @@ static int i915_move_blit(drm_buffer_object_t * bo,
  * then blit and subsequently move out again.
  */
 
-static int i915_move_flip(drm_buffer_object_t * bo,
-			  int evict, int no_wait, drm_bo_mem_reg_t * new_mem)
+static int i915_move_flip(struct drm_buffer_object * bo,
+			  int evict, int no_wait, struct drm_bo_mem_reg * new_mem)
 {
-	drm_device_t *dev = bo->dev;
-	drm_bo_mem_reg_t tmp_mem;
+	struct drm_device *dev = bo->dev;
+	struct drm_bo_mem_reg tmp_mem;
 	int ret;
 
 	tmp_mem = *new_mem;
@@ -217,10 +216,10 @@ out_cleanup:
 	return ret;
 }
 
-int i915_move(drm_buffer_object_t * bo,
-	      int evict, int no_wait, drm_bo_mem_reg_t * new_mem)
+int i915_move(struct drm_buffer_object * bo,
+	      int evict, int no_wait, struct drm_bo_mem_reg * new_mem)
 {
-	drm_bo_mem_reg_t *old_mem = &bo->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);