Sweetbread/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Issues Pull Requests Actions Activity

ddk: update includes

Browse Source 
git-svn-id: svn://kolibrios.org@3262 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Sergey Semyonov (Serge) 2013-02-23 09:41:48 +00:00
parent 67f8bac00f
commit 3dd2cc0db3
10 changed files with 2078 additions and 1886 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/include/ddk.h
View File

@ -13,7 +13,10 @@
#define OS_BASE 0x80000000 #define OS_BASE 0x80000000
#define PG_SW 0x003 #define PG_SW 0x003
#define PG_NOCACHE 0x010 #define PG_UW 0x007
#define PG_NOCACHE 0x018
#define PG_SHARED 0x200
#define MANUAL_DESTROY 0x80000000 #define MANUAL_DESTROY 0x80000000

7
drivers/include/drm/drmP.h
View File

@ -171,7 +171,7 @@ int drm_err(const char *func, const char *format, ...);
/** \name Begin the DRM... */ /** \name Begin the DRM... */
/*@{*/ /*@{*/
#define DRM_DEBUG_CODE 0 /**< Include debugging code if > 1, then #define DRM_DEBUG_CODE 2 /**< Include debugging code if > 1, then
also include looping detection. */ also include looping detection. */
#define DRM_MAGIC_HASH_ORDER 4 /**< Size of key hash table. Must be power of 2. */ #define DRM_MAGIC_HASH_ORDER 4 /**< Size of key hash table. Must be power of 2. */
@ -959,9 +959,14 @@ struct drm_driver {
#define DRM_IRQ_ARGS int irq, void *arg #define DRM_IRQ_ARGS int irq, void *arg
struct drm_driver { struct drm_driver {
int (*open) (struct drm_device *, struct drm_file *);
irqreturn_t (*irq_handler) (DRM_IRQ_ARGS); irqreturn_t (*irq_handler) (DRM_IRQ_ARGS);
void (*irq_preinstall) (struct drm_device *dev); void (*irq_preinstall) (struct drm_device *dev);
int (*irq_postinstall) (struct drm_device *dev); int (*irq_postinstall) (struct drm_device *dev);
int (*gem_init_object) (struct drm_gem_object *obj);
void (*gem_free_object) (struct drm_gem_object *obj);
int (*gem_open_object) (struct drm_gem_object *, struct drm_file *); int (*gem_open_object) (struct drm_gem_object *, struct drm_file *);
void (*gem_close_object) (struct drm_gem_object *, struct drm_file *); void (*gem_close_object) (struct drm_gem_object *, struct drm_file *);
}; };

10
drivers/include/drm/drm_crtc.h
View File

@ -244,6 +244,16 @@ struct drm_framebuffer_funcs {
struct drm_framebuffer { struct drm_framebuffer {
struct drm_device *dev; struct drm_device *dev;
/*
* Note that the fb is refcounted for the benefit of driver internals,
* for example some hw, disabling a CRTC/plane is asynchronous, and
* scanout does not actually complete until the next vblank. So some
* cleanup (like releasing the reference(s) on the backing GEM bo(s))
* should be deferred. In cases like this, the driver would like to
* hold a ref to the fb even though it has already been removed from
* userspace perspective.
*/
struct kref refcount;
struct list_head head; struct list_head head;
struct drm_mode_object base; struct drm_mode_object base;
const struct drm_framebuffer_funcs *funcs; const struct drm_framebuffer_funcs *funcs;

207
drivers/include/drm/ttm/ttm_bo_api.h
View File

@ -31,13 +31,13 @@
#ifndef _TTM_BO_API_H_ #ifndef _TTM_BO_API_H_
#define _TTM_BO_API_H_ #define _TTM_BO_API_H_
#include "drm_hashtab.h" #include <drm/drm_hashtab.h>
#include <linux/kref.h> #include <linux/kref.h>
#include <linux/list.h> #include <linux/list.h>
//#include <linux/wait.h> #include <linux/wait.h>
#include <linux/mutex.h> #include <linux/mutex.h>
//#include <linux/mm.h> #include <linux/mm.h>
//#include <linux/rbtree.h> #include <linux/rbtree.h>
#include <linux/bitmap.h> #include <linux/bitmap.h>
struct ttm_bo_device; struct ttm_bo_device;
@ -50,10 +50,10 @@ struct drm_mm_node;
* *
* @fpfn: first valid page frame number to put the object * @fpfn: first valid page frame number to put the object
* @lpfn: last valid page frame number to put the object * @lpfn: last valid page frame number to put the object
* @num_placement: number of prefered placements * @num_placement: number of preferred placements
* @placement: prefered placements * @placement: preferred placements
* @num_busy_placement: number of prefered placements when need to evict buffer * @num_busy_placement: number of preferred placements when need to evict buffer
* @busy_placement: prefered placements when need to evict buffer * @busy_placement: preferred placements when need to evict buffer
* *
* Structure indicating the placement you request for an object. * Structure indicating the placement you request for an object.
*/ */
@ -66,6 +66,29 @@ struct ttm_placement {
const uint32_t *busy_placement; const uint32_t *busy_placement;
}; };
/**
* struct ttm_bus_placement
*
* @addr: mapped virtual address
* @base: bus base address
* @is_iomem: is this io memory ?
* @size: size in byte
* @offset: offset from the base address
* @io_reserved_vm: The VM system has a refcount in @io_reserved_count
* @io_reserved_count: Refcounting the numbers of callers to ttm_mem_io_reserve
*
* Structure indicating the bus placement of an object.
*/
struct ttm_bus_placement {
void *addr;
unsigned long base;
unsigned long size;
unsigned long offset;
bool is_iomem;
bool io_reserved_vm;
uint64_t io_reserved_count;
};
/** /**
* struct ttm_mem_reg * struct ttm_mem_reg
@ -75,23 +98,23 @@ struct ttm_placement {
* @num_pages: Actual size of memory region in pages. * @num_pages: Actual size of memory region in pages.
* @page_alignment: Page alignment. * @page_alignment: Page alignment.
* @placement: Placement flags. * @placement: Placement flags.
* @bus: Placement on io bus accessible to the CPU
* *
* Structure indicating the placement and space resources used by a * Structure indicating the placement and space resources used by a
* buffer object. * buffer object.
*/ */
struct ttm_mem_reg { struct ttm_mem_reg {
void *mm_node; void *mm_node;
unsigned long start; unsigned long start;
unsigned long size; unsigned long size;
unsigned long num_pages; unsigned long num_pages;
uint32_t page_alignment; uint32_t page_alignment;
uint32_t mem_type; uint32_t mem_type;
uint32_t placement; uint32_t placement;
// struct ttm_bus_placement bus; struct ttm_bus_placement bus;
}; };
/** /**
* enum ttm_bo_type * enum ttm_bo_type
* *
@ -99,18 +122,17 @@ struct ttm_mem_reg {
* be mmapped by user space. Each of these bos occupy a slot in the * 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. * 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, * @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. * 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 { enum ttm_bo_type {
ttm_bo_type_device, ttm_bo_type_device,
ttm_bo_type_user, ttm_bo_type_kernel,
ttm_bo_type_kernel ttm_bo_type_sg
}; };
struct ttm_tt; struct ttm_tt;
@ -119,8 +141,6 @@ struct ttm_tt;
* struct ttm_buffer_object * struct ttm_buffer_object
* *
* @bdev: Pointer to the buffer object device structure. * @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. * @type: The bo type.
* @destroy: Destruction function. If NULL, kfree is used. * @destroy: Destruction function. If NULL, kfree is used.
* @num_pages: Actual number of pages. * @num_pages: Actual number of pages.
@ -134,11 +154,10 @@ struct ttm_tt;
* keeps one refcount. When this refcount reaches zero, * keeps one refcount. When this refcount reaches zero,
* the object is destroyed. * the object is destroyed.
* @event_queue: Queue for processes waiting on buffer object status change. * @event_queue: Queue for processes waiting on buffer object status change.
* @lock: spinlock protecting mostly synchronization members.
* @mem: structure describing current placement. * @mem: structure describing current placement.
* @persistant_swap_storage: Usually the swap storage is deleted for buffers * @persistent_swap_storage: Usually the swap storage is deleted for buffers
* pinned in physical memory. If this behaviour is not desired, this member * pinned in physical memory. If this behaviour is not desired, this member
* holds a pointer to a persistant shmem object. * holds a pointer to a persistent shmem object.
* @ttm: TTM structure holding system pages. * @ttm: TTM structure holding system pages.
* @evicted: Whether the object was evicted without user-space knowing. * @evicted: Whether the object was evicted without user-space knowing.
* @cpu_writes: For synchronization. Number of cpu writers. * @cpu_writes: For synchronization. Number of cpu writers.
@ -151,7 +170,6 @@ struct ttm_tt;
* @seq_valid: The value of @val_seq is valid. This value is protected by * @seq_valid: The value of @val_seq is valid. This value is protected by
* the bo_device::lru_lock. * the bo_device::lru_lock.
* @reserved: Deadlock-free lock used for synchronization state transitions. * @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. * @sync_obj: Pointer to a synchronization object.
* @priv_flags: Flags describing buffer object internal state. * @priv_flags: Flags describing buffer object internal state.
* @vm_rb: Rb node for the vm rb tree. * @vm_rb: Rb node for the vm rb tree.
@ -179,7 +197,6 @@ struct ttm_buffer_object {
struct ttm_bo_global *glob; struct ttm_bo_global *glob;
struct ttm_bo_device *bdev; struct ttm_bo_device *bdev;
unsigned long buffer_start;
enum ttm_bo_type type; enum ttm_bo_type type;
void (*destroy) (struct ttm_buffer_object *); void (*destroy) (struct ttm_buffer_object *);
unsigned long num_pages; unsigned long num_pages;
@ -190,17 +207,16 @@ struct ttm_buffer_object {
* Members not needing protection. * Members not needing protection.
*/ */
struct kref kref; struct kref kref;
struct kref list_kref; struct kref list_kref;
// wait_queue_head_t event_queue; wait_queue_head_t event_queue;
spinlock_t lock;
/** /**
* Members protected by the bo::reserved lock. * Members protected by the bo::reserved lock.
*/ */
struct ttm_mem_reg mem; struct ttm_mem_reg mem;
// struct file *persistant_swap_storage; struct file *persistent_swap_storage;
struct ttm_tt *ttm; struct ttm_tt *ttm;
bool evicted; bool evicted;
@ -208,7 +224,7 @@ struct ttm_buffer_object {
* Members protected by the bo::reserved lock only when written to. * Members protected by the bo::reserved lock only when written to.
*/ */
atomic_t cpu_writers; atomic_t cpu_writers;
/** /**
* Members protected by the bdev::lru_lock. * Members protected by the bdev::lru_lock.
@ -217,6 +233,7 @@ struct ttm_buffer_object {
struct list_head lru; struct list_head lru;
struct list_head ddestroy; struct list_head ddestroy;
struct list_head swap; struct list_head swap;
struct list_head io_reserve_lru;
uint32_t val_seq; uint32_t val_seq;
bool seq_valid; bool seq_valid;
@ -225,14 +242,15 @@ struct ttm_buffer_object {
* only when written to. * only when written to.
*/ */
atomic_t reserved; atomic_t reserved;
/** /**
* Members protected by the bo::lock * Members protected by struct buffer_object_device::fence_lock
* In addition, setting sync_obj to anything else
* than NULL requires bo::reserved to be held. This allows for
* checking NULL while reserved but not holding the mentioned lock.
*/ */
void *sync_obj_arg;
void *sync_obj; void *sync_obj;
unsigned long priv_flags; unsigned long priv_flags;
@ -252,6 +270,8 @@ struct ttm_buffer_object {
unsigned long offset; unsigned long offset;
uint32_t cur_placement; uint32_t cur_placement;
struct sg_table *sg;
}; };
/** /**
@ -277,6 +297,7 @@ struct ttm_bo_kmap_obj {
ttm_bo_map_kmap = 3, ttm_bo_map_kmap = 3,
ttm_bo_map_premapped = 4 | TTM_BO_MAP_IOMEM_MASK, ttm_bo_map_premapped = 4 | TTM_BO_MAP_IOMEM_MASK,
} bo_kmap_type; } bo_kmap_type;
struct ttm_buffer_object *bo;
}; };
/** /**
@ -316,7 +337,6 @@ extern int ttm_bo_wait(struct ttm_buffer_object *bo, bool lazy,
* @bo: The buffer object. * @bo: The buffer object.
* @placement: Proposed placement for the buffer object. * @placement: Proposed placement for the buffer object.
* @interruptible: Sleep interruptible if sleeping. * @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. * @no_wait_gpu: Return immediately if the GPU is busy.
* *
* Changes placement and caching policy of the buffer object * Changes placement and caching policy of the buffer object
@ -329,7 +349,7 @@ extern int ttm_bo_wait(struct ttm_buffer_object *bo, bool lazy,
*/ */
extern int ttm_bo_validate(struct ttm_buffer_object *bo, extern int ttm_bo_validate(struct ttm_buffer_object *bo,
struct ttm_placement *placement, struct ttm_placement *placement,
bool interruptible, bool no_wait_reserve, bool interruptible,
bool no_wait_gpu); bool no_wait_gpu);
/** /**
@ -341,6 +361,61 @@ extern int ttm_bo_validate(struct ttm_buffer_object *bo,
*/ */
extern void ttm_bo_unref(struct ttm_buffer_object **bo); extern void ttm_bo_unref(struct ttm_buffer_object **bo);
/**
* ttm_bo_list_ref_sub
*
* @bo: The buffer object.
* @count: The number of references with which to decrease @bo::list_kref;
* @never_free: The refcount should not reach zero with this operation.
*
* Release @count lru list references to this buffer object.
*/
extern void ttm_bo_list_ref_sub(struct ttm_buffer_object *bo, int count,
bool never_free);
/**
* ttm_bo_add_to_lru
*
* @bo: The buffer object.
*
* Add this bo to the relevant mem type lru and, if it's backed by
* system pages (ttms) to the swap list.
* This function must be called with struct ttm_bo_global::lru_lock held, and
* is typically called immediately prior to unreserving a bo.
*/
extern void ttm_bo_add_to_lru(struct ttm_buffer_object *bo);
/**
* ttm_bo_del_from_lru
*
* @bo: The buffer object.
*
* Remove this bo from all lru lists used to lookup and reserve an object.
* This function must be called with struct ttm_bo_global::lru_lock held,
* and is usually called just immediately after the bo has been reserved to
* avoid recursive reservation from lru lists.
*/
extern int ttm_bo_del_from_lru(struct ttm_buffer_object *bo);
/**
* ttm_bo_lock_delayed_workqueue
*
* Prevent the delayed workqueue from running.
* Returns
* True if the workqueue was queued at the time
*/
extern int ttm_bo_lock_delayed_workqueue(struct ttm_bo_device *bdev);
/**
* ttm_bo_unlock_delayed_workqueue
*
* Allows the delayed workqueue to run.
*/
extern void ttm_bo_unlock_delayed_workqueue(struct ttm_bo_device *bdev,
int resched);
/** /**
* ttm_bo_synccpu_write_grab * ttm_bo_synccpu_write_grab
* *
@ -348,15 +423,16 @@ extern void ttm_bo_unref(struct ttm_buffer_object **bo);
* @no_wait: Return immediately if buffer is busy. * @no_wait: Return immediately if buffer is busy.
* *
* Synchronizes a buffer object for CPU RW access. This means * Synchronizes a buffer object for CPU RW access. This means
* blocking command submission that affects the buffer and * command submission that affects the buffer will return -EBUSY
* waiting for buffer idle. This lock is recursive. * until ttm_bo_synccpu_write_release is called.
*
* Returns * Returns
* -EBUSY if the buffer is busy and no_wait is true. * -EBUSY if the buffer is busy and no_wait is true.
* -ERESTARTSYS if interrupted by a signal. * -ERESTARTSYS if interrupted by a signal.
*/ */
extern int extern int
ttm_bo_synccpu_write_grab(struct ttm_buffer_object *bo, bool no_wait); ttm_bo_synccpu_write_grab(struct ttm_buffer_object *bo, bool no_wait);
/** /**
* ttm_bo_synccpu_write_release: * ttm_bo_synccpu_write_release:
* *
@ -366,6 +442,22 @@ 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); 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 * ttm_bo_init
* *
@ -375,8 +467,6 @@ extern void ttm_bo_synccpu_write_release(struct ttm_buffer_object *bo);
* @type: Requested type of buffer object. * @type: Requested type of buffer object.
* @flags: Initial placement flags. * @flags: Initial placement flags.
* @page_alignment: Data alignment in pages. * @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, * @interruptible: If needing to sleep to wait for GPU resources,
* sleep interruptible. * sleep interruptible.
* @persistent_swap_storage: Usually the swap storage is deleted for buffers * @persistent_swap_storage: Usually the swap storage is deleted for buffers
@ -408,11 +498,12 @@ extern int ttm_bo_init(struct ttm_bo_device *bdev,
enum ttm_bo_type type, enum ttm_bo_type type,
struct ttm_placement *placement, struct ttm_placement *placement,
uint32_t page_alignment, uint32_t page_alignment,
unsigned long buffer_start,
bool interrubtible, bool interrubtible,
struct file *persistent_swap_storage, struct file *persistent_swap_storage,
size_t acc_size, size_t acc_size,
struct sg_table *sg,
void (*destroy) (struct ttm_buffer_object *)); void (*destroy) (struct ttm_buffer_object *));
/** /**
* ttm_bo_synccpu_object_init * ttm_bo_synccpu_object_init
* *
@ -422,8 +513,6 @@ extern int ttm_bo_init(struct ttm_bo_device *bdev,
* @type: Requested type of buffer object. * @type: Requested type of buffer object.
* @flags: Initial placement flags. * @flags: Initial placement flags.
* @page_alignment: Data alignment in pages. * @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, * @interruptible: If needing to sleep while waiting for GPU resources,
* sleep interruptible. * sleep interruptible.
* @persistent_swap_storage: Usually the swap storage is deleted for buffers * @persistent_swap_storage: Usually the swap storage is deleted for buffers
@ -446,7 +535,6 @@ extern int ttm_bo_create(struct ttm_bo_device *bdev,
enum ttm_bo_type type, enum ttm_bo_type type,
struct ttm_placement *placement, struct ttm_placement *placement,
uint32_t page_alignment, uint32_t page_alignment,
unsigned long buffer_start,
bool interruptible, bool interruptible,
struct file *persistent_swap_storage, struct file *persistent_swap_storage,
struct ttm_buffer_object **p_bo); struct ttm_buffer_object **p_bo);
@ -582,9 +670,6 @@ extern int ttm_bo_kmap(struct ttm_buffer_object *bo, unsigned long start_page,
extern void ttm_bo_kunmap(struct ttm_bo_kmap_obj *map); extern void ttm_bo_kunmap(struct ttm_bo_kmap_obj *map);
#if 0
#endif
/** /**
* ttm_fbdev_mmap - mmap fbdev memory backed by a ttm buffer object. * ttm_fbdev_mmap - mmap fbdev memory backed by a ttm buffer object.
* *
@ -640,4 +725,18 @@ 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); 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 #endif

512
drivers/include/drm/ttm/ttm_bo_driver.h
View File

@ -30,97 +30,56 @@
#ifndef _TTM_BO_DRIVER_H_ #ifndef _TTM_BO_DRIVER_H_
#define _TTM_BO_DRIVER_H_ #define _TTM_BO_DRIVER_H_
#include "ttm/ttm_bo_api.h" #include <ttm/ttm_bo_api.h>
#include "ttm/ttm_memory.h" #include <ttm/ttm_memory.h>
#include "ttm/ttm_module.h" #include <ttm/ttm_module.h>
#include "drm_mm.h" #include <drm/drm_mm.h>
#include "linux/spinlock.h" #include <drm/drm_global.h>
//#include <linux/workqueue.h>
struct ttm_backend; //#include <linux/fs.h>
#include <linux/spinlock.h>
struct ttm_backend_func { 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.
*
* 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 * struct ttm_backend_func member bind
* *
* @backend: Pointer to a struct ttm_backend. * @ttm: Pointer to a struct ttm_tt.
* @bo_mem: Pointer to a struct ttm_mem_reg describing the * @bo_mem: Pointer to a struct ttm_mem_reg describing the
* memory type and location for binding. * memory type and location for binding.
* *
* Bind the backend pages into the aperture in the location * Bind the backend pages into the aperture in the location
* indicated by @bo_mem. This function should be able to handle * indicated by @bo_mem. This function should be able to handle
* differences between aperture- and system page sizes. * differences between aperture and system page sizes.
*/ */
int (*bind) (struct ttm_backend *backend, struct ttm_mem_reg *bo_mem); int (*bind) (struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem);
/** /**
* struct ttm_backend_func member unbind * struct ttm_backend_func member unbind
* *
* @backend: Pointer to a struct ttm_backend. * @ttm: Pointer to a struct ttm_tt.
* *
* Unbind previously bound backend pages. This function should be * Unbind previously bound backend pages. This function should be
* able to handle differences between aperture- and system page sizes. * able to handle differences between aperture and system page sizes.
*/ */
int (*unbind) (struct ttm_backend *backend); int (*unbind) (struct ttm_tt *ttm);
/** /**
* struct ttm_backend_func member destroy * struct ttm_backend_func member destroy
* *
* @backend: Pointer to a struct ttm_backend. * @ttm: Pointer to a struct ttm_tt.
* *
* Destroy the 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.
*/ */
void (*destroy) (struct ttm_backend *backend); void (*destroy) (struct ttm_tt *ttm);
}; };
/**
* 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_WRITE (1 << 3)
#define TTM_PAGE_FLAG_SWAPPED (1 << 4) #define TTM_PAGE_FLAG_SWAPPED (1 << 4)
#define TTM_PAGE_FLAG_PERSISTENT_SWAP (1 << 5) #define TTM_PAGE_FLAG_PERSISTENT_SWAP (1 << 5)
#define TTM_PAGE_FLAG_ZERO_ALLOC (1 << 6) #define TTM_PAGE_FLAG_ZERO_ALLOC (1 << 6)
#define TTM_PAGE_FLAG_DMA32 (1 << 7) #define TTM_PAGE_FLAG_DMA32 (1 << 7)
#define TTM_PAGE_FLAG_SG (1 << 8)
enum ttm_caching_state { enum ttm_caching_state {
tt_uncached, tt_uncached,
@ -131,23 +90,18 @@ enum ttm_caching_state {
/** /**
* struct ttm_tt * 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 * @dummy_read_page: Page to map where the ttm_tt page array contains a NULL
* pointer. * pointer.
* @pages: Array of pages backing the data. * @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. * @num_pages: Number of pages in the page array.
* @bdev: Pointer to the current struct ttm_bo_device. * @bdev: Pointer to the current struct ttm_bo_device.
* @be: Pointer to the ttm backend. * @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. * @swap_storage: Pointer to shmem struct file for swap storage.
* @caching_state: The current caching state of the pages. * @caching_state: The current caching state of the pages.
* @state: The current binding 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 * This is a structure holding the pages, caching- and aperture binding
* status for a buffer object that isn't backed by fixed (VRAM / AGP) * status for a buffer object that isn't backed by fixed (VRAM / AGP)
@ -155,16 +109,14 @@ enum ttm_caching_state {
*/ */
struct ttm_tt { struct ttm_tt {
struct ttm_bo_device *bdev;
struct ttm_backend_func *func;
struct page *dummy_read_page; struct page *dummy_read_page;
struct page **pages; struct page **pages;
long first_himem_page;
long last_lomem_page;
uint32_t page_flags; uint32_t page_flags;
unsigned long num_pages; unsigned long num_pages;
struct sg_table *sg; /* for SG objects via dma-buf */
struct ttm_bo_global *glob; struct ttm_bo_global *glob;
struct ttm_backend *be;
struct task_struct *tsk;
unsigned long start;
struct file *swap_storage; struct file *swap_storage;
enum ttm_caching_state caching_state; enum ttm_caching_state caching_state;
enum { enum {
@ -172,13 +124,113 @@ struct ttm_tt {
tt_unbound, tt_unbound,
tt_unpopulated, tt_unpopulated,
} state; } 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; dma_addr_t *dma_address;
struct list_head pages_list;
}; };
#define TTM_MEMTYPE_FLAG_FIXED (1 << 0) /* Fixed (on-card) PCI memory */ #define TTM_MEMTYPE_FLAG_FIXED (1 << 0) /* Fixed (on-card) PCI memory */
#define TTM_MEMTYPE_FLAG_MAPPABLE (1 << 1) /* Memory mappable */ #define TTM_MEMTYPE_FLAG_MAPPABLE (1 << 1) /* Memory mappable */
#define TTM_MEMTYPE_FLAG_CMA (1 << 3) /* Can't map aperture */ #define TTM_MEMTYPE_FLAG_CMA (1 << 3) /* Can't map aperture */
struct ttm_mem_type_manager;
struct ttm_mem_type_manager_func {
/**
* struct ttm_mem_type_manager member init
*
* @man: Pointer to a memory type manager.
* @p_size: Implementation dependent, but typically the size of the
* range to be managed in pages.
*
* Called to initialize a private range manager. The function is
* expected to initialize the man::priv member.
* Returns 0 on success, negative error code on failure.
*/
int (*init)(struct ttm_mem_type_manager *man, unsigned long p_size);
/**
* struct ttm_mem_type_manager member takedown
*
* @man: Pointer to a memory type manager.
*
* Called to undo the setup done in init. All allocated resources
* should be freed.
*/
int (*takedown)(struct ttm_mem_type_manager *man);
/**
* struct ttm_mem_type_manager member get_node
*
* @man: Pointer to a memory type manager.
* @bo: Pointer to the buffer object we're allocating space for.
* @placement: Placement details.
* @mem: Pointer to a struct ttm_mem_reg to be filled in.
*
* This function should allocate space in the memory type managed
* by @man. Placement details if
* applicable are given by @placement. If successful,
* @mem::mm_node should be set to a non-null value, and
* @mem::start should be set to a value identifying the beginning
* of the range allocated, and the function should return zero.
* If the memory region accommodate the buffer object, @mem::mm_node
* should be set to NULL, and the function should return 0.
* If a system error occurred, preventing the request to be fulfilled,
* the function should return a negative error code.
*
* Note that @mem::mm_node will only be dereferenced by
* struct ttm_mem_type_manager functions and optionally by the driver,
* which has knowledge of the underlying type.
*
* This function may not be called from within atomic context, so
* an implementation can and must use either a mutex or a spinlock to
* protect any data structures managing the space.
*/
int (*get_node)(struct ttm_mem_type_manager *man,
struct ttm_buffer_object *bo,
struct ttm_placement *placement,
struct ttm_mem_reg *mem);
/**
* struct ttm_mem_type_manager member put_node
*
* @man: Pointer to a memory type manager.
* @mem: Pointer to a struct ttm_mem_reg to be filled in.
*
* This function frees memory type resources previously allocated
* and that are identified by @mem::mm_node and @mem::start. May not
* be called from within atomic context.
*/
void (*put_node)(struct ttm_mem_type_manager *man,
struct ttm_mem_reg *mem);
/**
* struct ttm_mem_type_manager member debug
*
* @man: Pointer to a memory type manager.
* @prefix: Prefix to be used in printout to identify the caller.
*
* This function is called to print out the state of the memory
* type manager to aid debugging of out-of-memory conditions.
* It may not be called from within atomic context.
*/
void (*debug)(struct ttm_mem_type_manager *man, const char *prefix);
};
/** /**
* struct ttm_mem_type_manager * struct ttm_mem_type_manager
* *
@ -263,15 +315,42 @@ struct ttm_mem_type_manager {
struct ttm_bo_driver { struct ttm_bo_driver {
/** /**
* struct ttm_bo_driver member create_ttm_backend_entry * ttm_tt_create
* *
* @bdev: The buffer object device. * @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.
* *
* Create a driver specific struct ttm_backend. * Create a struct ttm_tt to back data with system memory pages.
* No pages are actually allocated.
* Returns:
* NULL: Out of memory.
*/ */
struct ttm_tt *(*ttm_tt_create)(struct ttm_bo_device *bdev,
unsigned long size,
uint32_t page_flags,
struct page *dummy_read_page);
struct ttm_backend *(*create_ttm_backend_entry) /**
(struct ttm_bo_device *bdev); * 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_bo_driver member invalidate_caches * struct ttm_bo_driver member invalidate_caches
@ -315,7 +394,8 @@ struct ttm_bo_driver {
*/ */
int (*move) (struct ttm_buffer_object *bo, int (*move) (struct ttm_buffer_object *bo,
bool evict, bool interruptible, bool evict, bool interruptible,
bool no_wait, struct ttm_mem_reg *new_mem); bool no_wait_gpu,
struct ttm_mem_reg *new_mem);
/** /**
* struct ttm_bo_driver_member verify_access * struct ttm_bo_driver_member verify_access
@ -342,10 +422,10 @@ struct ttm_bo_driver {
* documentation. * documentation.
*/ */
bool (*sync_obj_signaled) (void *sync_obj, void *sync_arg); bool (*sync_obj_signaled) (void *sync_obj);
int (*sync_obj_wait) (void *sync_obj, void *sync_arg, int (*sync_obj_wait) (void *sync_obj,
bool lazy, bool interruptible); bool lazy, bool interruptible);
int (*sync_obj_flush) (void *sync_obj, void *sync_arg); int (*sync_obj_flush) (void *sync_obj);
void (*sync_obj_unref) (void **sync_obj); void (*sync_obj_unref) (void **sync_obj);
void *(*sync_obj_ref) (void *sync_obj); void *(*sync_obj_ref) (void *sync_obj);
@ -355,7 +435,21 @@ struct ttm_bo_driver {
struct ttm_mem_reg *new_mem); struct ttm_mem_reg *new_mem);
/* notify the driver we are taking a fault on this BO /* notify the driver we are taking a fault on this BO
* and have reserved it */ * and have reserved it */
void (*fault_reserve_notify)(struct ttm_buffer_object *bo); int (*fault_reserve_notify)(struct ttm_buffer_object *bo);
/**
* notify the driver that we're about to swap out this bo
*/
void (*swap_notify) (struct ttm_buffer_object *bo);
/**
* Driver callback on when mapping io memory (for bo_move_memcpy
* for instance). TTM will take care to call io_mem_free whenever
* the mapping is not use anymore. io_mem_reserve & io_mem_free
* are balanced.
*/
int (*io_mem_reserve)(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem);
void (*io_mem_free)(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem);
}; };
/** /**
@ -363,7 +457,7 @@ struct ttm_bo_driver {
*/ */
struct ttm_bo_global_ref { struct ttm_bo_global_ref {
struct ttm_global_reference ref; struct drm_global_reference ref;
struct ttm_mem_global *mem_glob; struct ttm_mem_global *mem_glob;
}; };
@ -374,9 +468,6 @@ struct ttm_bo_global_ref {
* @dummy_read_page: Pointer to a dummy page used for mapping requests * @dummy_read_page: Pointer to a dummy page used for mapping requests
* of unpopulated pages. * of unpopulated pages.
* @shrink: A shrink callback object used for buffer object swap. * @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. * @device_list_mutex: Mutex protecting the device list.
* This mutex is held while traversing the device list for pm options. * This mutex is held while traversing the device list for pm options.
* @lru_lock: Spinlock protecting the bo subsystem lru lists. * @lru_lock: Spinlock protecting the bo subsystem lru lists.
@ -390,12 +481,10 @@ struct ttm_bo_global {
* Constant after init. * Constant after init.
*/ */
// struct kobject kobj; // struct kobject kobj;
struct ttm_mem_global *mem_glob; struct ttm_mem_global *mem_glob;
struct page *dummy_read_page; struct page *dummy_read_page;
struct ttm_mem_shrink shrink; struct ttm_mem_shrink shrink;
size_t ttm_bo_extra_size;
size_t ttm_bo_size;
struct mutex device_list_mutex; struct mutex device_list_mutex;
spinlock_t lru_lock; spinlock_t lru_lock;
@ -426,11 +515,12 @@ struct ttm_bo_global {
* *
* @driver: Pointer to a struct ttm_bo_driver struct setup by the driver. * @driver: Pointer to a struct ttm_bo_driver struct setup by the driver.
* @man: An array of mem_type_managers. * @man: An array of mem_type_managers.
* @fence_lock: Protects the synchronizing members on *all* bos belonging
* to this device.
* @addr_space_mm: Range manager for the device address space. * @addr_space_mm: Range manager for the device address space.
* lru_lock: Spinlock that protects the buffer+device lru lists and * lru_lock: Spinlock that protects the buffer+device lru lists and
* ddestroy lists. * ddestroy lists.
* @nice_mode: Try nicely to wait for buffer idle when cleaning a manager. * @val_seq: Current validation sequence.
* If a GPU lockup has been detected, this is forced to 0.
* @dev_mapping: A pointer to the struct address_space representing the * @dev_mapping: A pointer to the struct address_space representing the
* device address space. * device address space.
* @wq: Work queue structure for the delayed delete workqueue. * @wq: Work queue structure for the delayed delete workqueue.
@ -445,31 +535,32 @@ struct ttm_bo_device {
struct list_head device_list; struct list_head device_list;
struct ttm_bo_global *glob; struct ttm_bo_global *glob;
struct ttm_bo_driver *driver; struct ttm_bo_driver *driver;
rwlock_t vm_lock; rwlock_t vm_lock;
struct ttm_mem_type_manager man[TTM_NUM_MEM_TYPES]; struct ttm_mem_type_manager man[TTM_NUM_MEM_TYPES];
spinlock_t fence_lock;
/* /*
* Protected by the vm lock. * Protected by the vm lock.
*/ */
// struct rb_root addr_space_rb; struct rb_root addr_space_rb;
struct drm_mm addr_space_mm; struct drm_mm addr_space_mm;
/* /*
* Protected by the global:lru lock. * Protected by the global:lru lock.
*/ */
struct list_head ddestroy; struct list_head ddestroy;
uint32_t val_seq;
/* /*
* Protected by load / firstopen / lastclose /unload sync. * Protected by load / firstopen / lastclose /unload sync.
*/ */
bool nice_mode; struct address_space *dev_mapping;
struct address_space *dev_mapping;
/* /*
* Internal protection. * Internal protection.
*/ */
// struct delayed_work wq; struct delayed_work wq;
bool need_dma32; bool need_dma32;
}; };
@ -492,8 +583,9 @@ ttm_flag_masked(uint32_t *old, uint32_t new, uint32_t mask)
} }
/** /**
* ttm_tt_create * ttm_tt_init
* *
* @ttm: The struct ttm_tt.
* @bdev: pointer to a struct ttm_bo_device: * @bdev: pointer to a struct ttm_bo_device:
* @size: Size of the data needed backing. * @size: Size of the data needed backing.
* @page_flags: Page flags as identified by TTM_PAGE_FLAG_XX flags. * @page_flags: Page flags as identified by TTM_PAGE_FLAG_XX flags.
@ -504,28 +596,22 @@ ttm_flag_masked(uint32_t *old, uint32_t new, uint32_t mask)
* Returns: * Returns:
* NULL: Out of memory. * NULL: Out of memory.
*/ */
extern struct ttm_tt *ttm_tt_create(struct ttm_bo_device *bdev, extern int ttm_tt_init(struct ttm_tt *ttm, struct ttm_bo_device *bdev,
unsigned long size, unsigned long size, uint32_t page_flags,
uint32_t page_flags, struct page *dummy_read_page);
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);
/** /**
* ttm_tt_set_user: * ttm_tt_fini
* *
* @ttm: The struct ttm_tt to populate. * @ttm: the ttm_tt structure.
* @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.
* *
* Populate a struct ttm_tt with a user-space memory area after first pinning * Free memory of ttm_tt structure
* the pages backing it.
* Returns:
* !0: Error.
*/ */
extern void ttm_tt_fini(struct ttm_tt *ttm);
extern int ttm_tt_set_user(struct ttm_tt *ttm, extern void ttm_dma_tt_fini(struct ttm_dma_tt *ttm_dma);
struct task_struct *tsk,
unsigned long start, unsigned long num_pages);
/** /**
* ttm_ttm_bind: * ttm_ttm_bind:
@ -537,21 +623,12 @@ extern int ttm_tt_set_user(struct ttm_tt *ttm,
*/ */
extern int ttm_tt_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem); 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_ttm_destroy:
* *
* @ttm: The struct ttm_tt. * @ttm: The struct ttm_tt.
* *
* Unbind, unpopulate and destroy a struct ttm_tt. * Unbind, unpopulate and destroy common struct ttm_tt.
*/ */
extern void ttm_tt_destroy(struct ttm_tt *ttm); extern void ttm_tt_destroy(struct ttm_tt *ttm);
@ -565,19 +642,13 @@ extern void ttm_tt_destroy(struct ttm_tt *ttm);
extern void ttm_tt_unbind(struct ttm_tt *ttm); extern void ttm_tt_unbind(struct ttm_tt *ttm);
/** /**
* ttm_ttm_destroy: * ttm_tt_swapin:
* *
* @ttm: The struct ttm_tt. * @ttm: The struct ttm_tt.
* @index: Index of the desired page.
* *
* Return a pointer to the struct page backing @ttm at page * Swap in a previously swap out ttm_tt.
* index @index. If the page is unpopulated, one will be allocated to
* populate that index.
*
* Returns:
* NULL on OOM.
*/ */
extern struct page *ttm_tt_get_page(struct ttm_tt *ttm, int index); extern int ttm_tt_swapin(struct ttm_tt *ttm);
/** /**
* ttm_tt_cache_flush: * ttm_tt_cache_flush:
@ -606,7 +677,7 @@ extern void ttm_tt_cache_flush(struct page *pages[], unsigned long num_pages);
*/ */
extern int ttm_tt_set_placement_caching(struct ttm_tt *ttm, uint32_t placement); extern int ttm_tt_set_placement_caching(struct ttm_tt *ttm, uint32_t placement);
extern int ttm_tt_swapout(struct ttm_tt *ttm, extern int ttm_tt_swapout(struct ttm_tt *ttm,
struct file *persistant_swap_storage); struct file *persistent_swap_storage);
/* /*
* ttm_bo.c * ttm_bo.c
@ -632,7 +703,7 @@ extern bool ttm_mem_reg_is_pci(struct ttm_bo_device *bdev,
* @proposed_placement: Proposed new placement for the buffer object. * @proposed_placement: Proposed new placement for the buffer object.
* @mem: A struct ttm_mem_reg. * @mem: A struct ttm_mem_reg.
* @interruptible: Sleep interruptible when sliping. * @interruptible: Sleep interruptible when sliping.
* @no_wait: Don't sleep waiting for space to become available. * @no_wait_gpu: Return immediately if the GPU is busy.
* *
* Allocate memory space for the buffer object pointed to by @bo, using * Allocate memory space for the buffer object pointed to by @bo, using
* the placement flags in @mem, potentially evicting other idle buffer objects. * the placement flags in @mem, potentially evicting other idle buffer objects.
@ -646,43 +717,16 @@ extern bool ttm_mem_reg_is_pci(struct ttm_bo_device *bdev,
extern int ttm_bo_mem_space(struct ttm_buffer_object *bo, extern int ttm_bo_mem_space(struct ttm_buffer_object *bo,
struct ttm_placement *placement, struct ttm_placement *placement,
struct ttm_mem_reg *mem, struct ttm_mem_reg *mem,
bool interruptible, bool no_wait); bool interruptible,
/** bool no_wait_gpu);
* 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_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);
/** extern void ttm_bo_global_release(struct drm_global_reference *ref);
* ttm_bo_pci_offset - Get the PCI offset for the buffer object memory. extern int ttm_bo_global_init(struct drm_global_reference *ref);
*
* @bo Pointer to a struct ttm_buffer_object.
* @bus_base On return the base of the PCI region
* @bus_offset On return the byte offset into the PCI region
* @bus_size On return the byte size of the buffer object or zero if
* the buffer object memory is not accessible through a PCI region.
*
* Returns:
* -EINVAL if the buffer object is currently not mappable.
* 0 otherwise.
*/
extern int ttm_bo_pci_offset(struct ttm_bo_device *bdev,
struct ttm_mem_reg *mem,
unsigned long *bus_base,
unsigned long *bus_offset,
unsigned long *bus_size);
extern void ttm_bo_global_release(struct ttm_global_reference *ref);
extern int ttm_bo_global_init(struct ttm_global_reference *ref);
extern int ttm_bo_device_release(struct ttm_bo_device *bdev); extern int ttm_bo_device_release(struct ttm_bo_device *bdev);
@ -690,7 +734,7 @@ extern int ttm_bo_device_release(struct ttm_bo_device *bdev);
* ttm_bo_device_init * ttm_bo_device_init
* *
* @bdev: A pointer to a struct ttm_bo_device to initialize. * @bdev: A pointer to a struct ttm_bo_device to initialize.
* @mem_global: A pointer to an initialized struct ttm_mem_global. * @glob: A pointer to an initialized struct ttm_bo_global.
* @driver: A pointer to a struct ttm_bo_driver set up by the caller. * @driver: A pointer to a struct ttm_bo_driver set up by the caller.
* @file_page_offset: Offset into the device address space that is available * @file_page_offset: Offset into the device address space that is available
* for buffer data. This ensures compatibility with other users of the * for buffer data. This ensures compatibility with other users of the
@ -712,6 +756,22 @@ extern int ttm_bo_device_init(struct ttm_bo_device *bdev,
*/ */
extern void ttm_bo_unmap_virtual(struct ttm_buffer_object *bo); extern void ttm_bo_unmap_virtual(struct ttm_buffer_object *bo);
/**
* ttm_bo_unmap_virtual
*
* @bo: tear down the virtual mappings for this BO
*
* The caller must take ttm_mem_io_lock before calling this function.
*/
extern void ttm_bo_unmap_virtual_locked(struct ttm_buffer_object *bo);
extern int ttm_mem_io_reserve_vm(struct ttm_buffer_object *bo);
extern void ttm_mem_io_free_vm(struct ttm_buffer_object *bo);
extern int ttm_mem_io_lock(struct ttm_mem_type_manager *man,
bool interruptible);
extern void ttm_mem_io_unlock(struct ttm_mem_type_manager *man);
/** /**
* ttm_bo_reserve: * ttm_bo_reserve:
* *
@ -729,7 +789,7 @@ extern void ttm_bo_unmap_virtual(struct ttm_buffer_object *bo);
* different order, either by will or as a result of a buffer being evicted * different order, either by will or as a result of a buffer being evicted
* to make room for a buffer already reserved. (Buffers are reserved before * to make room for a buffer already reserved. (Buffers are reserved before
* they are evicted). The following algorithm prevents such deadlocks from * they are evicted). The following algorithm prevents such deadlocks from
* occuring: * occurring:
* 1) Buffers are reserved with the lru spinlock held. Upon successful * 1) Buffers are reserved with the lru spinlock held. Upon successful
* reservation they are removed from the lru list. This stops a reserved buffer * reservation they are removed from the lru list. This stops a reserved buffer
* from being evicted. However the lru spinlock is released between the time * from being evicted. However the lru spinlock is released between the time
@ -762,11 +822,44 @@ extern void ttm_bo_unmap_virtual(struct ttm_buffer_object *bo);
* try again. (only if use_sequence == 1). * try again. (only if use_sequence == 1).
* -ERESTARTSYS: A wait for the buffer to become unreserved was interrupted by * -ERESTARTSYS: A wait for the buffer to become unreserved was interrupted by
* a signal. Release all buffer reservations and return to user-space. * a signal. Release all buffer reservations and return to user-space.
* -EBUSY: The function needed to sleep, but @no_wait was true
* -EDEADLK: Bo already reserved using @sequence. This error code will only
* be returned if @use_sequence is set to true.
*/ */
extern int ttm_bo_reserve(struct ttm_buffer_object *bo, extern int ttm_bo_reserve(struct ttm_buffer_object *bo,
bool interruptible, bool interruptible,
bool no_wait, bool use_sequence, uint32_t sequence); bool no_wait, bool use_sequence, uint32_t sequence);
/**
* ttm_bo_reserve_locked:
*
* @bo: A pointer to a struct ttm_buffer_object.
* @interruptible: Sleep interruptible if waiting.
* @no_wait: Don't sleep while trying to reserve, rather return -EBUSY.
* @use_sequence: If @bo is already reserved, Only sleep waiting for
* it to become unreserved if @sequence < (@bo)->sequence.
*
* Must be called with struct ttm_bo_global::lru_lock held,
* and will not remove reserved buffers from the lru lists.
* The function may release the LRU spinlock if it needs to sleep.
* Otherwise identical to ttm_bo_reserve.
*
* Returns:
* -EAGAIN: The reservation may cause a deadlock.
* Release all buffer reservations, wait for @bo to become unreserved and
* try again. (only if use_sequence == 1).
* -ERESTARTSYS: A wait for the buffer to become unreserved was interrupted by
* a signal. Release all buffer reservations and return to user-space.
* -EBUSY: The function needed to sleep, but @no_wait was true
* -EDEADLK: Bo already reserved using @sequence. This error code will only
* be returned if @use_sequence is set to true.
*/
extern int ttm_bo_reserve_locked(struct ttm_buffer_object *bo,
bool interruptible,
bool no_wait, bool use_sequence,
uint32_t sequence);
/** /**
* ttm_bo_unreserve * ttm_bo_unreserve
* *
@ -776,6 +869,16 @@ extern int ttm_bo_reserve(struct ttm_buffer_object *bo,
*/ */
extern void ttm_bo_unreserve(struct ttm_buffer_object *bo); extern void ttm_bo_unreserve(struct ttm_buffer_object *bo);
/**
* ttm_bo_unreserve_locked
*
* @bo: A pointer to a struct ttm_buffer_object.
*
* Unreserve a previous reservation of @bo.
* Needs to be called with struct ttm_bo_global::lru_lock held.
*/
extern void ttm_bo_unreserve_locked(struct ttm_buffer_object *bo);
/** /**
* ttm_bo_wait_unreserved * ttm_bo_wait_unreserved
* *
@ -788,34 +891,6 @@ extern void ttm_bo_unreserve(struct ttm_buffer_object *bo);
extern int ttm_bo_wait_unreserved(struct ttm_buffer_object *bo, extern int ttm_bo_wait_unreserved(struct ttm_buffer_object *bo,
bool interruptible); bool interruptible);
/**
* ttm_bo_block_reservation
*
* @bo: A pointer to a struct ttm_buffer_object.
* @interruptible: Use interruptible sleep when waiting.
* @no_wait: Don't sleep, but rather return -EBUSY.
*
* Block reservation for validation by simply reserving the buffer.
* This is intended for single buffer use only without eviction,
* and thus needs no deadlock protection.
*
* Returns:
* -EBUSY: If no_wait == 1 and the buffer is already reserved.
* -ERESTARTSYS: If interruptible == 1 and the process received a signal
* while sleeping.
*/
extern int ttm_bo_block_reservation(struct ttm_buffer_object *bo,
bool interruptible, bool no_wait);
/**
* ttm_bo_unblock_reservation
*
* @bo: A pointer to a struct ttm_buffer_object.
*
* Unblocks reservation leaving lru lists untouched.
*/
extern void ttm_bo_unblock_reservation(struct ttm_buffer_object *bo);
/* /*
* ttm_bo_util.c * ttm_bo_util.c
*/ */
@ -825,7 +900,7 @@ extern void ttm_bo_unblock_reservation(struct ttm_buffer_object *bo);
* *
* @bo: A pointer to a struct ttm_buffer_object. * @bo: A pointer to a struct ttm_buffer_object.
* @evict: 1: This is an eviction. Don't try to pipeline. * @evict: 1: This is an eviction. Don't try to pipeline.
* @no_wait: Never sleep, but rather return with -EBUSY. * @no_wait_gpu: Return immediately if the GPU is busy.
* @new_mem: struct ttm_mem_reg indicating where to move. * @new_mem: struct ttm_mem_reg indicating where to move.
* *
* Optimized move function for a buffer object with both old and * Optimized move function for a buffer object with both old and
@ -839,7 +914,7 @@ extern void ttm_bo_unblock_reservation(struct ttm_buffer_object *bo);
*/ */
extern int ttm_bo_move_ttm(struct ttm_buffer_object *bo, extern int ttm_bo_move_ttm(struct ttm_buffer_object *bo,
bool evict, bool no_wait, bool evict, bool no_wait_gpu,
struct ttm_mem_reg *new_mem); struct ttm_mem_reg *new_mem);
/** /**
@ -847,7 +922,7 @@ extern int ttm_bo_move_ttm(struct ttm_buffer_object *bo,
* *
* @bo: A pointer to a struct ttm_buffer_object. * @bo: A pointer to a struct ttm_buffer_object.
* @evict: 1: This is an eviction. Don't try to pipeline. * @evict: 1: This is an eviction. Don't try to pipeline.
* @no_wait: Never sleep, but rather return with -EBUSY. * @no_wait_gpu: Return immediately if the GPU is busy.
* @new_mem: struct ttm_mem_reg indicating where to move. * @new_mem: struct ttm_mem_reg indicating where to move.
* *
* Fallback move function for a mappable buffer object in mappable memory. * Fallback move function for a mappable buffer object in mappable memory.
@ -861,8 +936,8 @@ extern int ttm_bo_move_ttm(struct ttm_buffer_object *bo,
*/ */
extern int ttm_bo_move_memcpy(struct ttm_buffer_object *bo, extern int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,
bool evict, bool evict, bool no_wait_gpu,
bool no_wait, struct ttm_mem_reg *new_mem); struct ttm_mem_reg *new_mem);
/** /**
* ttm_bo_free_old_node * ttm_bo_free_old_node
@ -878,10 +953,8 @@ extern void ttm_bo_free_old_node(struct ttm_buffer_object *bo);
* *
* @bo: A pointer to a struct ttm_buffer_object. * @bo: A pointer to a struct ttm_buffer_object.
* @sync_obj: A sync object that signals when moving is complete. * @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. * @evict: This is an evict move. Don't return until the buffer is idle.
* @no_wait: Never sleep, but rather return with -EBUSY. * @no_wait_gpu: Return immediately if the GPU is busy.
* @new_mem: struct ttm_mem_reg indicating where to move. * @new_mem: struct ttm_mem_reg indicating where to move.
* *
* Accelerated move function to be called when an accelerated move * Accelerated move function to be called when an accelerated move
@ -894,8 +967,7 @@ extern void ttm_bo_free_old_node(struct ttm_buffer_object *bo);
extern int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo, extern int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
void *sync_obj, void *sync_obj,
void *sync_obj_arg, bool evict, bool no_wait_gpu,
bool evict, bool no_wait,
struct ttm_mem_reg *new_mem); struct ttm_mem_reg *new_mem);
/** /**
* ttm_io_prot * ttm_io_prot
@ -906,24 +978,34 @@ extern int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
* Utility function that returns the pgprot_t that should be used for * Utility function that returns the pgprot_t that should be used for
* setting up a PTE with the caching model indicated by @c_state. * setting up a PTE with the caching model indicated by @c_state.
*/ */
extern pgprot_t ttm_io_prot(enum ttm_caching_state c_state, pgprot_t tmp); extern pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp);
extern const struct ttm_mem_type_manager_func ttm_bo_manager_func;
#if (defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && defined(MODULE))) #if (defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && defined(MODULE)))
#define TTM_HAS_AGP #define TTM_HAS_AGP
#include <linux/agp_backend.h> #include <linux/agp_backend.h>
/** /**
* ttm_agp_backend_init * ttm_agp_tt_create
* *
* @bdev: Pointer to a struct ttm_bo_device. * @bdev: Pointer to a struct ttm_bo_device.
* @bridge: The agp bridge this device is sitting on. * @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 * Create a TTM backend that uses the indicated AGP bridge as an aperture
* for TT memory. This function uses the linux agpgart interface to * for TT memory. This function uses the linux agpgart interface to
* bind and unbind memory backing a ttm_tt. * bind and unbind memory backing a ttm_tt.
*/ */
extern struct ttm_backend *ttm_agp_backend_init(struct ttm_bo_device *bdev, extern struct ttm_tt *ttm_agp_tt_create(struct ttm_bo_device *bdev,
struct agp_bridge_data *bridge); 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);
#endif #endif
#endif #endif

