From 700bf80ca9fadf2c1404c220addebd92d9ad799d Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Tue, 22 Aug 2006 09:47:33 +0200
Subject: Bring in stripped TTM functionality.

---
 linux-core/drm_ttm.h | 152 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 152 insertions(+)
 create mode 100644 linux-core/drm_ttm.h

(limited to 'linux-core/drm_ttm.h')

diff --git a/linux-core/drm_ttm.h b/linux-core/drm_ttm.h
new file mode 100644
index 00000000..07592a84
--- /dev/null
+++ b/linux-core/drm_ttm.h
@@ -0,0 +1,152 @@
+#ifndef _DRM_TTM_H
+#define _DRM_TTM_H
+#define DRM_HAS_TTM
+
+/*
+ * The backend GART interface. (In our case AGP). Any similar type of device (PCIE?)
+ * needs only to implement these functions to be usable with the "TTM" interface.
+ * The AGP backend implementation lives in drm_agpsupport.c 
+ * basically maps these calls to available functions in agpgart. Each drm device driver gets an
+ * additional function pointer that creates these types, 
+ * so that the device can choose the correct aperture.
+ * (Multiple AGP apertures, etc.) 
+ * Most device drivers will let this point to the standard AGP implementation.
+ */
+
+typedef struct drm_ttm_backend {
+	unsigned long aperture_base;
+	void *private;
+	int (*needs_cache_adjust) (struct drm_ttm_backend * backend);
+	int (*populate) (struct drm_ttm_backend * backend,
+			 unsigned long num_pages, struct page ** pages);
+	void (*clear) (struct drm_ttm_backend * backend);
+	int (*bind) (struct drm_ttm_backend * backend, unsigned long offset);
+	int (*unbind) (struct drm_ttm_backend * backend);
+	void (*destroy) (struct drm_ttm_backend * backend);
+} drm_ttm_backend_t;
+
+#define DRM_FLUSH_READ  (0x01)
+#define DRM_FLUSH_WRITE (0x02)
+#define DRM_FLUSH_EXE   (0x04)
+
+typedef struct drm_ttm_backend_list {
+        drm_hash_item_t hash;
+	uint32_t flags;
+	atomic_t refcount;
+	struct list_head head;
+	drm_ttm_backend_t *be;
+	unsigned page_offset;
+	unsigned num_pages;
+	struct drm_ttm *owner;
+	drm_file_t *anon_owner;
+	struct page **anon_pages;
+	int anon_locked;
+	enum {
+		ttm_bound,
+		ttm_evicted,
+		ttm_unbound
+	} state;
+} drm_ttm_backend_list_t;
+
+typedef struct drm_ttm_vma_list {
+	struct list_head head;
+	pgprot_t orig_protection;
+	struct vm_area_struct *vma;
+	drm_map_t *map;
+} drm_ttm_vma_list_t;
+
+typedef struct drm_ttm {
+	struct list_head p_mm_list;
+	atomic_t shared_count;
+	uint32_t mm_list_seq;
+	unsigned long aperture_base;
+	struct page **pages;
+	uint32_t *page_flags;
+	unsigned long lhandle;
+	unsigned long num_pages;
+	drm_ttm_vma_list_t *vma_list;
+	struct drm_device *dev;
+	drm_ttm_backend_list_t *be_list;
+	atomic_t vma_count;
+	atomic_t unfinished_regions;
+	drm_file_t *owner;
+	int destroy;
+	int mmap_sem_locked;
+} drm_ttm_t;
+
+/*
+ * Initialize a ttm. Currently the size is fixed. Currently drmAddMap calls this function
+ * and creates a DRM map of type _DRM_TTM, and returns a reference to that map to the 
+ * caller.
+ */
+
+drm_ttm_t *drm_init_ttm(struct drm_device *dev, unsigned long size);
+
+/*
+ * Bind a part of the ttm starting at page_offset size n_pages into the GTT, at
+ * aperture offset aper_offset. The region handle will be used to reference this
+ * bound region in the future. Note that the region may be the whole ttm. 
+ * Regions should not overlap.
+ * This function sets all affected pages as noncacheable and flushes cashes and TLB.
+ */
+
+int drm_create_ttm_region(drm_ttm_t * ttm, unsigned long page_offset,
+			  unsigned long n_pages, int cached,
+			  drm_ttm_backend_list_t ** region);
+
+int drm_bind_ttm_region(drm_ttm_backend_list_t * region,
+			unsigned long aper_offset);
+
+/*
+ * Unbind a ttm region. Restores caching policy. Flushes caches and TLB.
+ */
+
+void drm_unbind_ttm_region(drm_ttm_backend_list_t * entry);
+void drm_destroy_ttm_region(drm_ttm_backend_list_t * entry);
+
+/*
+ * Evict a ttm region. Keeps Aperture caching policy.
+ */
+
+int drm_evict_ttm_region(drm_ttm_backend_list_t * entry);
+
+/*
+ * Rebind an already evicted region into a possibly new location in the aperture.
+ */
+
+int drm_rebind_ttm_region(drm_ttm_backend_list_t * entry,
+			  unsigned long aper_offset);
+
+/*
+ * Destroy a ttm. The user normally calls drmRmMap or a similar IOCTL to do this, 
+ * which calls this function iff there are no vmas referencing it anymore. Otherwise it is called
+ * when the last vma exits.
+ */
+
+extern int drm_destroy_ttm(drm_ttm_t * ttm);
+extern void drm_user_destroy_region(drm_ttm_backend_list_t * entry);
+extern int drm_ttm_add_mm_to_list(drm_ttm_t * ttm, struct mm_struct *mm);
+extern void drm_ttm_delete_mm(drm_ttm_t * ttm, struct mm_struct *mm);
+extern void drm_ttm_fence_before_destroy(drm_ttm_t * ttm);
+extern void drm_fence_unfenced_region(drm_ttm_backend_list_t * entry);
+
+extern int drm_ttm_ioctl(DRM_IOCTL_ARGS);
+extern int drm_mm_init_ioctl(DRM_IOCTL_ARGS);
+extern int drm_mm_fence_ioctl(DRM_IOCTL_ARGS);
+
+#define DRM_MASK_VAL(dest, mask, val)			\
+  (dest) = ((dest) & ~(mask)) | ((val) & (mask));
+
+#define DRM_TTM_MASK_FLAGS ((1 << PAGE_SHIFT) - 1)
+#define DRM_TTM_MASK_PFN (0xFFFFFFFFU - DRM_TTM_MASK_FLAGS)
+
+/*
+ * Page flags.
+ */
+
+#define DRM_TTM_PAGE_UNCACHED 0x01
+#define DRM_TTM_PAGE_USED     0x02
+#define DRM_TTM_PAGE_BOUND    0x04
+#define DRM_TTM_PAGE_PRESENT  0x08
+
+#endif
-- 
cgit v1.2.3


