Merge remote-tracking branch 'mesa-public/master' into vulkan

1 files changed, 152 insertions, 152 deletions

diff --git a/src/gallium/drivers/nouveau/nouveau_screen.c b/src/gallium/drivers/nouveau/nouveau_screen.c
index b2290e7e784..47603b0b7fd 100644
--- a/src/gallium/drivers/nouveau/nouveau_screen.c
+++ b/src/gallium/drivers/nouveau/nouveau_screen.c
@@ -30,211 +30,211 @@ int nouveau_mesa_debug = 0;
 static const char *
 nouveau_screen_get_name(struct pipe_screen *pscreen)
 {
-	struct nouveau_device *dev = nouveau_screen(pscreen)->device;
-	static char buffer[128];
+   struct nouveau_device *dev = nouveau_screen(pscreen)->device;
+   static char buffer[128];
 
-	util_snprintf(buffer, sizeof(buffer), "NV%02X", dev->chipset);
-	return buffer;
+   util_snprintf(buffer, sizeof(buffer), "NV%02X", dev->chipset);
+   return buffer;
 }
 
 static const char *
 nouveau_screen_get_vendor(struct pipe_screen *pscreen)
 {
-	return "nouveau";
+   return "nouveau";
 }
 
 static const char *
 nouveau_screen_get_device_vendor(struct pipe_screen *pscreen)
 {
-	return "NVIDIA";
+   return "NVIDIA";
 }
 
 static uint64_t
 nouveau_screen_get_timestamp(struct pipe_screen *pscreen)
 {
-	int64_t cpu_time = os_time_get() * 1000;
+   int64_t cpu_time = os_time_get() * 1000;
 
-        /* getparam of PTIMER_TIME takes about x10 as long (several usecs) */
+   /* getparam of PTIMER_TIME takes about x10 as long (several usecs) */
 
-	return cpu_time + nouveau_screen(pscreen)->cpu_gpu_time_delta;
+   return cpu_time + nouveau_screen(pscreen)->cpu_gpu_time_delta;
 }
 
 static void
 nouveau_screen_fence_ref(struct pipe_screen *pscreen,
-			 struct pipe_fence_handle **ptr,
-			 struct pipe_fence_handle *pfence)
+                         struct pipe_fence_handle **ptr,
+                         struct pipe_fence_handle *pfence)
 {
-	nouveau_fence_ref(nouveau_fence(pfence), (struct nouveau_fence **)ptr);
+   nouveau_fence_ref(nouveau_fence(pfence), (struct nouveau_fence **)ptr);
 }
 
 static boolean
 nouveau_screen_fence_finish(struct pipe_screen *screen,
-			    struct pipe_fence_handle *pfence,
+                            struct pipe_fence_handle *pfence,
                             uint64_t timeout)
 {
-	if (!timeout)
-		return nouveau_fence_signalled(nouveau_fence(pfence));
+   if (!timeout)
+      return nouveau_fence_signalled(nouveau_fence(pfence));
 
-	return nouveau_fence_wait(nouveau_fence(pfence));
+   return nouveau_fence_wait(nouveau_fence(pfence));
 }
 
 
 struct nouveau_bo *
 nouveau_screen_bo_from_handle(struct pipe_screen *pscreen,
-			      struct winsys_handle *whandle,
-			      unsigned *out_stride)
+                              struct winsys_handle *whandle,
+                              unsigned *out_stride)
 {
-	struct nouveau_device *dev = nouveau_screen(pscreen)->device;
-	struct nouveau_bo *bo = 0;
-	int ret;
-
-	if (whandle->type != DRM_API_HANDLE_TYPE_SHARED &&
-	    whandle->type != DRM_API_HANDLE_TYPE_FD) {
-		debug_printf("%s: attempt to import unsupported handle type %d\n",
-			     __FUNCTION__, whandle->type);
-		return NULL;
-	}
-
-	if (whandle->type == DRM_API_HANDLE_TYPE_SHARED)
-		ret = nouveau_bo_name_ref(dev, whandle->handle, &bo);
-	else
-		ret = nouveau_bo_prime_handle_ref(dev, whandle->handle, &bo);
-
-	if (ret) {
-		debug_printf("%s: ref name 0x%08x failed with %d\n",
-			     __FUNCTION__, whandle->handle, ret);
-		return NULL;
-	}
-
-	*out_stride = whandle->stride;
-	return bo;
+   struct nouveau_device *dev = nouveau_screen(pscreen)->device;
+   struct nouveau_bo *bo = 0;
+   int ret;
+
+   if (whandle->type != DRM_API_HANDLE_TYPE_SHARED &&
+       whandle->type != DRM_API_HANDLE_TYPE_FD) {
+      debug_printf("%s: attempt to import unsupported handle type %d\n",
+                   __FUNCTION__, whandle->type);
+      return NULL;
+   }
+
+   if (whandle->type == DRM_API_HANDLE_TYPE_SHARED)
+      ret = nouveau_bo_name_ref(dev, whandle->handle, &bo);
+   else
+      ret = nouveau_bo_prime_handle_ref(dev, whandle->handle, &bo);
+
+   if (ret) {
+      debug_printf("%s: ref name 0x%08x failed with %d\n",
+                   __FUNCTION__, whandle->handle, ret);
+      return NULL;
+   }
+
+   *out_stride = whandle->stride;
+   return bo;
 }
 
 
 bool
 nouveau_screen_bo_get_handle(struct pipe_screen *pscreen,
-			     struct nouveau_bo *bo,
-			     unsigned stride,
-			     struct winsys_handle *whandle)
+                             struct nouveau_bo *bo,
+                             unsigned stride,
+                             struct winsys_handle *whandle)
 {
-	whandle->stride = stride;
-
-	if (whandle->type == DRM_API_HANDLE_TYPE_SHARED) {
-		return nouveau_bo_name_get(bo, &whandle->handle) == 0;
-	} else if (whandle->type == DRM_API_HANDLE_TYPE_KMS) {
-		whandle->handle = bo->handle;
-		return true;
-	} else if (whandle->type == DRM_API_HANDLE_TYPE_FD) {
-		return nouveau_bo_set_prime(bo, (int *)&whandle->handle) == 0;
-	} else {
-		return false;
-	}
+   whandle->stride = stride;
+
+   if (whandle->type == DRM_API_HANDLE_TYPE_SHARED) {
+      return nouveau_bo_name_get(bo, &whandle->handle) == 0;
+   } else if (whandle->type == DRM_API_HANDLE_TYPE_KMS) {
+      whandle->handle = bo->handle;
+      return true;
+   } else if (whandle->type == DRM_API_HANDLE_TYPE_FD) {
+      return nouveau_bo_set_prime(bo, (int *)&whandle->handle) == 0;
+   } else {
+      return false;
+   }
 }
 
 int
 nouveau_screen_init(struct nouveau_screen *screen, struct nouveau_device *dev)
 {
-	struct pipe_screen *pscreen = &screen->base;
-	struct nv04_fifo nv04_data = { .vram = 0xbeef0201, .gart = 0xbeef0202 };
-	struct nvc0_fifo nvc0_data = { };
-	uint64_t time;
-	int size, ret;
-	void *data;
-	union nouveau_bo_config mm_config;
-
-	char *nv_dbg = getenv("NOUVEAU_MESA_DEBUG");
-	if (nv_dbg)
-	   nouveau_mesa_debug = atoi(nv_dbg);
-
-	/*
-	 * this is initialized to 1 in nouveau_drm_screen_create after screen
-	 * is fully constructed and added to the global screen list.
-	 */
-	screen->refcount = -1;
-
-	if (dev->chipset < 0xc0) {
-		data = &nv04_data;
-		size = sizeof(nv04_data);
-	} else {
-		data = &nvc0_data;
-		size = sizeof(nvc0_data);
-	}
-
-	/*
-	 * Set default VRAM domain if not overridden
-	 */
-	if (!screen->vram_domain) {
-		if (dev->vram_size > 0)
-			screen->vram_domain = NOUVEAU_BO_VRAM;
-		else
-			screen->vram_domain = NOUVEAU_BO_GART;
-	}
-
-	ret = nouveau_object_new(&dev->object, 0, NOUVEAU_FIFO_CHANNEL_CLASS,
-				 data, size, &screen->channel);
-	if (ret)
-		return ret;
-	screen->device = dev;
-
-	ret = nouveau_client_new(screen->device, &screen->client);
-	if (ret)
-		return ret;
-	ret = nouveau_pushbuf_new(screen->client, screen->channel,
-				  4, 512 * 1024, 1,
-				  &screen->pushbuf);
-	if (ret)
-		return ret;
-
-        /* getting CPU time first appears to be more accurate */
-        screen->cpu_gpu_time_delta = os_time_get();
-
-        ret = nouveau_getparam(dev, NOUVEAU_GETPARAM_PTIMER_TIME, &time);
-        if (!ret)
-           screen->cpu_gpu_time_delta = time - screen->cpu_gpu_time_delta * 1000;
-
-	pscreen->get_name = nouveau_screen_get_name;
-	pscreen->get_vendor = nouveau_screen_get_vendor;
-	pscreen->get_device_vendor = nouveau_screen_get_device_vendor;
-
-	pscreen->get_timestamp = nouveau_screen_get_timestamp;
-
-	pscreen->fence_reference = nouveau_screen_fence_ref;
-	pscreen->fence_finish = nouveau_screen_fence_finish;
-
-	util_format_s3tc_init();
-
-	screen->lowmem_bindings = PIPE_BIND_GLOBAL; /* gallium limit */
-	screen->vidmem_bindings =
-		PIPE_BIND_RENDER_TARGET | PIPE_BIND_DEPTH_STENCIL |
-		PIPE_BIND_DISPLAY_TARGET | PIPE_BIND_SCANOUT |
-		PIPE_BIND_CURSOR |
-		PIPE_BIND_SAMPLER_VIEW |
-		PIPE_BIND_SHADER_BUFFER | PIPE_BIND_SHADER_IMAGE |
-                PIPE_BIND_COMPUTE_RESOURCE |
-		PIPE_BIND_GLOBAL;
-	screen->sysmem_bindings =
-		PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_STREAM_OUTPUT |
-		PIPE_BIND_COMMAND_ARGS_BUFFER;
-
-	memset(&mm_config, 0, sizeof(mm_config));
-
-	screen->mm_GART = nouveau_mm_create(dev,
-					    NOUVEAU_BO_GART | NOUVEAU_BO_MAP,
-					    &mm_config);
-	screen->mm_VRAM = nouveau_mm_create(dev, NOUVEAU_BO_VRAM, &mm_config);
-	return 0;
+   struct pipe_screen *pscreen = &screen->base;
+   struct nv04_fifo nv04_data = { .vram = 0xbeef0201, .gart = 0xbeef0202 };
+   struct nvc0_fifo nvc0_data = { };
+   uint64_t time;
+   int size, ret;
+   void *data;
+   union nouveau_bo_config mm_config;
+
+   char *nv_dbg = getenv("NOUVEAU_MESA_DEBUG");
+   if (nv_dbg)
+      nouveau_mesa_debug = atoi(nv_dbg);
+
+   /*
+    * this is initialized to 1 in nouveau_drm_screen_create after screen
+    * is fully constructed and added to the global screen list.
+    */
+   screen->refcount = -1;
+
+   if (dev->chipset < 0xc0) {
+      data = &nv04_data;
+      size = sizeof(nv04_data);
+   } else {
+      data = &nvc0_data;
+      size = sizeof(nvc0_data);
+   }
+
+   /*
+    * Set default VRAM domain if not overridden
+    */
+   if (!screen->vram_domain) {
+      if (dev->vram_size > 0)
+         screen->vram_domain = NOUVEAU_BO_VRAM;
+      else
+         screen->vram_domain = NOUVEAU_BO_GART;
+   }
+
+   ret = nouveau_object_new(&dev->object, 0, NOUVEAU_FIFO_CHANNEL_CLASS,
+                            data, size, &screen->channel);
+   if (ret)
+      return ret;
+   screen->device = dev;
+
+   ret = nouveau_client_new(screen->device, &screen->client);
+   if (ret)
+      return ret;
+   ret = nouveau_pushbuf_new(screen->client, screen->channel,
+                             4, 512 * 1024, 1,
+                             &screen->pushbuf);
+   if (ret)
+      return ret;
+
+   /* getting CPU time first appears to be more accurate */
+   screen->cpu_gpu_time_delta = os_time_get();
+
+   ret = nouveau_getparam(dev, NOUVEAU_GETPARAM_PTIMER_TIME, &time);
+   if (!ret)
+      screen->cpu_gpu_time_delta = time - screen->cpu_gpu_time_delta * 1000;
+
+   pscreen->get_name = nouveau_screen_get_name;
+   pscreen->get_vendor = nouveau_screen_get_vendor;
+   pscreen->get_device_vendor = nouveau_screen_get_device_vendor;
+
+   pscreen->get_timestamp = nouveau_screen_get_timestamp;
+
+   pscreen->fence_reference = nouveau_screen_fence_ref;
+   pscreen->fence_finish = nouveau_screen_fence_finish;
+
+   util_format_s3tc_init();
+
+   screen->lowmem_bindings = PIPE_BIND_GLOBAL; /* gallium limit */
+   screen->vidmem_bindings =
+      PIPE_BIND_RENDER_TARGET | PIPE_BIND_DEPTH_STENCIL |
+      PIPE_BIND_DISPLAY_TARGET | PIPE_BIND_SCANOUT |
+      PIPE_BIND_CURSOR |
+      PIPE_BIND_SAMPLER_VIEW |
+      PIPE_BIND_SHADER_BUFFER | PIPE_BIND_SHADER_IMAGE |
+      PIPE_BIND_COMPUTE_RESOURCE |
+      PIPE_BIND_GLOBAL;
+   screen->sysmem_bindings =
+      PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_STREAM_OUTPUT |
+      PIPE_BIND_COMMAND_ARGS_BUFFER;
+
+   memset(&mm_config, 0, sizeof(mm_config));
+
+   screen->mm_GART = nouveau_mm_create(dev,
+                                       NOUVEAU_BO_GART | NOUVEAU_BO_MAP,
+                                       &mm_config);
+   screen->mm_VRAM = nouveau_mm_create(dev, NOUVEAU_BO_VRAM, &mm_config);
+   return 0;
 }
 
 void
 nouveau_screen_fini(struct nouveau_screen *screen)
 {
-	nouveau_mm_destroy(screen->mm_GART);
-	nouveau_mm_destroy(screen->mm_VRAM);
+   nouveau_mm_destroy(screen->mm_GART);
+   nouveau_mm_destroy(screen->mm_VRAM);
 
-	nouveau_pushbuf_del(&screen->pushbuf);
+   nouveau_pushbuf_del(&screen->pushbuf);
 
-	nouveau_client_del(&screen->client);
-	nouveau_object_del(&screen->channel);
+   nouveau_client_del(&screen->client);
+   nouveau_object_del(&screen->channel);
 
-	nouveau_device_del(&screen->device);
+   nouveau_device_del(&screen->device);
 }