From: Dave Airlie <airlied@redhat.com>
Date: Tue, 5 Oct 2010 05:57:57 +0000 (+1000)
Subject: r600g: drop mman allocator
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=46997d4fc27e62a1c479f25f5f441b95e6d5cb64;p=mesa.git

r600g: drop mman allocator

we don't use this since constant buffers are now being used on all gpus.
---

diff --git a/src/gallium/winsys/r600/drm/r600_bo.c b/src/gallium/winsys/r600/drm/r600_bo.c
index 8089c916404..9498f3a82ea 100644
--- a/src/gallium/winsys/r600/drm/r600_bo.c
+++ b/src/gallium/winsys/r600/drm/r600_bo.c
@@ -39,9 +39,7 @@ struct r600_bo *r600_bo(struct radeon *radeon,
 	desc.usage = usage;
 	ws_bo->size = size;
 
-	if (!radeon->use_mem_constant && (usage & PIPE_BIND_CONSTANT_BUFFER)) {
-		man = radeon->mman;
-	} else if (usage & (PIPE_BIND_CONSTANT_BUFFER | PIPE_BIND_VERTEX_BUFFER | PIPE_BIND_INDEX_BUFFER))
+	if (usage & (PIPE_BIND_CONSTANT_BUFFER | PIPE_BIND_VERTEX_BUFFER | PIPE_BIND_INDEX_BUFFER))
 		man = radeon->cman;
 	else
 		man = radeon->kman;
diff --git a/src/gallium/winsys/r600/drm/r600_drm.c b/src/gallium/winsys/r600/drm/r600_drm.c
index 31fb7d4e0fd..5f175a4df98 100644
--- a/src/gallium/winsys/r600/drm/r600_drm.c
+++ b/src/gallium/winsys/r600/drm/r600_drm.c
@@ -157,9 +157,6 @@ struct radeon *radeon_new(int fd, unsigned device)
 		break;
 	}
 
-	radeon->mman = pb_malloc_bufmgr_create();
-	if (!radeon->mman)
-		return NULL;
 	radeon->kman = radeon_bo_pbmgr_create(radeon);
 	if (!radeon->kman)
 		return NULL;
@@ -182,7 +179,6 @@ struct radeon *radeon_decref(struct radeon *radeon)
 		return NULL;
 	}
 
-	radeon->mman->destroy(radeon->mman);
 	radeon->cman->destroy(radeon->cman);
 	radeon->kman->destroy(radeon->kman);
 	drmClose(radeon->fd);
diff --git a/src/gallium/winsys/r600/drm/r600_priv.h b/src/gallium/winsys/r600/drm/r600_priv.h
index 285a192e743..07e734268d5 100644
--- a/src/gallium/winsys/r600/drm/r600_priv.h
+++ b/src/gallium/winsys/r600/drm/r600_priv.h
@@ -41,7 +41,6 @@ struct radeon {
 	unsigned			family;
 	enum chip_class			chip_class;
 	boolean				use_mem_constant; /* true for evergreen */
-	struct pb_manager *mman; /* malloc manager */
 	struct pb_manager *kman; /* kernel bo manager */
 	struct pb_manager *cman; /* cached bo manager */
 };