From ca4e34e532e818921f7b2d36fc6886874b7f7924 Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Tue, 22 Aug 2006 11:19:53 +0200
Subject: ttm code cleanup. Fix the sleep-in-page-table-spinlock bug discovered
 by Dave Airlie

---
 linux-core/drm_ttm.h | 42 +++++++++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 11 deletions(-)

(limited to 'linux-core/drm_ttm.h')

diff --git a/linux-core/drm_ttm.h b/linux-core/drm_ttm.h
index 07592a84..f695fcce 100644
--- a/linux-core/drm_ttm.h
+++ b/linux-core/drm_ttm.h
@@ -1,3 +1,34 @@
+/**************************************************************************
+ * 
+ * Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND., USA
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE 
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * 
+ **************************************************************************/
+/*
+ * Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com>
+ */
+
 #ifndef _DRM_TTM_H
 #define _DRM_TTM_H
 #define DRM_HAS_TTM
@@ -30,9 +61,7 @@ typedef struct drm_ttm_backend {
 #define DRM_FLUSH_EXE   (0x04)
 
 typedef struct drm_ttm_backend_list {
-        drm_hash_item_t hash;
 	uint32_t flags;
-	atomic_t refcount;
 	struct list_head head;
 	drm_ttm_backend_t *be;
 	unsigned page_offset;
@@ -68,9 +97,6 @@ typedef struct drm_ttm {
 	struct drm_device *dev;
 	drm_ttm_backend_list_t *be_list;
 	atomic_t vma_count;
-	atomic_t unfinished_regions;
-	drm_file_t *owner;
-	int destroy;
 	int mmap_sem_locked;
 } drm_ttm_t;
 
@@ -127,12 +153,6 @@ extern int drm_destroy_ttm(drm_ttm_t * ttm);
 extern void drm_user_destroy_region(drm_ttm_backend_list_t * entry);
 extern int drm_ttm_add_mm_to_list(drm_ttm_t * ttm, struct mm_struct *mm);
 extern void drm_ttm_delete_mm(drm_ttm_t * ttm, struct mm_struct *mm);
-extern void drm_ttm_fence_before_destroy(drm_ttm_t * ttm);
-extern void drm_fence_unfenced_region(drm_ttm_backend_list_t * entry);
-
-extern int drm_ttm_ioctl(DRM_IOCTL_ARGS);
-extern int drm_mm_init_ioctl(DRM_IOCTL_ARGS);
-extern int drm_mm_fence_ioctl(DRM_IOCTL_ARGS);
 
 #define DRM_MASK_VAL(dest, mask, val)			\
   (dest) = ((dest) & ~(mask)) | ((val) & (mask));
-- 
cgit v1.2.3


From e201511a0fbeb177a9ecd7f77d177fc88c1616fb Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Tue, 22 Aug 2006 11:57:08 +0200
Subject: More ttm cleanups.

---
 linux-core/drm_ttm.h | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'linux-core/drm_ttm.h')

diff --git a/linux-core/drm_ttm.h b/linux-core/drm_ttm.h
index f695fcce..ea9a8372 100644
--- a/linux-core/drm_ttm.h
+++ b/linux-core/drm_ttm.h
@@ -98,15 +98,10 @@ typedef struct drm_ttm {
 	drm_ttm_backend_list_t *be_list;
 	atomic_t vma_count;
 	int mmap_sem_locked;
+        int destroy;
 } drm_ttm_t;
 
-/*
- * Initialize a ttm. Currently the size is fixed. Currently drmAddMap calls this function
- * and creates a DRM map of type _DRM_TTM, and returns a reference to that map to the 
- * caller.
- */
-
-drm_ttm_t *drm_init_ttm(struct drm_device *dev, unsigned long size);
+int drm_add_ttm(struct drm_device * dev, unsigned size, drm_map_list_t ** maplist);
 
 /*
  * Bind a part of the ttm starting at page_offset size n_pages into the GTT, at
-- 
cgit v1.2.3


From 35c8ce6c2945ff09dc52dbc2a7382798ba64c1da Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Fri, 25 Aug 2006 19:03:42 +0200
Subject: ttm and buffer objects ioctl stubs.

---
 linux-core/drm_ttm.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'linux-core/drm_ttm.h')

diff --git a/linux-core/drm_ttm.h b/linux-core/drm_ttm.h
index ea9a8372..81006c3c 100644
--- a/linux-core/drm_ttm.h
+++ b/linux-core/drm_ttm.h
@@ -148,6 +148,8 @@ extern int drm_destroy_ttm(drm_ttm_t * ttm);
 extern void drm_user_destroy_region(drm_ttm_backend_list_t * entry);
 extern int drm_ttm_add_mm_to_list(drm_ttm_t * ttm, struct mm_struct *mm);
 extern void drm_ttm_delete_mm(drm_ttm_t * ttm, struct mm_struct *mm);
+extern int drm_ttm_ioctl(drm_file_t *priv, int num_requests, 
+			 drm_ttm_arg_t __user *data);
 
 #define DRM_MASK_VAL(dest, mask, val)			\
   (dest) = ((dest) & ~(mask)) | ((val) & (mask));
-- 
cgit v1.2.3


From c488e25ceb421c6f84f110d786d9814ac4dba1b2 Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Fri, 25 Aug 2006 20:03:39 +0200
Subject: More ioctl stubs. Buffer object locking order documentation.

---
 linux-core/drm_ttm.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'linux-core/drm_ttm.h')

diff --git a/linux-core/drm_ttm.h b/linux-core/drm_ttm.h
index 81006c3c..5a7569ff 100644
--- a/linux-core/drm_ttm.h
+++ b/linux-core/drm_ttm.h
@@ -148,8 +148,7 @@ extern int drm_destroy_ttm(drm_ttm_t * ttm);
 extern void drm_user_destroy_region(drm_ttm_backend_list_t * entry);
 extern int drm_ttm_add_mm_to_list(drm_ttm_t * ttm, struct mm_struct *mm);
 extern void drm_ttm_delete_mm(drm_ttm_t * ttm, struct mm_struct *mm);
-extern int drm_ttm_ioctl(drm_file_t *priv, int num_requests, 
-			 drm_ttm_arg_t __user *data);
+extern int drm_ttm_ioctl(drm_file_t *priv, drm_ttm_arg_t __user *data);
 
 #define DRM_MASK_VAL(dest, mask, val)			\
   (dest) = ((dest) & ~(mask)) | ((val) & (mask));
-- 
cgit v1.2.3


From 65e7274008446d2059b7fd7cd6d7b1d6b04da0ce Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Sun, 27 Aug 2006 19:03:20 +0200
Subject: ttm create / destroy / ref / unref ioctl.

---
 linux-core/drm_ttm.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'linux-core/drm_ttm.h')

diff --git a/linux-core/drm_ttm.h b/linux-core/drm_ttm.h
index 5a7569ff..bad21c97 100644
--- a/linux-core/drm_ttm.h
+++ b/linux-core/drm_ttm.h
@@ -101,7 +101,15 @@ typedef struct drm_ttm {
         int destroy;
 } drm_ttm_t;
 
-int drm_add_ttm(struct drm_device * dev, unsigned size, drm_map_list_t ** maplist);
+typedef struct drm_ttm_object {
+	drm_user_object_t base;
+	atomic_t usage;
+	uint32_t flags;
+	drm_map_list_t map_list;
+} drm_ttm_object_t;
+	
+	
+
 
 /*
  * Bind a part of the ttm starting at page_offset size n_pages into the GTT, at
-- 
cgit v1.2.3


From b4b7b997605f88f3ffdcb0cc7cd1271e0cb24073 Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Sun, 27 Aug 2006 21:16:13 +0200
Subject: Remove the ioctl multiplexing, and instead allow for generic drm
 ioctls 0x80 - 0xFF.

---
 linux-core/drm_ttm.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linux-core/drm_ttm.h')

diff --git a/linux-core/drm_ttm.h b/linux-core/drm_ttm.h
index bad21c97..6ebb1aa2 100644
--- a/linux-core/drm_ttm.h
+++ b/linux-core/drm_ttm.h
@@ -156,7 +156,7 @@ extern int drm_destroy_ttm(drm_ttm_t * ttm);
 extern void drm_user_destroy_region(drm_ttm_backend_list_t * entry);
 extern int drm_ttm_add_mm_to_list(drm_ttm_t * ttm, struct mm_struct *mm);
 extern void drm_ttm_delete_mm(drm_ttm_t * ttm, struct mm_struct *mm);
-extern int drm_ttm_ioctl(drm_file_t *priv, drm_ttm_arg_t __user *data);
+extern int drm_ttm_ioctl(DRM_IOCTL_ARGS);
 
 #define DRM_MASK_VAL(dest, mask, val)			\
   (dest) = ((dest) & ~(mask)) | ((val) & (mask));
-- 
cgit v1.2.3


From 0d67356de4e0c9e0d068ea9c16cf33df4fd13776 Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Mon, 28 Aug 2006 16:36:37 +0200
Subject: Proper TTM dereferencing Initial buffer object creation.

---
 linux-core/drm_ttm.h | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'linux-core/drm_ttm.h')

diff --git a/linux-core/drm_ttm.h b/linux-core/drm_ttm.h
index 6ebb1aa2..a87cf53e 100644
--- a/linux-core/drm_ttm.h
+++ b/linux-core/drm_ttm.h
@@ -108,6 +108,13 @@ typedef struct drm_ttm_object {
 	drm_map_list_t map_list;
 } drm_ttm_object_t;
 	
+extern int drm_ttm_object_create(struct drm_device *dev, unsigned long size, 
+				 uint32_t flags, drm_ttm_object_t **ttm_object);
+extern void drm_ttm_object_deref_locked(struct drm_device *dev, drm_ttm_object_t *to);
+extern drm_ttm_object_t *drm_lookup_ttm_object(drm_file_t *priv, uint32_t handle, 
+					       int check_owner);
+
+
 	
 
 
-- 
cgit v1.2.3


From 279e8d26c6cf7347aa9cb6d50d025a41dff9a5be Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Tue, 29 Aug 2006 10:45:34 +0200
Subject: =?UTF-8?q?64-bit=20IOCTL=20integer=20(Michel=20D=E4nzer=20&=20Bri?=
 =?UTF-8?q?an=20Paul)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 linux-core/drm_ttm.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'linux-core/drm_ttm.h')

diff --git a/linux-core/drm_ttm.h b/linux-core/drm_ttm.h
index a87cf53e..ba4261bf 100644
--- a/linux-core/drm_ttm.h
+++ b/linux-core/drm_ttm.h
@@ -165,6 +165,11 @@ extern int drm_ttm_add_mm_to_list(drm_ttm_t * ttm, struct mm_struct *mm);
 extern void drm_ttm_delete_mm(drm_ttm_t * ttm, struct mm_struct *mm);
 extern int drm_ttm_ioctl(DRM_IOCTL_ARGS);
 
+static __inline__ drm_ttm_t *drm_ttm_from_object(drm_ttm_object_t *to)
+{
+	return (drm_ttm_t *) to->map_list.map->offset;
+}
+
 #define DRM_MASK_VAL(dest, mask, val)			\
   (dest) = ((dest) & ~(mask)) | ((val) & (mask));
 
-- 
cgit v1.2.3


From 0dedfc2cd03f50b435476e56637b333d345fddbd Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Tue, 29 Aug 2006 14:52:02 +0200
Subject: Checkpoint ttm addition to buffer objects.

---
 linux-core/drm_ttm.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'linux-core/drm_ttm.h')

diff --git a/linux-core/drm_ttm.h b/linux-core/drm_ttm.h
index ba4261bf..a1810509 100644
--- a/linux-core/drm_ttm.h
+++ b/linux-core/drm_ttm.h
@@ -111,6 +111,7 @@ typedef struct drm_ttm_object {
 extern int drm_ttm_object_create(struct drm_device *dev, unsigned long size, 
 				 uint32_t flags, drm_ttm_object_t **ttm_object);
 extern void drm_ttm_object_deref_locked(struct drm_device *dev, drm_ttm_object_t *to);
+extern void drm_ttm_object_deref_unlocked(struct drm_device *dev, drm_ttm_object_t *to);
 extern drm_ttm_object_t *drm_lookup_ttm_object(drm_file_t *priv, uint32_t handle, 
 					       int check_owner);
 
-- 
cgit v1.2.3


From 033bda07e9a4eab5058fb919b375deb57b08b5be Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Wed, 30 Aug 2006 09:57:35 +0200
Subject: Buffer object reply fill in. Lindent of drm_bo.c drm_ttm.c

---
 linux-core/drm_ttm.h | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'linux-core/drm_ttm.h')

diff --git a/linux-core/drm_ttm.h b/linux-core/drm_ttm.h
index a1810509..d647578c 100644
--- a/linux-core/drm_ttm.h
+++ b/linux-core/drm_ttm.h
@@ -98,7 +98,7 @@ typedef struct drm_ttm {
 	drm_ttm_backend_list_t *be_list;
 	atomic_t vma_count;
 	int mmap_sem_locked;
-        int destroy;
+	int destroy;
 } drm_ttm_t;
 
 typedef struct drm_ttm_object {
@@ -107,17 +107,17 @@ typedef struct drm_ttm_object {
 	uint32_t flags;
 	drm_map_list_t map_list;
 } drm_ttm_object_t;
-	
-extern int drm_ttm_object_create(struct drm_device *dev, unsigned long size, 
-				 uint32_t flags, drm_ttm_object_t **ttm_object);
-extern void drm_ttm_object_deref_locked(struct drm_device *dev, drm_ttm_object_t *to);
-extern void drm_ttm_object_deref_unlocked(struct drm_device *dev, drm_ttm_object_t *to);
-extern drm_ttm_object_t *drm_lookup_ttm_object(drm_file_t *priv, uint32_t handle, 
-					       int check_owner);
-
-
-	
 
+extern int drm_ttm_object_create(struct drm_device *dev, unsigned long size,
+				 uint32_t flags,
+				 drm_ttm_object_t ** ttm_object);
+extern void drm_ttm_object_deref_locked(struct drm_device *dev,
+					drm_ttm_object_t * to);
+extern void drm_ttm_object_deref_unlocked(struct drm_device *dev,
+					  drm_ttm_object_t * to);
+extern drm_ttm_object_t *drm_lookup_ttm_object(drm_file_t * priv,
+					       uint32_t handle,
+					       int check_owner);
 
 /*
  * Bind a part of the ttm starting at page_offset size n_pages into the GTT, at
@@ -166,7 +166,7 @@ extern int drm_ttm_add_mm_to_list(drm_ttm_t * ttm, struct mm_struct *mm);
 extern void drm_ttm_delete_mm(drm_ttm_t * ttm, struct mm_struct *mm);
 extern int drm_ttm_ioctl(DRM_IOCTL_ARGS);
 
-static __inline__ drm_ttm_t *drm_ttm_from_object(drm_ttm_object_t *to)
+static __inline__ drm_ttm_t *drm_ttm_from_object(drm_ttm_object_t * to)
 {
 	return (drm_ttm_t *) to->map_list.map->offset;
 }
-- 
cgit v1.2.3


From 99acb7936660843090ea8a9f22d2d50d9433e0de Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Fri, 8 Sep 2006 17:24:38 +0200
Subject: Various bugfixes.

---
 linux-core/drm_ttm.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'linux-core/drm_ttm.h')

diff --git a/linux-core/drm_ttm.h b/linux-core/drm_ttm.h
index d647578c..5c65e747 100644
--- a/linux-core/drm_ttm.h
+++ b/linux-core/drm_ttm.h
@@ -70,6 +70,7 @@ typedef struct drm_ttm_backend_list {
 	drm_file_t *anon_owner;
 	struct page **anon_pages;
 	int anon_locked;
+        int pages_vmalloc;
 	enum {
 		ttm_bound,
 		ttm_evicted,
@@ -99,6 +100,8 @@ typedef struct drm_ttm {
 	atomic_t vma_count;
 	int mmap_sem_locked;
 	int destroy;
+        int pages_vmalloc;
+        int pf_vmalloc;
 } drm_ttm_t;
 
 typedef struct drm_ttm_object {
-- 
cgit v1.2.3


From 7223b4e264a64df2df70715d8777f2ccaa883d5e Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Thu, 14 Sep 2006 16:42:00 +0200
Subject: Simplify ttm alloc and free.

---
 linux-core/drm_ttm.h | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'linux-core/drm_ttm.h')

diff --git a/linux-core/drm_ttm.h b/linux-core/drm_ttm.h
index 5c65e747..d647578c 100644
--- a/linux-core/drm_ttm.h
+++ b/linux-core/drm_ttm.h
@@ -70,7 +70,6 @@ typedef struct drm_ttm_backend_list {
 	drm_file_t *anon_owner;
 	struct page **anon_pages;
 	int anon_locked;
-        int pages_vmalloc;
 	enum {
 		ttm_bound,
 		ttm_evicted,
@@ -100,8 +99,6 @@ typedef struct drm_ttm {
 	atomic_t vma_count;
 	int mmap_sem_locked;
 	int destroy;
-        int pages_vmalloc;
-        int pf_vmalloc;
 } drm_ttm_t;
 
 typedef struct drm_ttm_object {
-- 
cgit v1.2.3


From 711f077b7423c1a436d703885c6d18a2ad2940aa Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Tue, 26 Sep 2006 14:36:53 +0200
Subject: Allow for a driver to overload the ttm backend object methods.

---
 linux-core/drm_ttm.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'linux-core/drm_ttm.h')

diff --git a/linux-core/drm_ttm.h b/linux-core/drm_ttm.h
index d647578c..d65b17de 100644
--- a/linux-core/drm_ttm.h
+++ b/linux-core/drm_ttm.h
@@ -47,6 +47,7 @@
 typedef struct drm_ttm_backend {
 	unsigned long aperture_base;
 	void *private;
+	int needs_free;
 	int (*needs_cache_adjust) (struct drm_ttm_backend * backend);
 	int (*populate) (struct drm_ttm_backend * backend,
 			 unsigned long num_pages, struct page ** pages);
-- 
cgit v1.2.3


From cee659afb56e7ac443402ac791144f391721061e Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Tue, 3 Oct 2006 12:08:07 +0200
Subject: Get rid of all ugly PTE hacks.

---
 linux-core/drm_ttm.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'linux-core/drm_ttm.h')

diff --git a/linux-core/drm_ttm.h b/linux-core/drm_ttm.h
index d65b17de..53afe792 100644
--- a/linux-core/drm_ttm.h
+++ b/linux-core/drm_ttm.h
@@ -100,6 +100,7 @@ typedef struct drm_ttm {
 	atomic_t vma_count;
 	int mmap_sem_locked;
 	int destroy;
+        uint32_t mapping_offset;
 } drm_ttm_t;
 
 typedef struct drm_ttm_object {
-- 
cgit v1.2.3


From c58574c60505a699e19e1ed59e1b441be2594e53 Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Tue, 10 Oct 2006 10:37:26 +0200
Subject: Use a nopage-based approach to fault in pfns.

---
 linux-core/drm_ttm.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'linux-core/drm_ttm.h')

diff --git a/linux-core/drm_ttm.h b/linux-core/drm_ttm.h
index 53afe792..fcac06b5 100644
--- a/linux-core/drm_ttm.h
+++ b/linux-core/drm_ttm.h
@@ -164,8 +164,6 @@ int drm_rebind_ttm_region(drm_ttm_backend_list_t * entry,
 
 extern int drm_destroy_ttm(drm_ttm_t * ttm);
 extern void drm_user_destroy_region(drm_ttm_backend_list_t * entry);
-extern int drm_ttm_add_mm_to_list(drm_ttm_t * ttm, struct mm_struct *mm);
-extern void drm_ttm_delete_mm(drm_ttm_t * ttm, struct mm_struct *mm);
 extern int drm_ttm_ioctl(DRM_IOCTL_ARGS);
 
 static __inline__ drm_ttm_t *drm_ttm_from_object(drm_ttm_object_t * to)
-- 
cgit v1.2.3


From f2db76e2f206d2017f710eaddc4b33add4498898 Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Wed, 11 Oct 2006 13:40:35 +0200
Subject: Big update: Adapt for new functions in the 2.6.19 kernel. Remove the
 ability to have multiple regions in one TTM.    This simplifies a lot of
 code. Remove the ability to access TTMs from user space.    We don't need it
 anymore without ttm regions. Don't change caching policy for evicted buffers.
 Instead change it only    when the buffer is accessed by the CPU (on the
 first page fault).    This tremendously speeds up eviction rates. Current
 code is safe for kernels <= 2.6.14. Should also be OK with 2.6.19 and above.

---
 linux-core/drm_ttm.h | 84 ++++++++++------------------------------------------
 1 file changed, 16 insertions(+), 68 deletions(-)

(limited to 'linux-core/drm_ttm.h')

diff --git a/linux-core/drm_ttm.h b/linux-core/drm_ttm.h
index fcac06b5..19c1df51 100644
--- a/linux-core/drm_ttm.h
+++ b/linux-core/drm_ttm.h
@@ -48,6 +48,7 @@ typedef struct drm_ttm_backend {
 	unsigned long aperture_base;
 	void *private;
 	int needs_free;
+        uint32_t drm_map_type;
 	int (*needs_cache_adjust) (struct drm_ttm_backend * backend);
 	int (*populate) (struct drm_ttm_backend * backend,
 			 unsigned long num_pages, struct page ** pages);
@@ -57,61 +58,32 @@ typedef struct drm_ttm_backend {
 	void (*destroy) (struct drm_ttm_backend * backend);
 } drm_ttm_backend_t;
 
-#define DRM_FLUSH_READ  (0x01)
-#define DRM_FLUSH_WRITE (0x02)
-#define DRM_FLUSH_EXE   (0x04)
-
-typedef struct drm_ttm_backend_list {
-	uint32_t flags;
-	struct list_head head;
-	drm_ttm_backend_t *be;
-	unsigned page_offset;
-	unsigned num_pages;
-	struct drm_ttm *owner;
-	drm_file_t *anon_owner;
-	struct page **anon_pages;
-	int anon_locked;
-	enum {
-		ttm_bound,
-		ttm_evicted,
-		ttm_unbound
-	} state;
-} drm_ttm_backend_list_t;
-
-typedef struct drm_ttm_vma_list {
-	struct list_head head;
-	pgprot_t orig_protection;
-	struct vm_area_struct *vma;
-	drm_map_t *map;
-} drm_ttm_vma_list_t;
-
 typedef struct drm_ttm {
-	struct list_head p_mm_list;
-	atomic_t shared_count;
-	uint32_t mm_list_seq;
-	unsigned long aperture_base;
 	struct page **pages;
-	uint32_t *page_flags;
-	unsigned long lhandle;
+	uint32_t page_flags;
 	unsigned long num_pages;
-	drm_ttm_vma_list_t *vma_list;
+	unsigned long aper_offset;
+        atomic_t vma_count;
 	struct drm_device *dev;
-	drm_ttm_backend_list_t *be_list;
-	atomic_t vma_count;
-	int mmap_sem_locked;
 	int destroy;
         uint32_t mapping_offset;
+        drm_ttm_backend_t *be;
+	enum {
+		ttm_bound,
+		ttm_evicted,
+		ttm_unbound,
+		ttm_unpopulated,
+	} state;
 } drm_ttm_t;
 
 typedef struct drm_ttm_object {
-	drm_user_object_t base;
 	atomic_t usage;
 	uint32_t flags;
 	drm_map_list_t map_list;
 } drm_ttm_object_t;
 
 extern int drm_ttm_object_create(struct drm_device *dev, unsigned long size,
-				 uint32_t flags,
+				 uint32_t flags, int cached,
 				 drm_ttm_object_t ** ttm_object);
 extern void drm_ttm_object_deref_locked(struct drm_device *dev,
 					drm_ttm_object_t * to);
@@ -120,41 +92,18 @@ extern void drm_ttm_object_deref_unlocked(struct drm_device *dev,
 extern drm_ttm_object_t *drm_lookup_ttm_object(drm_file_t * priv,
 					       uint32_t handle,
 					       int check_owner);
-
-/*
- * Bind a part of the ttm starting at page_offset size n_pages into the GTT, at
- * aperture offset aper_offset. The region handle will be used to reference this
- * bound region in the future. Note that the region may be the whole ttm. 
- * Regions should not overlap.
- * This function sets all affected pages as noncacheable and flushes cashes and TLB.
- */
-
-int drm_create_ttm_region(drm_ttm_t * ttm, unsigned long page_offset,
-			  unsigned long n_pages, int cached,
-			  drm_ttm_backend_list_t ** region);
-
-int drm_bind_ttm_region(drm_ttm_backend_list_t * region,
+extern int drm_bind_ttm(drm_ttm_t * ttm,
 			unsigned long aper_offset);
 
-/*
- * Unbind a ttm region. Restores caching policy. Flushes caches and TLB.
- */
-
-void drm_unbind_ttm_region(drm_ttm_backend_list_t * entry);
-void drm_destroy_ttm_region(drm_ttm_backend_list_t * entry);
+extern void drm_unbind_ttm(drm_ttm_t * ttm);
 
 /*
  * Evict a ttm region. Keeps Aperture caching policy.
  */
 
-int drm_evict_ttm_region(drm_ttm_backend_list_t * entry);
-
-/*
- * Rebind an already evicted region into a possibly new location in the aperture.
- */
+extern int drm_evict_ttm(drm_ttm_t * ttm);
+extern void drm_fixup_ttm_caching(drm_ttm_t *ttm);
 
-int drm_rebind_ttm_region(drm_ttm_backend_list_t * entry,
-			  unsigned long aper_offset);
 
 /*
  * Destroy a ttm. The user normally calls drmRmMap or a similar IOCTL to do this, 
@@ -163,7 +112,6 @@ int drm_rebind_ttm_region(drm_ttm_backend_list_t * entry,
  */
 
 extern int drm_destroy_ttm(drm_ttm_t * ttm);
-extern void drm_user_destroy_region(drm_ttm_backend_list_t * entry);
 extern int drm_ttm_ioctl(DRM_IOCTL_ARGS);
 
 static __inline__ drm_ttm_t *drm_ttm_from_object(drm_ttm_object_t * to)
-- 
cgit v1.2.3


From 30703893674b3da5b862dee2acd6efca13424398 Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Wed, 11 Oct 2006 22:21:01 +0200
Subject: Compatibility code for 2.6.15-2.6.18. It is ugly but a little comfort
 is that it will go away in the mainstream kernel. Some bugfixes, mainly in
 error paths.

---
 linux-core/drm_ttm.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'linux-core/drm_ttm.h')

diff --git a/linux-core/drm_ttm.h b/linux-core/drm_ttm.h
index 19c1df51..5421c52a 100644
--- a/linux-core/drm_ttm.h
+++ b/linux-core/drm_ttm.h
@@ -74,6 +74,11 @@ typedef struct drm_ttm {
 		ttm_unbound,
 		ttm_unpopulated,
 	} state;
+#ifdef DRM_ODD_MM_COMPAT
+       struct list_head vma_list;
+       struct list_head p_mm_list;
+#endif
+
 } drm_ttm_t;
 
 typedef struct drm_ttm_object {
@@ -95,7 +100,7 @@ extern drm_ttm_object_t *drm_lookup_ttm_object(drm_file_t * priv,
 extern int drm_bind_ttm(drm_ttm_t * ttm,
 			unsigned long aper_offset);
 
-extern void drm_unbind_ttm(drm_ttm_t * ttm);
+extern int drm_unbind_ttm(drm_ttm_t * ttm);
 
 /*
  * Evict a ttm region. Keeps Aperture caching policy.
-- 
cgit v1.2.3


From 10150df02b7062b9975661ccd82b475cd23c8839 Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Thu, 12 Oct 2006 12:09:16 +0200
Subject: Simplify the AGP backend interface somewhat.

Fix buffer bound caching policy changing, Allow
on-the-fly changing of caching policy on bound buffers if the hardware
supports it.

Allow drivers to use driver-specific AGP memory types for TTM AGP pages.
Will make AGP drivers much easier to migrate.
---
 linux-core/drm_ttm.h | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'linux-core/drm_ttm.h')

diff --git a/linux-core/drm_ttm.h b/linux-core/drm_ttm.h
index 5421c52a..e5501d9c 100644
--- a/linux-core/drm_ttm.h
+++ b/linux-core/drm_ttm.h
@@ -44,16 +44,21 @@
  * Most device drivers will let this point to the standard AGP implementation.
  */
 
+#define DRM_BE_FLAG_NEEDS_FREE     0x00000001
+#define DRM_BE_FLAG_BOUND_CACHED   0x00000002
+#define DRM_BE_FLAG_CBA            0x00000004
+
 typedef struct drm_ttm_backend {
 	unsigned long aperture_base;
 	void *private;
-	int needs_free;
+	uint32_t flags;
         uint32_t drm_map_type;
-	int (*needs_cache_adjust) (struct drm_ttm_backend * backend);
+	int (*needs_ub_cache_adjust) (struct drm_ttm_backend * backend);
 	int (*populate) (struct drm_ttm_backend * backend,
 			 unsigned long num_pages, struct page ** pages);
 	void (*clear) (struct drm_ttm_backend * backend);
-	int (*bind) (struct drm_ttm_backend * backend, unsigned long offset);
+	int (*bind) (struct drm_ttm_backend * backend, 
+		     unsigned long offset, int cached);
 	int (*unbind) (struct drm_ttm_backend * backend);
 	void (*destroy) (struct drm_ttm_backend * backend);
 } drm_ttm_backend_t;
@@ -88,7 +93,7 @@ typedef struct drm_ttm_object {
 } drm_ttm_object_t;
 
 extern int drm_ttm_object_create(struct drm_device *dev, unsigned long size,
-				 uint32_t flags, int cached,
+				 uint32_t flags, 
 				 drm_ttm_object_t ** ttm_object);
 extern void drm_ttm_object_deref_locked(struct drm_device *dev,
 					drm_ttm_object_t * to);
@@ -97,7 +102,7 @@ extern void drm_ttm_object_deref_unlocked(struct drm_device *dev,
 extern drm_ttm_object_t *drm_lookup_ttm_object(drm_file_t * priv,
 					       uint32_t handle,
 					       int check_owner);
-extern int drm_bind_ttm(drm_ttm_t * ttm,
+extern int drm_bind_ttm(drm_ttm_t * ttm, int cached,
 			unsigned long aper_offset);
 
 extern int drm_unbind_ttm(drm_ttm_t * ttm);
-- 
cgit v1.2.3


From 89b944179856fadf8667587eff142129c2c6b826 Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Tue, 17 Oct 2006 19:57:06 +0200
Subject: Lindent.

---
 linux-core/drm_ttm.h | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'linux-core/drm_ttm.h')

diff --git a/linux-core/drm_ttm.h b/linux-core/drm_ttm.h
index e5501d9c..11a13754 100644
--- a/linux-core/drm_ttm.h
+++ b/linux-core/drm_ttm.h
@@ -52,12 +52,12 @@ typedef struct drm_ttm_backend {
 	unsigned long aperture_base;
 	void *private;
 	uint32_t flags;
-        uint32_t drm_map_type;
+	uint32_t drm_map_type;
 	int (*needs_ub_cache_adjust) (struct drm_ttm_backend * backend);
 	int (*populate) (struct drm_ttm_backend * backend,
 			 unsigned long num_pages, struct page ** pages);
 	void (*clear) (struct drm_ttm_backend * backend);
-	int (*bind) (struct drm_ttm_backend * backend, 
+	int (*bind) (struct drm_ttm_backend * backend,
 		     unsigned long offset, int cached);
 	int (*unbind) (struct drm_ttm_backend * backend);
 	void (*destroy) (struct drm_ttm_backend * backend);
@@ -68,11 +68,11 @@ typedef struct drm_ttm {
 	uint32_t page_flags;
 	unsigned long num_pages;
 	unsigned long aper_offset;
-        atomic_t vma_count;
+	atomic_t vma_count;
 	struct drm_device *dev;
 	int destroy;
-        uint32_t mapping_offset;
-        drm_ttm_backend_t *be;
+	uint32_t mapping_offset;
+	drm_ttm_backend_t *be;
 	enum {
 		ttm_bound,
 		ttm_evicted,
@@ -80,8 +80,8 @@ typedef struct drm_ttm {
 		ttm_unpopulated,
 	} state;
 #ifdef DRM_ODD_MM_COMPAT
-       struct list_head vma_list;
-       struct list_head p_mm_list;
+	struct list_head vma_list;
+	struct list_head p_mm_list;
 #endif
 
 } drm_ttm_t;
@@ -93,7 +93,7 @@ typedef struct drm_ttm_object {
 } drm_ttm_object_t;
 
 extern int drm_ttm_object_create(struct drm_device *dev, unsigned long size,
-				 uint32_t flags, 
+				 uint32_t flags,
 				 drm_ttm_object_t ** ttm_object);
 extern void drm_ttm_object_deref_locked(struct drm_device *dev,
 					drm_ttm_object_t * to);
@@ -102,8 +102,7 @@ extern void drm_ttm_object_deref_unlocked(struct drm_device *dev,
 extern drm_ttm_object_t *drm_lookup_ttm_object(drm_file_t * priv,
 					       uint32_t handle,
 					       int check_owner);
-extern int drm_bind_ttm(drm_ttm_t * ttm, int cached,
-			unsigned long aper_offset);
+extern int drm_bind_ttm(drm_ttm_t * ttm, int cached, unsigned long aper_offset);
 
 extern int drm_unbind_ttm(drm_ttm_t * ttm);
 
@@ -112,8 +111,7 @@ extern int drm_unbind_ttm(drm_ttm_t * ttm);
  */
 
 extern int drm_evict_ttm(drm_ttm_t * ttm);
-extern void drm_fixup_ttm_caching(drm_ttm_t *ttm);
-
+extern void drm_fixup_ttm_caching(drm_ttm_t * ttm);
 
 /*
  * Destroy a ttm. The user normally calls drmRmMap or a similar IOCTL to do this, 
-- 
cgit v1.2.3