17
drivers/include/drm/ttm/ttm_memory.h
View File

@ -30,10 +30,11 @@
//#include <linux/workqueue.h> //#include <linux/workqueue.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
//#include <linux/wait.h> #include <linux/bug.h>
#include <linux/wait.h>
#include <linux/errno.h> #include <linux/errno.h>
//#include <linux/kobject.h> //#include <linux/kobject.h>
//#include <linux/mm.h> #include <linux/mm.h>
/** /**
* struct ttm_mem_shrink - callback to shrink TTM memory usage. * struct ttm_mem_shrink - callback to shrink TTM memory usage.
@ -41,7 +42,7 @@
* @do_shrink: The callback function. * @do_shrink: The callback function.
* *
* Arguments to the do_shrink functions are intended to be passed using * Arguments to the do_shrink functions are intended to be passed using
* inheritance. That is, the argument class derives from struct ttm_mem_srink, * inheritance. That is, the argument class derives from struct ttm_mem_shrink,
* and can be accessed using container_of(). * and can be accessed using container_of().
*/ */
@ -59,7 +60,6 @@ struct ttm_mem_shrink {
* for the GPU, and this will otherwise block other workqueue tasks(?) * for the GPU, and this will otherwise block other workqueue tasks(?)
* At this point we use only a single-threaded workqueue. * At this point we use only a single-threaded workqueue.
* @work: The workqueue callback for the shrink queue. * @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, * @lock: Lock to protect the @shrink - and the memory accounting members,
* that is, essentially the whole structure with some exceptions. * that is, essentially the whole structure with some exceptions.
* @zones: Array of pointers to accounting zones. * @zones: Array of pointers to accounting zones.
@ -77,10 +77,9 @@ struct ttm_mem_zone;
struct ttm_mem_global { struct ttm_mem_global {
// struct kobject kobj; // struct kobject kobj;
struct ttm_mem_shrink *shrink; struct ttm_mem_shrink *shrink;
// struct workqueue_struct *swap_queue; struct workqueue_struct *swap_queue;
// struct work_struct work; struct work_struct work;
// wait_queue_head_t queue; spinlock_t lock;
spinlock_t lock;
struct ttm_mem_zone *zones[TTM_MEM_MAX_ZONES]; struct ttm_mem_zone *zones[TTM_MEM_MAX_ZONES];
unsigned int num_zones; unsigned int num_zones;
struct ttm_mem_zone *zone_kernel; struct ttm_mem_zone *zone_kernel;
@ -138,7 +137,7 @@ static inline int ttm_mem_register_shrink(struct ttm_mem_global *glob,
static inline void ttm_mem_unregister_shrink(struct ttm_mem_global *glob, static inline void ttm_mem_unregister_shrink(struct ttm_mem_global *glob,
struct ttm_mem_shrink *shrink) struct ttm_mem_shrink *shrink)
{ {
spin_lock(&glob->lock); spin_lock(&glob->lock);
BUG_ON(glob->shrink != shrink); BUG_ON(glob->shrink != shrink);
glob->shrink = NULL; glob->shrink = NULL;
spin_unlock(&glob->lock); spin_unlock(&glob->lock);

20
drivers/include/drm/ttm/ttm_module.h
View File

@ -35,26 +35,6 @@
struct kobject; struct kobject;
#define TTM_PFX "[TTM] " #define TTM_PFX "[TTM] "
enum ttm_global_types {
TTM_GLOBAL_TTM_MEM = 0,
TTM_GLOBAL_TTM_BO,
TTM_GLOBAL_TTM_OBJECT,
TTM_GLOBAL_NUM
};
struct ttm_global_reference {
enum ttm_global_types global_type;
size_t size;
void *object;
int (*init) (struct ttm_global_reference *);
void (*release) (struct ttm_global_reference *);
};
extern void ttm_global_init(void);
extern void ttm_global_release(void);
extern int ttm_global_item_ref(struct ttm_global_reference *ref);
extern void ttm_global_item_unref(struct ttm_global_reference *ref);
extern struct kobject *ttm_get_kobj(void); extern struct kobject *ttm_get_kobj(void);
#endif /* _TTM_MODULE_H_ */ #endif /* _TTM_MODULE_H_ */

9
drivers/include/linux/kernel.h
View File

@ -203,7 +203,14 @@ typedef unsigned long pgprotval_t;
typedef struct pgprot { pgprotval_t pgprot; } pgprot_t; typedef struct pgprot { pgprotval_t pgprot; } pgprot_t;
struct file {}; struct file
{
struct page **pages; /* physical memory backend */
unsigned int count;
unsigned int allocated;
void *vma;
};
struct vm_area_struct {}; struct vm_area_struct {};
struct address_space {}; struct address_space {};

7
drivers/include/linux/mm.h
View File

@ -1 +1,8 @@
#ifndef _LINUX_MM_H
#define _LINUX_MM_H
#define VM_NORESERVE 0x00200000
#define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)
#endif