Patched in Tegra support.

7 files changed, 219 insertions, 215 deletions

diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h
index 3cb5d848fb6..42e34698518 100644
--- a/include/drm/ttm/ttm_bo_api.h
+++ b/include/drm/ttm/ttm_bo_api.h
@@ -31,7 +31,7 @@
 #ifndef _TTM_BO_API_H_
 #define _TTM_BO_API_H_
 
-#include <drm/drm_hashtab.h>
+#include "drm_hashtab.h"
 #include <linux/kref.h>
 #include <linux/list.h>
 #include <linux/wait.h>
@@ -122,17 +122,18 @@ struct ttm_mem_reg {
  * be mmapped by user space. Each of these bos occupy a slot in the
  * device address space, that can be used for normal vm operations.
  *
+ * @ttm_bo_type_user: These are user-space memory areas that are made
+ * available to the GPU by mapping the buffer pages into the GPU aperture
+ * space. These buffers cannot be mmaped from the device address space.
+ *
  * @ttm_bo_type_kernel: These buffers are like ttm_bo_type_device buffers,
  * but they cannot be accessed from user-space. For kernel-only use.
- *
- * @ttm_bo_type_sg: Buffer made from dmabuf sg table shared with another
- * driver.
  */
 
 enum ttm_bo_type {
         ttm_bo_type_device,
-        ttm_bo_type_kernel,
-        ttm_bo_type_sg
+        ttm_bo_type_user,
+        ttm_bo_type_kernel
 };
 
 struct ttm_tt;
@@ -141,6 +142,8 @@ struct ttm_tt;
  * struct ttm_buffer_object
  *
  * @bdev: Pointer to the buffer object device structure.
+ * @buffer_start: The virtual user-space start address of ttm_bo_type_user
+ * buffers.
  * @type: The bo type.
  * @destroy: Destruction function. If NULL, kfree is used.
  * @num_pages: Actual number of pages.
@@ -170,6 +173,7 @@ struct ttm_tt;
  * @seq_valid: The value of @val_seq is valid. This value is protected by
  * the bo_device::lru_lock.
  * @reserved: Deadlock-free lock used for synchronization state transitions.
+ * @sync_obj_arg: Opaque argument to synchronization object function.
  * @sync_obj: Pointer to a synchronization object.
  * @priv_flags: Flags describing buffer object internal state.
  * @vm_rb: Rb node for the vm rb tree.
@@ -197,6 +201,7 @@ struct ttm_buffer_object {
 
         struct ttm_bo_global *glob;
         struct ttm_bo_device *bdev;
+        unsigned long buffer_start;
         enum ttm_bo_type type;
         void (*destroy) (struct ttm_buffer_object *);
         unsigned long num_pages;
@@ -251,6 +256,7 @@ struct ttm_buffer_object {
          * checking NULL while reserved but not holding the mentioned lock.
          */
 
+        void *sync_obj_arg;
         void *sync_obj;
         unsigned long priv_flags;
 
@@ -270,8 +276,6 @@ struct ttm_buffer_object {
 
         unsigned long offset;
         uint32_t cur_placement;
-
-        struct sg_table *sg;
 };
 
 /**
@@ -337,6 +341,7 @@ extern int ttm_bo_wait(struct ttm_buffer_object *bo, bool lazy,
  * @bo: The buffer object.
  * @placement: Proposed placement for the buffer object.
  * @interruptible: Sleep interruptible if sleeping.
+ * @no_wait_reserve: Return immediately if other buffers are busy.
  * @no_wait_gpu: Return immediately if the GPU is busy.
  *
  * Changes placement and caching policy of the buffer object
@@ -349,7 +354,7 @@ extern int ttm_bo_wait(struct ttm_buffer_object *bo, bool lazy,
  */
 extern int ttm_bo_validate(struct ttm_buffer_object *bo,
                                 struct ttm_placement *placement,
-                                bool interruptible,
+                                bool interruptible, bool no_wait_reserve,
                                 bool no_wait_gpu);
 
 /**
@@ -423,16 +428,15 @@ extern void ttm_bo_unlock_delayed_workqueue(struct ttm_bo_device *bdev,
  * @no_wait: Return immediately if buffer is busy.
  *
  * Synchronizes a buffer object for CPU RW access. This means
- * command submission that affects the buffer will return -EBUSY
- * until ttm_bo_synccpu_write_release is called.
- *
+ * blocking command submission that affects the buffer and
+ * waiting for buffer idle. This lock is recursive.
  * Returns
  * -EBUSY if the buffer is busy and no_wait is true.
  * -ERESTARTSYS if interrupted by a signal.
  */
+
 extern int
 ttm_bo_synccpu_write_grab(struct ttm_buffer_object *bo, bool no_wait);
-
 /**
  * ttm_bo_synccpu_write_release:
  *
@@ -443,22 +447,6 @@ ttm_bo_synccpu_write_grab(struct ttm_buffer_object *bo, bool no_wait);
 extern void ttm_bo_synccpu_write_release(struct ttm_buffer_object *bo);
 
 /**
- * ttm_bo_acc_size
- *
- * @bdev: Pointer to a ttm_bo_device struct.
- * @bo_size: size of the buffer object in byte.
- * @struct_size: size of the structure holding buffer object datas
- *
- * Returns size to account for a buffer object
- */
-size_t ttm_bo_acc_size(struct ttm_bo_device *bdev,
-                       unsigned long bo_size,
-                       unsigned struct_size);
-size_t ttm_bo_dma_acc_size(struct ttm_bo_device *bdev,
-                           unsigned long bo_size,
-                           unsigned struct_size);
-
-/**
  * ttm_bo_init
  *
  * @bdev: Pointer to a ttm_bo_device struct.
@@ -467,6 +455,8 @@ size_t ttm_bo_dma_acc_size(struct ttm_bo_device *bdev,
  * @type: Requested type of buffer object.
  * @flags: Initial placement flags.
  * @page_alignment: Data alignment in pages.
+ * @buffer_start: Virtual address of user space data backing a
+ * user buffer object.
  * @interruptible: If needing to sleep to wait for GPU resources,
  * sleep interruptible.
  * @persistent_swap_storage: Usually the swap storage is deleted for buffers
@@ -498,12 +488,11 @@ extern int ttm_bo_init(struct ttm_bo_device *bdev,
                         enum ttm_bo_type type,
                         struct ttm_placement *placement,
                         uint32_t page_alignment,
+                        unsigned long buffer_start,
                         bool interrubtible,
                         struct file *persistent_swap_storage,
                         size_t acc_size,
-                        struct sg_table *sg,
                         void (*destroy) (struct ttm_buffer_object *));
-
 /**
  * ttm_bo_synccpu_object_init
  *
@@ -513,6 +502,8 @@ extern int ttm_bo_init(struct ttm_bo_device *bdev,
  * @type: Requested type of buffer object.
  * @flags: Initial placement flags.
  * @page_alignment: Data alignment in pages.
+ * @buffer_start: Virtual address of user space data backing a
+ * user buffer object.
  * @interruptible: If needing to sleep while waiting for GPU resources,
  * sleep interruptible.
  * @persistent_swap_storage: Usually the swap storage is deleted for buffers
@@ -535,6 +526,7 @@ extern int ttm_bo_create(struct ttm_bo_device *bdev,
                                 enum ttm_bo_type type,
                                 struct ttm_placement *placement,
                                 uint32_t page_alignment,
+                                unsigned long buffer_start,
                                 bool interruptible,
                                 struct file *persistent_swap_storage,
                                 struct ttm_buffer_object **p_bo);
@@ -725,18 +717,4 @@ extern ssize_t ttm_bo_io(struct ttm_bo_device *bdev, struct file *filp,
 
 extern void ttm_bo_swapout_all(struct ttm_bo_device *bdev);
 
-/**
- * ttm_bo_is_reserved - return an indication if a ttm buffer object is reserved
- *
- * @bo:     The buffer object to check.
- *
- * This function returns an indication if a bo is reserved or not, and should
- * only be used to print an error when it is not from incorrect api usage, since
- * there's no guarantee that it is the caller that is holding the reservation.
- */
-static inline bool ttm_bo_is_reserved(struct ttm_buffer_object *bo)
-{
-        return atomic_read(&bo->reserved);
-}
-
 #endif
diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
index e3a43a47d78..94eb1434316 100644
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
@@ -30,20 +30,49 @@
 #ifndef _TTM_BO_DRIVER_H_
 #define _TTM_BO_DRIVER_H_
 
-#include <ttm/ttm_bo_api.h>
-#include <ttm/ttm_memory.h>
-#include <ttm/ttm_module.h>
-#include <drm/drm_mm.h>
-#include <drm/drm_global.h>
-#include <linux/workqueue.h>
-#include <linux/fs.h>
-#include <linux/spinlock.h>
+#include "ttm/ttm_bo_api.h"
+#include "ttm/ttm_memory.h"
+#include "ttm/ttm_module.h"
+#include "drm_mm.h"
+#include "drm_global.h"
+#include "linux/workqueue.h"
+#include "linux/fs.h"
+#include "linux/spinlock.h"
+
+struct ttm_backend;
 
 struct ttm_backend_func {
         /**
+         * struct ttm_backend_func member populate
+         *
+         * @backend: Pointer to a struct ttm_backend.
+         * @num_pages: Number of pages to populate.
+         * @pages: Array of pointers to ttm pages.
+         * @dummy_read_page: Page to be used instead of NULL pages in the
+         * array @pages.
+         * @dma_addrs: Array of DMA (bus) address of the ttm pages.
+         *
+         * Populate the backend with ttm pages. Depending on the backend,
+         * it may or may not copy the @pages array.
+         */
+        int (*populate) (struct ttm_backend *backend,
+                         unsigned long num_pages, struct page **pages,
+                         struct page *dummy_read_page,
+                         dma_addr_t *dma_addrs);
+        /**
+         * struct ttm_backend_func member clear
+         *
+         * @backend: Pointer to a struct ttm_backend.
+         *
+         * This is an "unpopulate" function. Release all resources
+         * allocated with populate.
+         */
+        void (*clear) (struct ttm_backend *backend);
+
+        /**
          * struct ttm_backend_func member bind
          *
-         * @ttm: Pointer to a struct ttm_tt.
+         * @backend: Pointer to a struct ttm_backend.
          * @bo_mem: Pointer to a struct ttm_mem_reg describing the
          * memory type and location for binding.
          *
@@ -51,35 +80,51 @@ struct ttm_backend_func {
          * indicated by @bo_mem. This function should be able to handle
          * differences between aperture and system page sizes.
          */
-        int (*bind) (struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem);
+        int (*bind) (struct ttm_backend *backend, struct ttm_mem_reg *bo_mem);
 
         /**
          * struct ttm_backend_func member unbind
          *
-         * @ttm: Pointer to a struct ttm_tt.
+         * @backend: Pointer to a struct ttm_backend.
          *
          * Unbind previously bound backend pages. This function should be
          * able to handle differences between aperture and system page sizes.
          */
-        int (*unbind) (struct ttm_tt *ttm);
+        int (*unbind) (struct ttm_backend *backend);
 
         /**
          * struct ttm_backend_func member destroy
          *
-         * @ttm: Pointer to a struct ttm_tt.
+         * @backend: Pointer to a struct ttm_backend.
          *
-         * Destroy the backend. This will be call back from ttm_tt_destroy so
-         * don't call ttm_tt_destroy from the callback or infinite loop.
+         * Destroy the backend.
          */
-        void (*destroy) (struct ttm_tt *ttm);
+        void (*destroy) (struct ttm_backend *backend);
 };
 
+/**
+ * struct ttm_backend
+ *
+ * @bdev: Pointer to a struct ttm_bo_device.
+ * @flags: For driver use.
+ * @func: Pointer to a struct ttm_backend_func that describes
+ * the backend methods.
+ *
+ */
+
+struct ttm_backend {
+        struct ttm_bo_device *bdev;
+        uint32_t flags;
+        struct ttm_backend_func *func;
+};
+
+#define TTM_PAGE_FLAG_USER            (1 << 1)
+#define TTM_PAGE_FLAG_USER_DIRTY      (1 << 2)
 #define TTM_PAGE_FLAG_WRITE           (1 << 3)
 #define TTM_PAGE_FLAG_SWAPPED         (1 << 4)
 #define TTM_PAGE_FLAG_PERSISTENT_SWAP (1 << 5)
 #define TTM_PAGE_FLAG_ZERO_ALLOC      (1 << 6)
 #define TTM_PAGE_FLAG_DMA32           (1 << 7)
-#define TTM_PAGE_FLAG_SG              (1 << 8)
 
 enum ttm_caching_state {
         tt_uncached,
@@ -90,18 +135,23 @@ enum ttm_caching_state {
 /**
  * struct ttm_tt
  *
- * @bdev: Pointer to a struct ttm_bo_device.
- * @func: Pointer to a struct ttm_backend_func that describes
- * the backend methods.
  * @dummy_read_page: Page to map where the ttm_tt page array contains a NULL
  * pointer.
  * @pages: Array of pages backing the data.
+ * @first_himem_page: Himem pages are put last in the page array, which
+ * enables us to run caching attribute changes on only the first part
+ * of the page array containing lomem pages. This is the index of the
+ * first himem page.
+ * @last_lomem_page: Index of the last lomem page in the page array.
  * @num_pages: Number of pages in the page array.
  * @bdev: Pointer to the current struct ttm_bo_device.
  * @be: Pointer to the ttm backend.
+ * @tsk: The task for user ttm.
+ * @start: virtual address for user ttm.
  * @swap_storage: Pointer to shmem struct file for swap storage.
  * @caching_state: The current caching state of the pages.
  * @state: The current binding state of the pages.
+ * @dma_address: The DMA (bus) addresses of the pages (if TTM_PAGE_FLAG_DMA32)
  *
  * This is a structure holding the pages, caching- and aperture binding
  * status for a buffer object that isn't backed by fixed (VRAM / AGP)
@@ -109,14 +159,16 @@ enum ttm_caching_state {
  */
 
 struct ttm_tt {
-        struct ttm_bo_device *bdev;
-        struct ttm_backend_func *func;
         struct page *dummy_read_page;
         struct page **pages;
+        long first_himem_page;
+        long last_lomem_page;
         uint32_t page_flags;
         unsigned long num_pages;
-        struct sg_table *sg; /* for SG objects via dma-buf */
         struct ttm_bo_global *glob;
+        struct ttm_backend *be;
+        struct task_struct *tsk;
+        unsigned long start;
         struct file *swap_storage;
         enum ttm_caching_state caching_state;
         enum {
@@ -124,23 +176,7 @@ struct ttm_tt {
                 tt_unbound,
                 tt_unpopulated,
         } state;
-};
-
-/**
- * struct ttm_dma_tt
- *
- * @ttm: Base ttm_tt struct.
- * @dma_address: The DMA (bus) addresses of the pages
- * @pages_list: used by some page allocation backend
- *
- * This is a structure holding the pages, caching- and aperture binding
- * status for a buffer object that isn't backed by fixed (VRAM / AGP)
- * memory.
- */
-struct ttm_dma_tt {
-        struct ttm_tt ttm;
         dma_addr_t *dma_address;
-        struct list_head pages_list;
 };
 
 #define TTM_MEMTYPE_FLAG_FIXED         (1 << 0) /* Fixed (on-card) PCI memory */
@@ -315,42 +351,15 @@ struct ttm_mem_type_manager {
 
 struct ttm_bo_driver {
         /**
-         * ttm_tt_create
+         * struct ttm_bo_driver member create_ttm_backend_entry
          *
-         * @bdev: pointer to a struct ttm_bo_device:
-         * @size: Size of the data needed backing.
-         * @page_flags: Page flags as identified by TTM_PAGE_FLAG_XX flags.
-         * @dummy_read_page: See struct ttm_bo_device.
+         * @bdev: The buffer object device.
          *
-         * Create a struct ttm_tt to back data with system memory pages.
-         * No pages are actually allocated.
-         * Returns:
-         * NULL: Out of memory.
+         * Create a driver specific struct ttm_backend.
          */
-        struct ttm_tt *(*ttm_tt_create)(struct ttm_bo_device *bdev,
-                                        unsigned long size,
-                                        uint32_t page_flags,
-                                        struct page *dummy_read_page);
 
-        /**
-         * ttm_tt_populate
-         *
-         * @ttm: The struct ttm_tt to contain the backing pages.
-         *
-         * Allocate all backing pages
-         * Returns:
-         * -ENOMEM: Out of memory.
-         */
-        int (*ttm_tt_populate)(struct ttm_tt *ttm);
-
-        /**
-         * ttm_tt_unpopulate
-         *
-         * @ttm: The struct ttm_tt to contain the backing pages.
-         *
-         * Free all backing page
-         */
-        void (*ttm_tt_unpopulate)(struct ttm_tt *ttm);
+        struct ttm_backend *(*create_ttm_backend_entry)
+         (struct ttm_bo_device *bdev);
 
         /**
          * struct ttm_bo_driver member invalidate_caches
@@ -394,7 +403,7 @@ struct ttm_bo_driver {
          */
         int (*move) (struct ttm_buffer_object *bo,
                      bool evict, bool interruptible,
-                     bool no_wait_gpu,
+                     bool no_wait_reserve, bool no_wait_gpu,
                      struct ttm_mem_reg *new_mem);
 
         /**
@@ -422,10 +431,10 @@ struct ttm_bo_driver {
          * documentation.
          */
 
-        bool (*sync_obj_signaled) (void *sync_obj);
-        int (*sync_obj_wait) (void *sync_obj,
+        bool (*sync_obj_signaled) (void *sync_obj, void *sync_arg);
+        int (*sync_obj_wait) (void *sync_obj, void *sync_arg,
                               bool lazy, bool interruptible);
-        int (*sync_obj_flush) (void *sync_obj);
+        int (*sync_obj_flush) (void *sync_obj, void *sync_arg);
         void (*sync_obj_unref) (void **sync_obj);
         void *(*sync_obj_ref) (void *sync_obj);
 
@@ -468,6 +477,9 @@ struct ttm_bo_global_ref {
  * @dummy_read_page: Pointer to a dummy page used for mapping requests
  * of unpopulated pages.
  * @shrink: A shrink callback object used for buffer object swap.
+ * @ttm_bo_extra_size: Extra size (sizeof(struct ttm_buffer_object) excluded)
+ * used by a buffer object. This is excluding page arrays and backing pages.
+ * @ttm_bo_size: This is @ttm_bo_extra_size + sizeof(struct ttm_buffer_object).
  * @device_list_mutex: Mutex protecting the device list.
  * This mutex is held while traversing the device list for pm options.
  * @lru_lock: Spinlock protecting the bo subsystem lru lists.
@@ -485,6 +497,8 @@ struct ttm_bo_global {
         struct ttm_mem_global *mem_glob;
         struct page *dummy_read_page;
         struct ttm_mem_shrink shrink;
+        size_t ttm_bo_extra_size;
+        size_t ttm_bo_size;
         struct mutex device_list_mutex;
         spinlock_t lru_lock;
 
@@ -521,6 +535,8 @@ struct ttm_bo_global {
  * lru_lock: Spinlock that protects the buffer+device lru lists and
  * ddestroy lists.
  * @val_seq: Current validation sequence.
+ * @nice_mode: Try nicely to wait for buffer idle when cleaning a manager.
+ * If a GPU lockup has been detected, this is forced to 0.
  * @dev_mapping: A pointer to the struct address_space representing the
  * device address space.
  * @wq: Work queue structure for the delayed delete workqueue.
@@ -554,6 +570,7 @@ struct ttm_bo_device {
          * Protected by load / firstopen / lastclose /unload sync.
          */
 
+        bool nice_mode;
         struct address_space *dev_mapping;
 
         /*
@@ -583,9 +600,8 @@ ttm_flag_masked(uint32_t *old, uint32_t new, uint32_t mask)
 }
 
 /**
- * ttm_tt_init
+ * ttm_tt_create
  *
- * @ttm: The struct ttm_tt.
  * @bdev: pointer to a struct ttm_bo_device:
  * @size: Size of the data needed backing.
  * @page_flags: Page flags as identified by TTM_PAGE_FLAG_XX flags.
@@ -596,22 +612,28 @@ ttm_flag_masked(uint32_t *old, uint32_t new, uint32_t mask)
  * Returns:
  * NULL: Out of memory.
  */
-extern int ttm_tt_init(struct ttm_tt *ttm, struct ttm_bo_device *bdev,
-                        unsigned long size, uint32_t page_flags,
-                        struct page *dummy_read_page);
-extern int ttm_dma_tt_init(struct ttm_dma_tt *ttm_dma, struct ttm_bo_device *bdev,
-                           unsigned long size, uint32_t page_flags,
-                           struct page *dummy_read_page);
+extern struct ttm_tt *ttm_tt_create(struct ttm_bo_device *bdev,
+                                    unsigned long size,
+                                    uint32_t page_flags,
+                                    struct page *dummy_read_page);
 
 /**
- * ttm_tt_fini
+ * ttm_tt_set_user:
  *
- * @ttm: the ttm_tt structure.
+ * @ttm: The struct ttm_tt to populate.
+ * @tsk: A struct task_struct for which @start is a valid user-space address.
+ * @start: A valid user-space address.
+ * @num_pages: Size in pages of the user memory area.
  *
- * Free memory of ttm_tt structure
+ * Populate a struct ttm_tt with a user-space memory area after first pinning
+ * the pages backing it.
+ * Returns:
+ * !0: Error.
  */
-extern void ttm_tt_fini(struct ttm_tt *ttm);
-extern void ttm_dma_tt_fini(struct ttm_dma_tt *ttm_dma);
+
+extern int ttm_tt_set_user(struct ttm_tt *ttm,
+                           struct task_struct *tsk,
+                           unsigned long start, unsigned long num_pages);
 
 /**
  * ttm_ttm_bind:
@@ -624,11 +646,20 @@ extern void ttm_dma_tt_fini(struct ttm_dma_tt *ttm_dma);
 extern int ttm_tt_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem);
 
 /**
+ * ttm_tt_populate:
+ *
+ * @ttm: The struct ttm_tt to contain the backing pages.
+ *
+ * Add backing pages to all of @ttm
+ */
+extern int ttm_tt_populate(struct ttm_tt *ttm);
+
+/**
  * ttm_ttm_destroy:
  *
  * @ttm: The struct ttm_tt.
  *
- * Unbind, unpopulate and destroy common struct ttm_tt.
+ * Unbind, unpopulate and destroy a struct ttm_tt.
  */
 extern void ttm_tt_destroy(struct ttm_tt *ttm);
 
@@ -642,13 +673,19 @@ extern void ttm_tt_destroy(struct ttm_tt *ttm);
 extern void ttm_tt_unbind(struct ttm_tt *ttm);
 
 /**
- * ttm_tt_swapin:
+ * ttm_ttm_destroy:
  *
  * @ttm: The struct ttm_tt.
+ * @index: Index of the desired page.
  *
- * Swap in a previously swap out ttm_tt.
+ * Return a pointer to the struct page backing @ttm at page
+ * index @index. If the page is unpopulated, one will be allocated to
+ * populate that index.
+ *
+ * Returns:
+ * NULL on OOM.
  */
-extern int ttm_tt_swapin(struct ttm_tt *ttm);
+extern struct page *ttm_tt_get_page(struct ttm_tt *ttm, int index);
 
 /**
  * ttm_tt_cache_flush:
@@ -703,6 +740,7 @@ extern bool ttm_mem_reg_is_pci(struct ttm_bo_device *bdev,
  * @proposed_placement: Proposed new placement for the buffer object.
  * @mem: A struct ttm_mem_reg.
  * @interruptible: Sleep interruptible when sliping.
+ * @no_wait_reserve: Return immediately if other buffers are busy.
  * @no_wait_gpu: Return immediately if the GPU is busy.
  *
  * Allocate memory space for the buffer object pointed to by @bo, using
@@ -718,13 +756,27 @@ extern int ttm_bo_mem_space(struct ttm_buffer_object *bo,
                                 struct ttm_placement *placement,
                                 struct ttm_mem_reg *mem,
                                 bool interruptible,
-                                bool no_wait_gpu);
+                                bool no_wait_reserve, bool no_wait_gpu);
 
 extern void ttm_bo_mem_put(struct ttm_buffer_object *bo,
                            struct ttm_mem_reg *mem);
 extern void ttm_bo_mem_put_locked(struct ttm_buffer_object *bo,
                                   struct ttm_mem_reg *mem);
 
+/**
+ * ttm_bo_wait_for_cpu
+ *
+ * @bo: Pointer to a struct ttm_buffer_object.
+ * @no_wait: Don't sleep while waiting.
+ *
+ * Wait until a buffer object is no longer sync'ed for CPU access.
+ * Returns:
+ * -EBUSY: Buffer object was sync'ed for CPU access. (only if no_wait == 1).
+ * -ERESTARTSYS: An interruptible sleep was interrupted by a signal.
+ */
+
+extern int ttm_bo_wait_cpu(struct ttm_buffer_object *bo, bool no_wait);
+
 extern void ttm_bo_global_release(struct drm_global_reference *ref);
 extern int ttm_bo_global_init(struct drm_global_reference *ref);
 
@@ -900,6 +952,7 @@ extern int ttm_bo_wait_unreserved(struct ttm_buffer_object *bo,
  *
  * @bo: A pointer to a struct ttm_buffer_object.
  * @evict: 1: This is an eviction. Don't try to pipeline.
+ * @no_wait_reserve: Return immediately if other buffers are busy.
  * @no_wait_gpu: Return immediately if the GPU is busy.
  * @new_mem: struct ttm_mem_reg indicating where to move.
  *
@@ -914,14 +967,15 @@ extern int ttm_bo_wait_unreserved(struct ttm_buffer_object *bo,
  */
 
 extern int ttm_bo_move_ttm(struct ttm_buffer_object *bo,
-                           bool evict, bool no_wait_gpu,
-                           struct ttm_mem_reg *new_mem);
+                           bool evict, bool no_wait_reserve,
+                           bool no_wait_gpu, struct ttm_mem_reg *new_mem);
 
 /**
  * ttm_bo_move_memcpy
  *
  * @bo: A pointer to a struct ttm_buffer_object.
  * @evict: 1: This is an eviction. Don't try to pipeline.
+ * @no_wait_reserve: Return immediately if other buffers are busy.
  * @no_wait_gpu: Return immediately if the GPU is busy.
  * @new_mem: struct ttm_mem_reg indicating where to move.
  *
@@ -936,8 +990,8 @@ extern int ttm_bo_move_ttm(struct ttm_buffer_object *bo,
  */
 
 extern int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,
-                              bool evict, bool no_wait_gpu,
-                              struct ttm_mem_reg *new_mem);
+                              bool evict, bool no_wait_reserve,
+                              bool no_wait_gpu, struct ttm_mem_reg *new_mem);
 
 /**
  * ttm_bo_free_old_node
@@ -953,7 +1007,10 @@ extern void ttm_bo_free_old_node(struct ttm_buffer_object *bo);
  *
  * @bo: A pointer to a struct ttm_buffer_object.
  * @sync_obj: A sync object that signals when moving is complete.
+ * @sync_obj_arg: An argument to pass to the sync object idle / wait
+ * functions.
  * @evict: This is an evict move. Don't return until the buffer is idle.
+ * @no_wait_reserve: Return immediately if other buffers are busy.
  * @no_wait_gpu: Return immediately if the GPU is busy.
  * @new_mem: struct ttm_mem_reg indicating where to move.
  *
@@ -967,7 +1024,9 @@ extern void ttm_bo_free_old_node(struct ttm_buffer_object *bo);
 
 extern int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
                                      void *sync_obj,
-                                     bool evict, bool no_wait_gpu,
+                                     void *sync_obj_arg,
+                                     bool evict, bool no_wait_reserve,
+                                     bool no_wait_gpu,
                                      struct ttm_mem_reg *new_mem);
 /**
  * ttm_io_prot
@@ -987,25 +1046,17 @@ extern const struct ttm_mem_type_manager_func ttm_bo_manager_func;
 #include <linux/agp_backend.h>
 
 /**
- * ttm_agp_tt_create
+ * ttm_agp_backend_init
  *
  * @bdev: Pointer to a struct ttm_bo_device.
  * @bridge: The agp bridge this device is sitting on.
- * @size: Size of the data needed backing.
- * @page_flags: Page flags as identified by TTM_PAGE_FLAG_XX flags.
- * @dummy_read_page: See struct ttm_bo_device.
- *
  *
  * Create a TTM backend that uses the indicated AGP bridge as an aperture
  * for TT memory. This function uses the linux agpgart interface to
  * bind and unbind memory backing a ttm_tt.
  */
-extern struct ttm_tt *ttm_agp_tt_create(struct ttm_bo_device *bdev,
-                                        struct agp_bridge_data *bridge,
-                                        unsigned long size, uint32_t page_flags,
-                                        struct page *dummy_read_page);
-int ttm_agp_tt_populate(struct ttm_tt *ttm);
-void ttm_agp_tt_unpopulate(struct ttm_tt *ttm);
+extern struct ttm_backend *ttm_agp_backend_init(struct ttm_bo_device *bdev,
+                                                struct agp_bridge_data *bridge);
 #endif
 
 #endif
diff --git a/include/drm/ttm/ttm_execbuf_util.h b/include/drm/ttm/ttm_execbuf_util.h
index 547e19f06e5..26cc7f9ffa4 100644
--- a/include/drm/ttm/ttm_execbuf_util.h
+++ b/include/drm/ttm/ttm_execbuf_util.h
@@ -31,7 +31,7 @@
 #ifndef _TTM_EXECBUF_UTIL_H_
 #define _TTM_EXECBUF_UTIL_H_
 
-#include <ttm/ttm_bo_api.h>
+#include "ttm/ttm_bo_api.h"
 #include <linux/list.h>
 
 /**
@@ -39,6 +39,8 @@
  *
  * @head:           list head for thread-private list.
  * @bo:             refcounted buffer object pointer.
+ * @new_sync_obj_arg: New sync_obj_arg for @bo, to be used once
+ * adding a new sync object.
  * @reserved:       Indicates whether @bo has been reserved for validation.
  * @removed:        Indicates whether @bo has been removed from lru lists.
  * @put_count:      Number of outstanding references on bo::list_kref.
@@ -48,6 +50,7 @@
 struct ttm_validate_buffer {
         struct list_head head;
         struct ttm_buffer_object *bo;
+        void *new_sync_obj_arg;
         bool reserved;
         bool removed;
         int put_count;
diff --git a/include/drm/ttm/ttm_lock.h b/include/drm/ttm/ttm_lock.h
index 2902beb5f68..2e7f0c941b5 100644
--- a/include/drm/ttm/ttm_lock.h
+++ b/include/drm/ttm/ttm_lock.h
@@ -49,7 +49,7 @@
 #ifndef _TTM_LOCK_H_
 #define _TTM_LOCK_H_
 
-#include <ttm/ttm_object.h>
+#include "ttm/ttm_object.h"
 #include <linux/wait.h>
 #include <linux/atomic.h>
 
diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
index 72dcbe81dd0..26c1f78d136 100644
--- a/include/drm/ttm/ttm_memory.h
+++ b/include/drm/ttm/ttm_memory.h
@@ -30,7 +30,6 @@
 
 #include <linux/workqueue.h>
 #include <linux/spinlock.h>
-#include <linux/bug.h>
 #include <linux/wait.h>
 #include <linux/errno.h>
 #include <linux/kobject.h>
@@ -60,6 +59,7 @@ struct ttm_mem_shrink {
  * for the GPU, and this will otherwise block other workqueue tasks(?)
  * At this point we use only a single-threaded workqueue.
  * @work: The workqueue callback for the shrink queue.
+ * @queue: Wait queue for processes suspended waiting for memory.
  * @lock: Lock to protect the @shrink - and the memory accounting members,
  * that is, essentially the whole structure with some exceptions.
  * @zones: Array of pointers to accounting zones.
@@ -79,6 +79,7 @@ struct ttm_mem_global {
         struct ttm_mem_shrink *shrink;
         struct workqueue_struct *swap_queue;
         struct work_struct work;
+        wait_queue_head_t queue;
         spinlock_t lock;
         struct ttm_mem_zone *zones[TTM_MEM_MAX_ZONES];
         unsigned int num_zones;
diff --git a/include/drm/ttm/ttm_object.h b/include/drm/ttm/ttm_object.h
index fc0cf064990..e46054e5255 100644
--- a/include/drm/ttm/ttm_object.h
+++ b/include/drm/ttm/ttm_object.h
@@ -38,9 +38,8 @@
 #define _TTM_OBJECT_H_
 
 #include <linux/list.h>
-#include <drm/drm_hashtab.h>
+#include "drm_hashtab.h"
 #include <linux/kref.h>
-#include <linux/rcupdate.h>
 #include <ttm/ttm_memory.h>
 
 /**
@@ -121,7 +120,6 @@ struct ttm_object_device;
  */
 
 struct ttm_base_object {
-        struct rcu_head rhead;
         struct drm_hash_item hash;
         enum ttm_object_type object_type;
         bool shareable;
@@ -270,6 +268,4 @@ extern struct ttm_object_device *ttm_object_device_init
 
 extern void ttm_object_device_release(struct ttm_object_device **p_tdev);
 
-#define ttm_base_object_kfree(__object, __base)\
-        kfree_rcu(__object, __base.rhead)
 #endif
diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h
index 706b962c646..129de12353f 100644
--- a/include/drm/ttm/ttm_page_alloc.h
+++ b/include/drm/ttm/ttm_page_alloc.h
@@ -26,74 +26,49 @@
 #ifndef TTM_PAGE_ALLOC
 #define TTM_PAGE_ALLOC
 
-#include <drm/ttm/ttm_bo_driver.h>
-#include <drm/ttm/ttm_memory.h>
+#include "ttm_bo_driver.h"
+#include "ttm_memory.h"
 
 /**
- * Initialize pool allocator.
- */
-int ttm_page_alloc_init(struct ttm_mem_global *glob, unsigned max_pages);
-/**
- * Free pool allocator.
- */
-void ttm_page_alloc_fini(void);
-
-/**
- * ttm_pool_populate:
- *
- * @ttm: The struct ttm_tt to contain the backing pages.
+ * Get count number of pages from pool to pages list.
  *
- * Add backing pages to all of @ttm
+ * @pages: head of empty linked list where pages are filled.
+ * @flags: ttm flags for page allocation.
+ * @cstate: ttm caching state for the page.
+ * @count: number of pages to allocate.
+ * @dma_address: The DMA (bus) address of pages (if TTM_PAGE_FLAG_DMA32 set).
  */
-extern int ttm_pool_populate(struct ttm_tt *ttm);
-
+int ttm_get_pages(struct list_head *pages,
+                  int flags,
+                  enum ttm_caching_state cstate,
+                  unsigned count,
+                  dma_addr_t *dma_address);
 /**
- * ttm_pool_unpopulate:
- *
- * @ttm: The struct ttm_tt which to free backing pages.
+ * Put linked list of pages to pool.
  *
- * Free all pages of @ttm
+ * @pages: list of pages to free.
+ * @page_count: number of pages in the list. Zero can be passed for unknown
+ * count.
+ * @flags: ttm flags for page allocation.
+ * @cstate: ttm caching state.
+ * @dma_address: The DMA (bus) address of pages (if TTM_PAGE_FLAG_DMA32 set).
  */
-extern void ttm_pool_unpopulate(struct ttm_tt *ttm);
-
-/**
- * Output the state of pools to debugfs file
- */
-extern int ttm_page_alloc_debugfs(struct seq_file *m, void *data);
-
-
-#ifdef CONFIG_SWIOTLB
+void ttm_put_pages(struct list_head *pages,
+                   unsigned page_count,
+                   int flags,
+                   enum ttm_caching_state cstate,
+                   dma_addr_t *dma_address);
 /**
  * Initialize pool allocator.
  */
-int ttm_dma_page_alloc_init(struct ttm_mem_global *glob, unsigned max_pages);
-
+int ttm_page_alloc_init(struct ttm_mem_global *glob, unsigned max_pages);
 /**
  * Free pool allocator.
  */
-void ttm_dma_page_alloc_fini(void);
+void ttm_page_alloc_fini(void);
 
 /**
  * Output the state of pools to debugfs file
  */
-extern int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data);
-
-extern int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev);
-extern void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev);
-
-#else
-static inline int ttm_dma_page_alloc_init(struct ttm_mem_global *glob,
-                                          unsigned max_pages)
-{
-        return -ENODEV;
-}
-
-static inline void ttm_dma_page_alloc_fini(void) { return; }
-
-static inline int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data)
-{
-        return 0;
-}
-#endif
-
+extern int ttm_page_alloc_debugfs(struct seq_file *m, void *data);
 #endif