History

drm: fix "persistant" typo

Jan Engelhardt committed 15 years ago

Commit 5df23971 parent 758f2315 files · +25 −25Browse files

Showing the changes to include (2 of 5 files). Show all

Unified · Split

2 files
  1. include/drm/ttm/ttm_bo_api.h +9 −9
  2. include/drm/ttm/ttm_bo_driver.h +2 −2
include/drm/ttm/ttm_bo_api.h+9−9
@@ -158,9 +158,9 @@ struct ttm_tt; · 157 unmodified lines
158 * the object is destroyed.158 * the object is destroyed.
159 * @event_queue: Queue for processes waiting on buffer object status change.159 * @event_queue: Queue for processes waiting on buffer object status change.
160 * @mem: structure describing current placement.160 * @mem: structure describing current placement.
161 * @persistant_swap_storage: Usually the swap storage is deleted for buffers161 * @persistent_swap_storage: Usually the swap storage is deleted for buffers
162 * pinned in physical memory. If this behaviour is not desired, this member162 * pinned in physical memory. If this behaviour is not desired, this member
163 * holds a pointer to a persistant shmem object.163 * holds a pointer to a persistent shmem object.
164 * @ttm: TTM structure holding system pages.164 * @ttm: TTM structure holding system pages.
165 * @evicted: Whether the object was evicted without user-space knowing.165 * @evicted: Whether the object was evicted without user-space knowing.
166 * @cpu_writes: For synchronization. Number of cpu writers.166 * @cpu_writes: For synchronization. Number of cpu writers.
@@ -221,7 +221,7 @@ struct ttm_buffer_object { · 54 unmodified lines
221 */221 */
222 222
223 struct ttm_mem_reg mem;223 struct ttm_mem_reg mem;
224 struct file *persistant_swap_storage;224 struct file *persistent_swap_storage;
225 struct ttm_tt *ttm;225 struct ttm_tt *ttm;
226 bool evicted;226 bool evicted;
227 227
@@ -459,9 +459,9 @@ extern void ttm_bo_synccpu_write_release(struct ttm_buffer_object *bo); · 231 unmodified lines
459 * user buffer object.459 * user buffer object.
460 * @interruptible: If needing to sleep to wait for GPU resources,460 * @interruptible: If needing to sleep to wait for GPU resources,
461 * sleep interruptible.461 * sleep interruptible.
462 * @persistant_swap_storage: Usually the swap storage is deleted for buffers462 * @persistent_swap_storage: Usually the swap storage is deleted for buffers
463 * pinned in physical memory. If this behaviour is not desired, this member463 * pinned in physical memory. If this behaviour is not desired, this member
464 * holds a pointer to a persistant shmem object. Typically, this would464 * holds a pointer to a persistent shmem object. Typically, this would
465 * point to the shmem object backing a GEM object if TTM is used to back a465 * point to the shmem object backing a GEM object if TTM is used to back a
466 * GEM user interface.466 * GEM user interface.
467 * @acc_size: Accounted size for this object.467 * @acc_size: Accounted size for this object.
@@ -490,7 +490,7 @@ extern int ttm_bo_init(struct ttm_bo_device *bdev, · 22 unmodified lines
490 uint32_t page_alignment,490 uint32_t page_alignment,
491 unsigned long buffer_start,491 unsigned long buffer_start,
492 bool interrubtible,492 bool interrubtible,
493 struct file *persistant_swap_storage,493 struct file *persistent_swap_storage,
494 size_t acc_size,494 size_t acc_size,
495 void (*destroy) (struct ttm_buffer_object *));495 void (*destroy) (struct ttm_buffer_object *));
496/**496/**
@@ -506,9 +506,9 @@ extern int ttm_bo_init(struct ttm_bo_device *bdev, · 9 unmodified lines
506 * user buffer object.506 * user buffer object.
507 * @interruptible: If needing to sleep while waiting for GPU resources,507 * @interruptible: If needing to sleep while waiting for GPU resources,
508 * sleep interruptible.508 * sleep interruptible.
509 * @persistant_swap_storage: Usually the swap storage is deleted for buffers509 * @persistent_swap_storage: Usually the swap storage is deleted for buffers
510 * pinned in physical memory. If this behaviour is not desired, this member510 * pinned in physical memory. If this behaviour is not desired, this member
511 * holds a pointer to a persistant shmem object. Typically, this would511 * holds a pointer to a persistent shmem object. Typically, this would
512 * point to the shmem object backing a GEM object if TTM is used to back a512 * point to the shmem object backing a GEM object if TTM is used to back a
513 * GEM user interface.513 * GEM user interface.
514 * @p_bo: On successful completion *p_bo points to the created object.514 * @p_bo: On successful completion *p_bo points to the created object.
@@ -528,7 +528,7 @@ extern int ttm_bo_create(struct ttm_bo_device *bdev, · 13 unmodified lines
528 uint32_t page_alignment,528 uint32_t page_alignment,
529 unsigned long buffer_start,529 unsigned long buffer_start,
530 bool interruptible,530 bool interruptible,
531 struct file *persistant_swap_storage,531 struct file *persistent_swap_storage,
532 struct ttm_buffer_object **p_bo);532 struct ttm_buffer_object **p_bo);
533 533
534/**534/**
include/drm/ttm/ttm_bo_driver.h+2−2
@@ -122,7 +122,7 @@ struct ttm_backend { · 121 unmodified lines
122#define TTM_PAGE_FLAG_USER_DIRTY (1 << 2)122#define TTM_PAGE_FLAG_USER_DIRTY (1 << 2)
123#define TTM_PAGE_FLAG_WRITE (1 << 3)123#define TTM_PAGE_FLAG_WRITE (1 << 3)
124#define TTM_PAGE_FLAG_SWAPPED (1 << 4)124#define TTM_PAGE_FLAG_SWAPPED (1 << 4)
125#define TTM_PAGE_FLAG_PERSISTANT_SWAP (1 << 5)125#define TTM_PAGE_FLAG_PERSISTENT_SWAP (1 << 5)
126#define TTM_PAGE_FLAG_ZERO_ALLOC (1 << 6)126#define TTM_PAGE_FLAG_ZERO_ALLOC (1 << 6)
127#define TTM_PAGE_FLAG_DMA32 (1 << 7)127#define TTM_PAGE_FLAG_DMA32 (1 << 7)
128 128
@@ -714,7 +714,7 @@ extern void ttm_tt_cache_flush(struct page *pages[], unsigned long num_pages); · 585 unmodified lines
714 */714 */
715extern int ttm_tt_set_placement_caching(struct ttm_tt *ttm, uint32_t placement);715extern int ttm_tt_set_placement_caching(struct ttm_tt *ttm, uint32_t placement);
716extern int ttm_tt_swapout(struct ttm_tt *ttm,716extern int ttm_tt_swapout(struct ttm_tt *ttm,
717 struct file *persistant_swap_storage);717 struct file *persistent_swap_storage);
718 718
719/*719/*
720 * ttm_bo.c720 * ttm_bo.c

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t