From: Roland Scheidegger <sroland@vmware.com>
Date: Fri, 27 Jul 2012 01:46:41 +0000 (+0200)
Subject: r200: get rid of old gart memory functions from old dri1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=549470aa1a0149795b17bb81d98d70a57abb70ef;p=mesa.git

r200: get rid of old gart memory functions from old dri1

Those functions are SO dead.
---

diff --git a/src/mesa/drivers/dri/r200/r200_ioctl.c b/src/mesa/drivers/dri/r200/r200_ioctl.c
index faa9f16a376..9a73961e666 100644
--- a/src/mesa/drivers/dri/r200/r200_ioctl.c
+++ b/src/mesa/drivers/dri/r200/r200_ioctl.c
@@ -86,32 +86,6 @@ static void r200Clear( struct gl_context *ctx, GLbitfield mask )
    radeonUserClear(ctx, hwmask);
 }
 
-GLboolean r200IsGartMemory( r200ContextPtr rmesa, const GLvoid *pointer,
-			   GLint size )
-{
-   ptrdiff_t offset = (char *)pointer - (char *)rmesa->radeon.radeonScreen->gartTextures.map;
-   int valid = (size >= 0 &&
-		offset >= 0 &&
-		offset + size < rmesa->radeon.radeonScreen->gartTextures.size);
-
-   if (R200_DEBUG & RADEON_IOCTL)
-      fprintf(stderr, "r200IsGartMemory( %p ) : %d\n", pointer, valid );
-
-   return valid;
-}
-
-
-GLuint r200GartOffsetFromVirtual( r200ContextPtr rmesa, const GLvoid *pointer )
-{
-   ptrdiff_t offset = (char *)pointer - (char *)rmesa->radeon.radeonScreen->gartTextures.map;
-
-   if (offset < 0 || offset > rmesa->radeon.radeonScreen->gartTextures.size)
-      return ~0;
-   else
-      return rmesa->radeon.radeonScreen->gart_texture_offset + offset;
-}
-
-
 
 void r200InitIoctlFuncs( struct dd_function_table *functions )
 {
diff --git a/src/mesa/drivers/dri/r200/r200_ioctl.h b/src/mesa/drivers/dri/r200/r200_ioctl.h
index 02a06a32b42..9aa00deb4e1 100644
--- a/src/mesa/drivers/dri/r200/r200_ioctl.h
+++ b/src/mesa/drivers/dri/r200/r200_ioctl.h
@@ -65,12 +65,6 @@ extern void r200EmitAOS(r200ContextPtr rmesa, GLuint nr, GLuint offset);
 
 extern void r200InitIoctlFuncs( struct dd_function_table *functions );
 
-extern GLboolean r200IsGartMemory( r200ContextPtr rmesa, const GLvoid *pointer,
-				   GLint size );
-
-extern GLuint r200GartOffsetFromVirtual( r200ContextPtr rmesa, 
-					 const GLvoid *pointer );
-
 void r200SetUpAtomList( r200ContextPtr rmesa );
 
 /* ================================================================