History

drm: fix "persistant" typo

Jan Engelhardt committed 15 years ago

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

Unified · Split

5 files
  1. drivers/gpu/drm/nouveau/nouveau_gem.c +1 −1
  2. drivers/gpu/drm/ttm/ttm_bo.c +5 −5
  3. drivers/gpu/drm/ttm/ttm_tt.c +8 −8
  4. include/drm/ttm/ttm_bo_api.h +9 −9
  5. include/drm/ttm/ttm_bo_driver.h +2 −2
drivers/gpu/drm/nouveau/nouveau_gem.c+1−1
@@ -97,7 +97,7 @@ nouveau_gem_new(struct drm_device *dev, struct nouveau_channel *chan, · 96 unmodified lines
9797 return -ENOMEM;
9898 }
9999
100− nvbo->bo.persistant_swap_storage = nvbo->gem->filp;
100+ nvbo->bo.persistent_swap_storage = nvbo->gem->filp;
101101 nvbo->gem->driver_private = nvbo;
102102 return 0;
103103 }
drivers/gpu/drm/ttm/ttm_bo.c+5−5
@@ -1168,7 +1168,7 @@ int ttm_bo_init(struct ttm_bo_device *bdev, · 1167 unmodified lines
11681168 uint32_t page_alignment,
11691169 unsigned long buffer_start,
11701170 bool interruptible,
1171− struct file *persistant_swap_storage,
1171+ struct file *persistent_swap_storage,
11721172 size_t acc_size,
11731173 void (*destroy) (struct ttm_buffer_object *))
11741174 {
@@ -1211,7 +1211,7 @@ int ttm_bo_init(struct ttm_bo_device *bdev, · 36 unmodified lines
12111211 bo->priv_flags = 0;
12121212 bo->mem.placement = (TTM_PL_FLAG_SYSTEM | TTM_PL_FLAG_CACHED);
12131213 bo->seq_valid = false;
1214− bo->persistant_swap_storage = persistant_swap_storage;
1214+ bo->persistent_swap_storage = persistent_swap_storage;
12151215 bo->acc_size = acc_size;
12161216 atomic_inc(&bo->glob->bo_count);
12171217
@@ -1260,7 +1260,7 @@ int ttm_bo_create(struct ttm_bo_device *bdev, · 42 unmodified lines
12601260 uint32_t page_alignment,
12611261 unsigned long buffer_start,
12621262 bool interruptible,
1263− struct file *persistant_swap_storage,
1263+ struct file *persistent_swap_storage,
12641264 struct ttm_buffer_object **p_bo)
12651265 {
12661266 struct ttm_buffer_object *bo;
@@ -1282,7 +1282,7 @@ int ttm_bo_create(struct ttm_bo_device *bdev, · 15 unmodified lines
12821282
12831283 ret = ttm_bo_init(bdev, bo, size, type, placement, page_alignment,
12841284 buffer_start, interruptible,
1285− persistant_swap_storage, acc_size, NULL);
1285+ persistent_swap_storage, acc_size, NULL);
12861286 if (likely(ret == 0))
12871287 *p_bo = bo;
12881288
@@ -1863,7 +1863,7 @@ static int ttm_bo_swapout(struct ttm_mem_shrink *shrink) · 574 unmodified lines
18631863 if (bo->bdev->driver->swap_notify)
18641864 bo->bdev->driver->swap_notify(bo);
18651865
1866− ret = ttm_tt_swapout(bo->ttm, bo->persistant_swap_storage);
1866+ ret = ttm_tt_swapout(bo->ttm, bo->persistent_swap_storage);
18671867 out:
18681868
18691869 /**
drivers/gpu/drm/ttm/ttm_tt.c+8−8
@@ -332,7 +332,7 @@ void ttm_tt_destroy(struct ttm_tt *ttm) · 331 unmodified lines
332332 ttm_tt_free_page_directory(ttm);
333333 }
334334
335− if (!(ttm->page_flags & TTM_PAGE_FLAG_PERSISTANT_SWAP) &&
335+ if (!(ttm->page_flags & TTM_PAGE_FLAG_PERSISTENT_SWAP) &&
336336 ttm->swap_storage)
337337 fput(ttm->swap_storage);
338338
@@ -503,7 +503,7 @@ static int ttm_tt_swapin(struct ttm_tt *ttm) · 164 unmodified lines
503503 page_cache_release(from_page);
504504 }
505505
506− if (!(ttm->page_flags & TTM_PAGE_FLAG_PERSISTANT_SWAP))
506+ if (!(ttm->page_flags & TTM_PAGE_FLAG_PERSISTENT_SWAP))
507507 fput(swap_storage);
508508 ttm->swap_storage = NULL;
509509 ttm->page_flags &= ~TTM_PAGE_FLAG_SWAPPED;
@@ -514,7 +514,7 @@ out_err: · 4 unmodified lines
514514 return ret;
515515 }
516516
517−int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistant_swap_storage)
517+int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistent_swap_storage)
518518 {
519519 struct address_space *swap_space;
520520 struct file *swap_storage;
@@ -540,7 +540,7 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistant_swap_storage) · 19 unmodified lines
540540 return 0;
541541 }
542542
543− if (!persistant_swap_storage) {
543+ if (!persistent_swap_storage) {
544544 swap_storage = shmem_file_setup("ttm swap",
545545 ttm->num_pages << PAGE_SHIFT,
546546 0);
@@ -549,7 +549,7 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistant_swap_storage) · 2 unmodified lines
549549 return PTR_ERR(swap_storage);
550550 }
551551 } else
552− swap_storage = persistant_swap_storage;
552+ swap_storage = persistent_swap_storage;
553553
554554 swap_space = swap_storage->f_path.dentry->d_inode->i_mapping;
555555
@@ -577,12 +577,12 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistant_swap_storage) · 21 unmodified lines
577577 ttm_tt_free_alloced_pages(ttm);
578578 ttm->swap_storage = swap_storage;
579579 ttm->page_flags |= TTM_PAGE_FLAG_SWAPPED;
580− if (persistant_swap_storage)
581− ttm->page_flags |= TTM_PAGE_FLAG_PERSISTANT_SWAP;
580+ if (persistent_swap_storage)
581+ ttm->page_flags |= TTM_PAGE_FLAG_PERSISTENT_SWAP;
582582
583583 return 0;
584584 out_err:
585− if (!persistant_swap_storage)
585+ if (!persistent_swap_storage)
586586 fput(swap_storage);
587587
588588 return ret;
include/drm/ttm/ttm_bo_api.h+9−9
@@ -158,9 +158,9 @@ struct ttm_tt; · 157 unmodified lines
158158 * the object is destroyed.
159159 * @event_queue: Queue for processes waiting on buffer object status change.
160160 * @mem: structure describing current placement.
161− * @persistant_swap_storage: Usually the swap storage is deleted for buffers
161+ * @persistent_swap_storage: Usually the swap storage is deleted for buffers
162162 * 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.
164164 * @ttm: TTM structure holding system pages.
165165 * @evicted: Whether the object was evicted without user-space knowing.
166166 * @cpu_writes: For synchronization. Number of cpu writers.
@@ -221,7 +221,7 @@ struct ttm_buffer_object { · 54 unmodified lines
221221 */
222222
223223 struct ttm_mem_reg mem;
224− struct file *persistant_swap_storage;
224+ struct file *persistent_swap_storage;
225225 struct ttm_tt *ttm;
226226 bool evicted;
227227
@@ -459,9 +459,9 @@ extern void ttm_bo_synccpu_write_release(struct ttm_buffer_object *bo); · 231 unmodified lines
459459 * user buffer object.
460460 * @interruptible: If needing to sleep to wait for GPU resources,
461461 * sleep interruptible.
462− * @persistant_swap_storage: Usually the swap storage is deleted for buffers
462+ * @persistent_swap_storage: Usually the swap storage is deleted for buffers
463463 * pinned in physical memory. If this behaviour is not desired, this member
464− * holds a pointer to a persistant shmem object. Typically, this would
464+ * holds a pointer to a persistent shmem object. Typically, this would
465465 * point to the shmem object backing a GEM object if TTM is used to back a
466466 * GEM user interface.
467467 * @acc_size: Accounted size for this object.
@@ -490,7 +490,7 @@ extern int ttm_bo_init(struct ttm_bo_device *bdev, · 22 unmodified lines
490490 uint32_t page_alignment,
491491 unsigned long buffer_start,
492492 bool interrubtible,
493− struct file *persistant_swap_storage,
493+ struct file *persistent_swap_storage,
494494 size_t acc_size,
495495 void (*destroy) (struct ttm_buffer_object *));
496496 /**
@@ -506,9 +506,9 @@ extern int ttm_bo_init(struct ttm_bo_device *bdev, · 9 unmodified lines
506506 * user buffer object.
507507 * @interruptible: If needing to sleep while waiting for GPU resources,
508508 * sleep interruptible.
509− * @persistant_swap_storage: Usually the swap storage is deleted for buffers
509+ * @persistent_swap_storage: Usually the swap storage is deleted for buffers
510510 * pinned in physical memory. If this behaviour is not desired, this member
511− * holds a pointer to a persistant shmem object. Typically, this would
511+ * holds a pointer to a persistent shmem object. Typically, this would
512512 * point to the shmem object backing a GEM object if TTM is used to back a
513513 * GEM user interface.
514514 * @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
528528 uint32_t page_alignment,
529529 unsigned long buffer_start,
530530 bool interruptible,
531− struct file *persistant_swap_storage,
531+ struct file *persistent_swap_storage,
532532 struct ttm_buffer_object **p_bo);
533533
534534 /**
include/drm/ttm/ttm_bo_driver.h+2−2
@@ -122,7 +122,7 @@ struct ttm_backend { · 121 unmodified lines
122122 #define TTM_PAGE_FLAG_USER_DIRTY (1 << 2)
123123 #define TTM_PAGE_FLAG_WRITE (1 << 3)
124124 #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)
126126 #define TTM_PAGE_FLAG_ZERO_ALLOC (1 << 6)
127127 #define TTM_PAGE_FLAG_DMA32 (1 << 7)
128128
@@ -714,7 +714,7 @@ extern void ttm_tt_cache_flush(struct page *pages[], unsigned long num_pages); · 585 unmodified lines
714714 */
715715 extern int ttm_tt_set_placement_caching(struct ttm_tt *ttm, uint32_t placement);
716716 extern int ttm_tt_swapout(struct ttm_tt *ttm,
717− struct file *persistant_swap_storage);
717+ struct file *persistent_swap_storage);
718718
719719 /*
720720 * 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