drm: fix "persistant" typo (5df23979) · Commits · e / devices / android_kernel_samsung_universal8895

drivers/gpu/drm/nouveau/nouveau_gem.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -97,7 +97,7 @@ nouveau_gem_new(struct drm_device dev, struct nouveau_channel chan,
	return -ENOMEM;		return -ENOMEM;
	}		}

	nvbo->bo.persistant_swap_storage = nvbo->gem->filp;		nvbo->bo.persistent_swap_storage = nvbo->gem->filp;
	nvbo->gem->driver_private = nvbo;		nvbo->gem->driver_private = nvbo;
	return 0;		return 0;
	}		}

drivers/gpu/drm/ttm/ttm_bo.c

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1168,7 +1168,7 @@ int ttm_bo_init(struct ttm_bo_device *bdev,
	uint32_t page_alignment,		uint32_t page_alignment,
	unsigned long buffer_start,		unsigned long buffer_start,
	bool interruptible,		bool interruptible,
	struct file *persistant_swap_storage,		struct file *persistent_swap_storage,
	size_t acc_size,		size_t acc_size,
	void (destroy) (struct ttm_buffer_object ))		void (destroy) (struct ttm_buffer_object ))
	{		{
	@@ -1211,7 +1211,7 @@ int ttm_bo_init(struct ttm_bo_device *bdev,
	bo->priv_flags = 0;		bo->priv_flags = 0;
	bo->mem.placement = (TTM_PL_FLAG_SYSTEM \| TTM_PL_FLAG_CACHED);		bo->mem.placement = (TTM_PL_FLAG_SYSTEM \| TTM_PL_FLAG_CACHED);
	bo->seq_valid = false;		bo->seq_valid = false;
	bo->persistant_swap_storage = persistant_swap_storage;		bo->persistent_swap_storage = persistent_swap_storage;
	bo->acc_size = acc_size;		bo->acc_size = acc_size;
	atomic_inc(&bo->glob->bo_count);		atomic_inc(&bo->glob->bo_count);

	@@ -1260,7 +1260,7 @@ int ttm_bo_create(struct ttm_bo_device *bdev,
	uint32_t page_alignment,		uint32_t page_alignment,
	unsigned long buffer_start,		unsigned long buffer_start,
	bool interruptible,		bool interruptible,
	struct file *persistant_swap_storage,		struct file *persistent_swap_storage,
	struct ttm_buffer_object **p_bo)		struct ttm_buffer_object **p_bo)
	{		{
	struct ttm_buffer_object *bo;		struct ttm_buffer_object *bo;
	@@ -1282,7 +1282,7 @@ int ttm_bo_create(struct ttm_bo_device *bdev,

	ret = ttm_bo_init(bdev, bo, size, type, placement, page_alignment,		ret = ttm_bo_init(bdev, bo, size, type, placement, page_alignment,
	buffer_start, interruptible,		buffer_start, interruptible,
	persistant_swap_storage, acc_size, NULL);		persistent_swap_storage, acc_size, NULL);
	if (likely(ret == 0))		if (likely(ret == 0))
	*p_bo = bo;		*p_bo = bo;

	@@ -1863,7 +1863,7 @@ static int ttm_bo_swapout(struct ttm_mem_shrink *shrink)
	if (bo->bdev->driver->swap_notify)		if (bo->bdev->driver->swap_notify)
	bo->bdev->driver->swap_notify(bo);		bo->bdev->driver->swap_notify(bo);

	ret = ttm_tt_swapout(bo->ttm, bo->persistant_swap_storage);		ret = ttm_tt_swapout(bo->ttm, bo->persistent_swap_storage);
	out:		out:

	/**		/**

drivers/gpu/drm/ttm/ttm_tt.c

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -332,7 +332,7 @@ void ttm_tt_destroy(struct ttm_tt *ttm)
	ttm_tt_free_page_directory(ttm);		ttm_tt_free_page_directory(ttm);
	}		}

	if (!(ttm->page_flags & TTM_PAGE_FLAG_PERSISTANT_SWAP) &&		if (!(ttm->page_flags & TTM_PAGE_FLAG_PERSISTENT_SWAP) &&
	ttm->swap_storage)		ttm->swap_storage)
	fput(ttm->swap_storage);		fput(ttm->swap_storage);

	@@ -503,7 +503,7 @@ static int ttm_tt_swapin(struct ttm_tt *ttm)
	page_cache_release(from_page);		page_cache_release(from_page);
	}		}

	if (!(ttm->page_flags & TTM_PAGE_FLAG_PERSISTANT_SWAP))		if (!(ttm->page_flags & TTM_PAGE_FLAG_PERSISTENT_SWAP))
	fput(swap_storage);		fput(swap_storage);
	ttm->swap_storage = NULL;		ttm->swap_storage = NULL;
	ttm->page_flags &= ~TTM_PAGE_FLAG_SWAPPED;		ttm->page_flags &= ~TTM_PAGE_FLAG_SWAPPED;
	@@ -514,7 +514,7 @@ out_err:
	return ret;		return ret;
	}		}

	int ttm_tt_swapout(struct ttm_tt ttm, struct file persistant_swap_storage)		int ttm_tt_swapout(struct ttm_tt ttm, struct file persistent_swap_storage)
	{		{
	struct address_space *swap_space;		struct address_space *swap_space;
	struct file *swap_storage;		struct file *swap_storage;
	@@ -540,7 +540,7 @@ int ttm_tt_swapout(struct ttm_tt ttm, struct file persistant_swap_storage)
	return 0;		return 0;
	}		}

	if (!persistant_swap_storage) {		if (!persistent_swap_storage) {
	swap_storage = shmem_file_setup("ttm swap",		swap_storage = shmem_file_setup("ttm swap",
	ttm->num_pages << PAGE_SHIFT,		ttm->num_pages << PAGE_SHIFT,
	0);		0);
	@@ -549,7 +549,7 @@ int ttm_tt_swapout(struct ttm_tt ttm, struct file persistant_swap_storage)
	return PTR_ERR(swap_storage);		return PTR_ERR(swap_storage);
	}		}
	} else		} else
	swap_storage = persistant_swap_storage;		swap_storage = persistent_swap_storage;

	swap_space = swap_storage->f_path.dentry->d_inode->i_mapping;		swap_space = swap_storage->f_path.dentry->d_inode->i_mapping;

	@@ -577,12 +577,12 @@ int ttm_tt_swapout(struct ttm_tt ttm, struct file persistant_swap_storage)
	ttm_tt_free_alloced_pages(ttm);		ttm_tt_free_alloced_pages(ttm);
	ttm->swap_storage = swap_storage;		ttm->swap_storage = swap_storage;
	ttm->page_flags \|= TTM_PAGE_FLAG_SWAPPED;		ttm->page_flags \|= TTM_PAGE_FLAG_SWAPPED;
	if (persistant_swap_storage)		if (persistent_swap_storage)
	ttm->page_flags \|= TTM_PAGE_FLAG_PERSISTANT_SWAP;		ttm->page_flags \|= TTM_PAGE_FLAG_PERSISTENT_SWAP;

	return 0;		return 0;
	out_err:		out_err:
	if (!persistant_swap_storage)		if (!persistent_swap_storage)
	fput(swap_storage);		fput(swap_storage);

	return ret;		return ret;

include/drm/ttm/ttm_bo_api.h

+9 −9

Original line number	Original line	Diff line number	Diff line
	@@ -158,9 +158,9 @@ struct ttm_tt;
	* 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.
	* @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.
	@@ -221,7 +221,7 @@ struct ttm_buffer_object {
	*/		*/

	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;

	@@ -459,9 +459,9 @@ extern void ttm_bo_synccpu_write_release(struct ttm_buffer_object *bo);
	* user buffer object.		* 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.
	* @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. Typically, this would		* holds a pointer to a persistent shmem object. Typically, this would
	* point to the shmem object backing a GEM object if TTM is used to back a		* point to the shmem object backing a GEM object if TTM is used to back a
	* GEM user interface.		* GEM user interface.
	* @acc_size: Accounted size for this object.		* @acc_size: Accounted size for this object.
	@@ -490,7 +490,7 @@ extern int ttm_bo_init(struct ttm_bo_device *bdev,
	uint32_t page_alignment,		uint32_t page_alignment,
	unsigned long buffer_start,		unsigned long buffer_start,
	bool interrubtible,		bool interrubtible,
	struct file *persistant_swap_storage,		struct file *persistent_swap_storage,
	size_t acc_size,		size_t acc_size,
	void (destroy) (struct ttm_buffer_object ));		void (destroy) (struct ttm_buffer_object ));
	/**		/**
	@@ -506,9 +506,9 @@ extern int ttm_bo_init(struct ttm_bo_device *bdev,
	* user buffer object.		* 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.
	* @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. Typically, this would		* holds a pointer to a persistent shmem object. Typically, this would
	* point to the shmem object backing a GEM object if TTM is used to back a		* point to the shmem object backing a GEM object if TTM is used to back a
	* GEM user interface.		* GEM user interface.
	* @p_bo: On successful completion *p_bo points to the created object.		* @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,
	uint32_t page_alignment,		uint32_t page_alignment,
	unsigned long buffer_start,		unsigned long buffer_start,
	bool interruptible,		bool interruptible,
	struct file *persistant_swap_storage,		struct file *persistent_swap_storage,
	struct ttm_buffer_object **p_bo);		struct ttm_buffer_object **p_bo);

	/**		/**

include/drm/ttm/ttm_bo_driver.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -122,7 +122,7 @@ struct ttm_backend {
	#define TTM_PAGE_FLAG_USER_DIRTY (1 << 2)		#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_PERSISTANT_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)

	@@ -714,7 +714,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