drm/ttm: cleanup coding style in ttm_bo_api.h
Subsystems (10)
PATCH 1/11 drm/ttm: cleanup coding style in ttm_bo_api.h
From: Christian König <[email protected]>
Extern is the default for function declerations anyway and this solves a bunch of 80char per line issues.
--- include/drm/ttm/ttm_bo_api.h | 135 ++++++++++++++++++------------------------- 1 file changed, 56 insertions(+), 79 deletions(-)
include/drm/ttm/ttm_bo_api.h +56 -79
@@ -288,8 +288,7 @@ ttm_bo_reference(struct ttm_buffer_object *bo)* Returns -EBUSY if no_wait is true and the buffer is busy. * Returns -ERESTARTSYS if interrupted by a signal. */ -extern int ttm_bo_wait (struct ttm_buffer_object *bo, -bool interruptible,bool no_wait); +int ttm_bo_wait (struct ttm_buffer_object *bo,bool interruptible,bool no_wait);/** * ttm_bo_mem_compat - Check if proposed placement is compatible with a bo
@@ -300,9 +299,8 @@ extern int ttm_bo_wait(struct ttm_buffer_object *bo,* * Returns true if the placement is compatible */ -extern bool ttm_bo_mem_compat (struct ttm_placement *placement, -struct ttm_mem_reg *mem, -uint32_t *new_flags); +bool ttm_bo_mem_compat (struct ttm_placement *placement,struct ttm_mem_reg *mem, +uint32_t *new_flags);/** * ttm_bo_validate
@@ -320,10 +318,10 @@ extern bool ttm_bo_mem_compat(struct ttm_placement *placement,* -EBUSY if no_wait is true and buffer busy. * -ERESTARTSYS if interrupted by a signal. */ -extern int ttm_bo_validate (struct ttm_buffer_object *bo, -struct ttm_placement *placement, -bool interruptible, -bool no_wait_gpu); +int ttm_bo_validate (struct ttm_buffer_object *bo, +struct ttm_placement *placement, +bool interruptible, +bool no_wait_gpu);/** * ttm_bo_unref
@@ -332,7 +330,7 @@ extern int ttm_bo_validate(struct ttm_buffer_object *bo,* * Unreference and clear a pointer to a buffer object. */ -extern void ttm_bo_unref (struct ttm_buffer_object **bo); +void ttm_bo_unref (struct ttm_buffer_object **bo);/**
@@ -344,8 +342,8 @@ extern void ttm_bo_unref(struct ttm_buffer_object **bo);* * 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); +void ttm_bo_list_ref_sub (struct ttm_buffer_object *bo,int count, +bool never_free);/** * ttm_bo_add_to_lru
@@ -357,7 +355,7 @@ extern void ttm_bo_list_ref_sub(struct ttm_buffer_object *bo, int count,* 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); +void ttm_bo_add_to_lru (struct ttm_buffer_object *bo);/** * ttm_bo_del_from_lru
@@ -369,7 +367,7 @@ extern void ttm_bo_add_to_lru(struct ttm_buffer_object *bo);* 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); +int ttm_bo_del_from_lru (struct ttm_buffer_object *bo);/** * ttm_bo_move_to_lru_tail
@@ -380,7 +378,7 @@ extern int ttm_bo_del_from_lru(struct ttm_buffer_object *bo);* object. This function must be called with struct ttm_bo_global::lru_lock * held, and is used to make a BO less likely to be considered for eviction. */ -extern void ttm_bo_move_to_lru_tail (struct ttm_buffer_object *bo); +void ttm_bo_move_to_lru_tail (struct ttm_buffer_object *bo);/** * ttm_bo_lock_delayed_workqueue
@@ -389,15 +387,14 @@ extern void ttm_bo_move_to_lru_tail(struct ttm_buffer_object *bo);* Returns * True if the workqueue was queued at the time */ -extern int ttm_bo_lock_delayed_workqueue (struct ttm_bo_device *bdev); +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); +void ttm_bo_unlock_delayed_workqueue (struct ttm_bo_device *bdev,int resched);/** * ttm_bo_eviction_valuable
@@ -424,8 +421,7 @@ bool ttm_bo_eviction_valuable(struct ttm_buffer_object *bo,* -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); +int ttm_bo_synccpu_write_grab (struct ttm_buffer_object *bo,bool no_wait);/** * ttm_bo_synccpu_write_release:
@@ -434,7 +430,7 @@ ttm_bo_synccpu_write_grab(struct ttm_buffer_object *bo, bool no_wait);* * Releases a synccpu lock. */ -extern void ttm_bo_synccpu_write_release (struct ttm_buffer_object *bo); +void ttm_bo_synccpu_write_release (struct ttm_buffer_object *bo);/** * ttm_bo_acc_size
@@ -493,18 +489,18 @@ size_t ttm_bo_dma_acc_size(struct ttm_bo_device *bdev,* -ERESTARTSYS: Interrupted by signal while sleeping waiting for resources. */ -extern int ttm_bo_init_reserved (struct ttm_bo_device *bdev, -struct ttm_buffer_object *bo, -unsigned long size, -enum ttm_bo_type type, -struct ttm_placement *placement, -uint32_t page_alignment, -bool interrubtible, -struct file *persistent_swap_storage, -size_t acc_size, -struct sg_table *sg, -struct reservation_object *resv, -void (*destroy) (struct ttm_buffer_object *)); +int ttm_bo_init_reserved (struct ttm_bo_device *bdev, +struct ttm_buffer_object *bo, +unsigned long size, +enum ttm_bo_type type, +struct ttm_placement *placement, +uint32_t page_alignment, +bool interrubtible, +struct file *persistent_swap_storage, +size_t acc_size, +struct sg_table *sg, +struct reservation_object *resv, +void (*destroy) (struct ttm_buffer_object *));/** * ttm_bo_init
@@ -544,19 +540,13 @@ extern int ttm_bo_init_reserved(struct ttm_bo_device *bdev,* -EINVAL: Invalid placement flags. * -ERESTARTSYS: Interrupted by signal while sleeping waiting for resources. */ - -extern int ttm_bo_init (struct ttm_bo_device *bdev, -struct ttm_buffer_object *bo, -unsigned long size, -enum ttm_bo_type type, -struct ttm_placement *placement, -uint32_t page_alignment, -bool interrubtible, -struct file *persistent_swap_storage, -size_t acc_size, -struct sg_table *sg, -struct reservation_object *resv, -void (*destroy) (struct ttm_buffer_object *)); +int ttm_bo_init (struct ttm_bo_device *bdev,struct ttm_buffer_object *bo, +unsigned long size,enum ttm_bo_type type, +struct ttm_placement *placement, +uint32_t page_alignment,bool interrubtible, +struct file *persistent_swap_storage,size_t acc_size, +struct sg_table *sg,struct reservation_object *resv, +void (*destroy) (struct ttm_buffer_object *));/** * ttm_bo_create
@@ -582,15 +572,11 @@ extern int ttm_bo_init(struct ttm_bo_device *bdev,* -EINVAL: Invalid placement flags. * -ERESTARTSYS: Interrupted by signal while waiting for resources. */ - -extern int ttm_bo_create (struct ttm_bo_device *bdev, -unsigned long size, -enum ttm_bo_type type, -struct ttm_placement *placement, -uint32_t page_alignment, -bool interruptible, -struct file *persistent_swap_storage, -struct ttm_buffer_object **p_bo); +int ttm_bo_create (struct ttm_bo_device *bdev,unsigned long size, +enum ttm_bo_type type,struct ttm_placement *placement, +uint32_t page_alignment,bool interruptible, +struct file *persistent_swap_storage, +struct ttm_buffer_object **p_bo);/** * ttm_bo_init_mm
@@ -607,9 +593,9 @@ extern int ttm_bo_create(struct ttm_bo_device *bdev,* -ENOMEM: Not enough memory. * May also return driver-specified errors. */ +int ttm_bo_init_mm (struct ttm_bo_device *bdev,unsigned type, +unsigned long p_size); -extern int ttm_bo_init_mm (struct ttm_bo_device *bdev,unsigned type, -unsigned long p_size);/** * ttm_bo_clean_mm *
@@ -636,8 +622,7 @@ extern int ttm_bo_init_mm(struct ttm_bo_device *bdev, unsigned type,* -EINVAL: invalid or uninitialized memory type. * -EBUSY: There are still buffers left in this memory type. */ - -extern int ttm_bo_clean_mm (struct ttm_bo_device *bdev,unsigned mem_type); +int ttm_bo_clean_mm (struct ttm_bo_device *bdev,unsigned mem_type);/** * ttm_bo_evict_mm
@@ -657,8 +642,7 @@ extern int ttm_bo_clean_mm(struct ttm_bo_device *bdev, unsigned mem_type);* -ERESTARTSYS: The call was interrupted by a signal while waiting to * evict a buffer. */ - -extern int ttm_bo_evict_mm (struct ttm_bo_device *bdev,unsigned mem_type); +int ttm_bo_evict_mm (struct ttm_bo_device *bdev,unsigned mem_type);/** * ttm_kmap_obj_virtual
@@ -671,7 +655,6 @@ extern int ttm_bo_evict_mm(struct ttm_bo_device *bdev, unsigned mem_type);* If *is_iomem is 1 on return, the virtual address points to an io memory area, * that should strictly be accessed by the iowriteXX() and similar functions. */ -static inline void *ttm_kmap_obj_virtual (struct ttm_bo_kmap_obj *map,bool *is_iomem) {
@@ -695,9 +678,8 @@ static inline void *ttm_kmap_obj_virtual(struct ttm_bo_kmap_obj *map,* -ENOMEM: Out of memory. * -EINVAL: Invalid range. */ - -extern int ttm_bo_kmap (struct ttm_buffer_object *bo,unsigned long start_page, -unsigned long num_pages,struct ttm_bo_kmap_obj *map); +int ttm_bo_kmap (struct ttm_buffer_object *bo,unsigned long start_page, +unsigned long num_pages,struct ttm_bo_kmap_obj *map);/** * ttm_bo_kunmap
@@ -706,8 +688,7 @@ extern int ttm_bo_kmap(struct ttm_buffer_object *bo, unsigned long start_page,* * Unmaps a kernel map set up by ttm_bo_kmap. */ - -extern void ttm_bo_kunmap (struct ttm_bo_kmap_obj *map); +void ttm_bo_kunmap (struct ttm_bo_kmap_obj *map);/** * ttm_fbdev_mmap - mmap fbdev memory backed by a ttm buffer object.
@@ -719,9 +700,7 @@ extern void ttm_bo_kunmap(struct ttm_bo_kmap_obj *map);* This function is intended to be called by the fbdev mmap method * if the fbdev address space is to be backed by a bo. */ - -extern int ttm_fbdev_mmap (struct vm_area_struct *vma, -struct ttm_buffer_object *bo); +int ttm_fbdev_mmap (struct vm_area_struct *vma,struct ttm_buffer_object *bo);/** * ttm_bo_default_iomem_pfn - get a pfn for a page offset
@@ -744,9 +723,8 @@ unsigned long ttm_bo_default_io_mem_pfn(struct ttm_buffer_object *bo,* This function is intended to be called by the device mmap method. * if the device address space is to be backed by the bo manager. */ - -extern int ttm_bo_mmap (struct file *filp,struct vm_area_struct *vma, -struct ttm_bo_device *bdev); +int ttm_bo_mmap (struct file *filp,struct vm_area_struct *vma, +struct ttm_bo_device *bdev);/** * ttm_bo_io
@@ -768,11 +746,10 @@ extern int ttm_bo_mmap(struct file *filp, struct vm_area_struct *vma,* the function may return -ERESTARTSYS if * interrupted by a signal. */ +ssize_t ttm_bo_io (struct ttm_bo_device *bdev,struct file *filp, +const char __user *wbuf,char __user *rbuf, +size_t count,loff_t *f_pos,bool write); -extern ssize_t ttm_bo_io (struct ttm_bo_device *bdev,struct file *filp, -const char __user *wbuf,char __user *rbuf, -size_t count,loff_t *f_pos,bool write); - -extern void ttm_bo_swapout_all (struct ttm_bo_device *bdev); -extern int ttm_bo_wait_unreserved (struct ttm_buffer_object *bo); +void ttm_bo_swapout_all (struct ttm_bo_device *bdev); +int ttm_bo_wait_unreserved (struct ttm_buffer_object *bo);#endif
Signature · 6 lines
2.5.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/11 drm/ttm: cleanup ttm_bo_driver.h
From: Christian König <[email protected]>
Extern is the default for function declerations anyway.
--- include/drm/ttm/ttm_bo_driver.h | 113 +++++++++++++++++++--------------------- 1 file changed, 54 insertions(+), 59 deletions(-)
include/drm/ttm/ttm_bo_driver.h +54 -59
@@ -608,12 +608,12 @@ 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); +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); +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_fini
@@ -622,8 +622,8 @@ extern int ttm_dma_tt_init(struct ttm_dma_tt *ttm_dma, struct ttm_bo_device *bde* * Free memory of ttm_tt structure */ -extern void ttm_tt_fini (struct ttm_tt *ttm); -extern void ttm_dma_tt_fini (struct ttm_dma_tt *ttm_dma); +void ttm_tt_fini (struct ttm_tt *ttm); +void ttm_dma_tt_fini (struct ttm_dma_tt *ttm_dma);/** * ttm_ttm_bind:
@@ -633,7 +633,7 @@ extern void ttm_dma_tt_fini(struct ttm_dma_tt *ttm_dma);* * Bind the pages of @ttm to an aperture location identified by @bo_mem */ -extern int ttm_tt_bind (struct ttm_tt *ttm,struct ttm_mem_reg *bo_mem); +int ttm_tt_bind (struct ttm_tt *ttm,struct ttm_mem_reg *bo_mem);/** * ttm_ttm_destroy:
@@ -642,7 +642,7 @@ extern int ttm_tt_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem);* * Unbind, unpopulate and destroy common struct ttm_tt. */ -extern void ttm_tt_destroy (struct ttm_tt *ttm); +void ttm_tt_destroy (struct ttm_tt *ttm);/** * ttm_ttm_unbind:
@@ -651,7 +651,7 @@ extern void ttm_tt_destroy(struct ttm_tt *ttm);* * Unbind a struct ttm_tt. */ -extern void ttm_tt_unbind (struct ttm_tt *ttm); +void ttm_tt_unbind (struct ttm_tt *ttm);/** * ttm_tt_swapin:
@@ -660,7 +660,7 @@ extern void ttm_tt_unbind(struct ttm_tt *ttm);* * Swap in a previously swap out ttm_tt. */ -extern int ttm_tt_swapin (struct ttm_tt *ttm); +int ttm_tt_swapin (struct ttm_tt *ttm);/** * ttm_tt_set_placement_caching:
@@ -675,9 +675,8 @@ extern int ttm_tt_swapin(struct ttm_tt *ttm);* hit RAM. This function may be very costly as it involves global TLB * and cache flushes and potential page splitting / combining. */ -extern int ttm_tt_set_placement_caching (struct ttm_tt *ttm,uint32_t placement); -extern int ttm_tt_swapout (struct ttm_tt *ttm, -struct file *persistent_swap_storage); +int ttm_tt_set_placement_caching (struct ttm_tt *ttm,uint32_t placement); +int ttm_tt_swapout (struct ttm_tt *ttm,struct file *persistent_swap_storage);/** * ttm_tt_unpopulate - free pages from a ttm
@@ -686,7 +685,7 @@ extern int ttm_tt_swapout(struct ttm_tt *ttm,* * Calls the driver method to free all pages from a ttm */ -extern void ttm_tt_unpopulate (struct ttm_tt *ttm); +void ttm_tt_unpopulate (struct ttm_tt *ttm);/* * ttm_bo.c
@@ -701,8 +700,7 @@ extern void ttm_tt_unpopulate(struct ttm_tt *ttm);* Returns true if the memory described by @mem is PCI memory, * false otherwise. */ -extern bool ttm_mem_reg_is_pci (struct ttm_bo_device *bdev, -struct ttm_mem_reg *mem); +bool ttm_mem_reg_is_pci (struct ttm_bo_device *bdev,struct ttm_mem_reg *mem);/** * ttm_bo_mem_space
@@ -723,21 +721,20 @@ extern bool ttm_mem_reg_is_pci(struct ttm_bo_device *bdev,* fragmentation or concurrent allocators. * -ERESTARTSYS: An interruptible sleep was interrupted by a signal. */ -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); - -extern void ttm_bo_mem_put (struct ttm_buffer_object *bo, +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); + +void ttm_bo_mem_put (struct ttm_buffer_object *bo,struct ttm_mem_reg *mem); +void ttm_bo_mem_put_locked (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); -extern int ttm_bo_global_init (struct drm_global_reference *ref); +void ttm_bo_global_release (struct drm_global_reference *ref); +int ttm_bo_global_init (struct drm_global_reference *ref); -extern int ttm_bo_device_release (struct ttm_bo_device *bdev); +int ttm_bo_device_release (struct ttm_bo_device *bdev);/** * ttm_bo_device_init
@@ -754,18 +751,17 @@ extern int ttm_bo_device_release(struct ttm_bo_device *bdev);* Returns: * !0: Failure. */ -extern int ttm_bo_device_init (struct ttm_bo_device *bdev, -struct ttm_bo_global *glob, -struct ttm_bo_driver *driver, -struct address_space *mapping, -uint64_t file_page_offset,bool need_dma32); +int ttm_bo_device_init (struct ttm_bo_device *bdev,struct ttm_bo_global *glob, +struct ttm_bo_driver *driver, +struct address_space *mapping, +uint64_t file_page_offset,bool need_dma32);/** * ttm_bo_unmap_virtual * * @bo: tear down the virtual mappings for this BO */ -extern void ttm_bo_unmap_virtual (struct ttm_buffer_object *bo); +void ttm_bo_unmap_virtual (struct ttm_buffer_object *bo);/** * ttm_bo_unmap_virtual
@@ -774,16 +770,15 @@ extern void ttm_bo_unmap_virtual(struct ttm_buffer_object *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); +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); +int ttm_mem_io_reserve_vm (struct ttm_buffer_object *bo); +void ttm_mem_io_free_vm (struct ttm_buffer_object *bo); +int ttm_mem_io_lock (struct ttm_mem_type_manager *man,bool interruptible); +void ttm_mem_io_unlock (struct ttm_mem_type_manager *man); -extern void ttm_bo_del_sub_from_lru (struct ttm_buffer_object *bo); -extern void ttm_bo_add_to_lru (struct ttm_buffer_object *bo); +void ttm_bo_del_sub_from_lru (struct ttm_buffer_object *bo); +void ttm_bo_add_to_lru (struct ttm_buffer_object *bo);/** * __ttm_bo_reserve:
@@ -989,9 +984,9 @@ void ttm_mem_io_free(struct ttm_bo_device *bdev,* !0: Failure. */ -extern int ttm_bo_move_ttm (struct ttm_buffer_object *bo, -bool interruptible,bool no_wait_gpu, -struct ttm_mem_reg *new_mem); +int ttm_bo_move_ttm (struct ttm_buffer_object *bo, +bool interruptible,bool no_wait_gpu, +struct ttm_mem_reg *new_mem);/** * ttm_bo_move_memcpy
@@ -1011,9 +1006,9 @@ extern int ttm_bo_move_ttm(struct ttm_buffer_object *bo,* !0: Failure. */ -extern int ttm_bo_move_memcpy (struct ttm_buffer_object *bo, -bool interruptible,bool no_wait_gpu, -struct ttm_mem_reg *new_mem); +int ttm_bo_move_memcpy (struct ttm_buffer_object *bo, +bool interruptible,bool no_wait_gpu, +struct ttm_mem_reg *new_mem);/** * ttm_bo_free_old_node
@@ -1022,7 +1017,7 @@ extern int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,* * Utility function to free an old placement after a successful move. */ -extern void ttm_bo_free_old_node (struct ttm_buffer_object *bo); +void ttm_bo_free_old_node (struct ttm_buffer_object *bo);/** * ttm_bo_move_accel_cleanup.
@@ -1040,9 +1035,9 @@ extern void ttm_bo_free_old_node(struct ttm_buffer_object *bo);* buffer moves. */ -extern int ttm_bo_move_accel_cleanup (struct ttm_buffer_object *bo, -struct fence *fence,bool evict, -struct ttm_mem_reg *new_mem); +int ttm_bo_move_accel_cleanup (struct ttm_buffer_object *bo, +struct fence *fence,bool evict, +struct ttm_mem_reg *new_mem);/** * ttm_bo_pipeline_move.
@@ -1068,7 +1063,7 @@ int ttm_bo_pipeline_move(struct ttm_buffer_object *bo,* Utility function that returns the pgprot_t that should be used for * setting up a PTE with the caching model indicated by @c_state. */ -extern pgprot_t ttm_io_prot (uint32_t caching_flags,pgprot_t tmp); +pgprot_t ttm_io_prot (uint32_t caching_flags,pgprot_t tmp);extern const struct ttm_mem_type_manager_func ttm_bo_manager_func;
@@ -1089,10 +1084,10 @@ extern const struct ttm_mem_type_manager_func ttm_bo_manager_func;* 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); +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);#endif
Signature · 6 lines
2.5.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
A message that is not in the archive (sent off-list or not yet received): 1493310244-2940-1-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org
PATCH 3/11 drm/ttm: remove cur_placement
From: Christian König <[email protected]>
Not used any more.
--- drivers/gpu/drm/ttm/ttm_bo.c | 5 ++--- include/drm/ttm/ttm_bo_api.h | 1 - 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +2 -3
@@ -372,11 +372,10 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo, bo->evicted = false; } -if (bo->mem.mm_node) { +if (bo->mem.mm_node) bo->offset = (bo->mem.start <<PAGE_SHIFT ) + bdev->man[bo->mem.mem_type].gpu_offset; - bo->cur_placement = bo->mem.placement; - }else +else bo->offset =0 ;return 0 ;
include/drm/ttm/ttm_bo_api.h +0 -1
@@ -224,7 +224,6 @@ struct ttm_buffer_object {*/ uint64_t offset;/* GPU address space is independent of CPU word size */ -uint32_t cur_placement;struct sg_table *sg;
Signature · 6 lines
2.5.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/11 drm/ttm: use an operation ctx for ttm_bo_init_reserved
In reply to a message not in the archiveFrom: Christian König <[email protected]>
Instead of specifying if sleeping should be interruptible.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 3 ++- drivers/gpu/drm/ttm/ttm_bo.c | 12 +++++------- include/drm/ttm/ttm_bo_api.h | 5 ++--- 3 files changed, 9 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +2 -1
@@ -319,6 +319,7 @@ int amdgpu_bo_create_restricted(struct amdgpu_device *adev,struct reservation_object *resv, struct amdgpu_bo **bo_ptr) { + struct ttm_operation_ctx ctx = { !kernel, false };struct amdgpu_bo *bo;enum ttm_bo_type type;unsigned long page_align;
@@ -396,7 +397,7 @@ int amdgpu_bo_create_restricted(struct amdgpu_device *adev, initial_bytes_moved =atomic64_read (&adev->num_bytes_moved); r =ttm_bo_init_reserved (&adev->mman.bdev, &bo->tbo, size, type, - &bo->placement, page_align, !kernel,NULL , + &bo->placement, page_align, &ctx,NULL , acc_size, sg, resv, &amdgpu_ttm_bo_destroy);amdgpu_cs_report_moved_bytes (adev,atomic64_read (&adev->num_bytes_moved) - initial_bytes_moved);
drivers/gpu/drm/ttm/ttm_bo.c +5 -7
@@ -1130,7 +1130,7 @@ int ttm_bo_init_reserved(struct ttm_bo_device *bdev,enum ttm_bo_type type, struct ttm_placement *placement, uint32_t page_alignment, - bool interruptible, + struct ttm_operation_ctx *ctx, struct file *persistent_swap_storage, size_t acc_size, struct sg_table *sg,
@@ -1216,11 +1216,8 @@ int ttm_bo_init_reserved(struct ttm_bo_device *bdev,WARN_ON (!locked); } -if (likely (!ret)) { -struct ttm_operation_ctx ctx = { interruptible, false }; - - ret =ttm_bo_validate (bo, placement, &ctx); - } +if (likely (!ret)) + ret =ttm_bo_validate (bo, placement, ctx);if (unlikely (ret)) {if (!resv)
@@ -1253,10 +1250,11 @@ int ttm_bo_init(struct ttm_bo_device *bdev,struct reservation_object *resv, void (*destroy) (struct ttm_buffer_object *)) { + struct ttm_operation_ctx ctx = { interruptible, false };int ret; ret =ttm_bo_init_reserved (bdev, bo, size, type, placement, - page_alignment, interruptible, + page_alignment, &ctx, persistent_swap_storage, acc_size, sg, resv, destroy);if (ret)
include/drm/ttm/ttm_bo_api.h +2 -3
@@ -468,8 +468,7 @@ 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. -* @interruptible: If needing to sleep to wait for GPU resources, -* sleep interruptible. +* @ctx: TTM operation context for memory allocation. * @persistent_swap_storage: Usually the swap storage is deleted for buffers * pinned in physical memory. If this behaviour is not desired, this member * holds a pointer to a persistent shmem object. Typically, this would
@@ -506,7 +505,7 @@ int ttm_bo_init_reserved(struct ttm_bo_device *bdev,enum ttm_bo_type type, struct ttm_placement *placement, uint32_t page_alignment, - bool interrubtible, + struct ttm_operation_ctx *ctx, struct file *persistent_swap_storage, size_t acc_size, struct sg_table *sg,
Signature · 6 lines
2.5.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/11 drm/ttm: use an operation context for ttm_bo_mem_space
In reply to a message not in the archiveFrom: Christian König <[email protected]>
Instead of specifying interruptible and no_wait_gpu manually.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 8 ++++---- drivers/gpu/drm/nouveau/nouveau_bo.c | 6 ++++-- drivers/gpu/drm/radeon/radeon_ttm.c | 8 ++++---- drivers/gpu/drm/ttm/ttm_bo.c | 22 +++++++++++----------- include/drm/ttm/ttm_bo_driver.h | 3 +-- 5 files changed, 24 insertions(+), 23 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +4 -4
@@ -369,6 +369,7 @@ static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo,bool no_wait_gpu, struct ttm_mem_reg *new_mem) { + struct ttm_operation_ctx ctx = { interruptible, no_wait_gpu };struct amdgpu_device *adev;struct ttm_mem_reg *old_mem = &bo->mem;struct ttm_mem_reg tmp_mem;
@@ -386,8 +387,7 @@ static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo, placements.fpfn =0 ; placements.lpfn = adev->mc.gtt_size >>PAGE_SHIFT ; placements.flags =TTM_PL_MASK_CACHING |TTM_PL_FLAG_TT ; - r =ttm_bo_mem_space (bo, &placement, &tmp_mem, - interruptible, no_wait_gpu); + r =ttm_bo_mem_space (bo, &placement, &tmp_mem, &ctx);if (unlikely (r)) {return r; }
@@ -416,6 +416,7 @@ static int amdgpu_move_ram_vram(struct ttm_buffer_object *bo,bool no_wait_gpu, struct ttm_mem_reg *new_mem) { + struct ttm_operation_ctx ctx = { interruptible, no_wait_gpu };struct amdgpu_device *adev;struct ttm_mem_reg *old_mem = &bo->mem;struct ttm_mem_reg tmp_mem;
@@ -433,8 +434,7 @@ static int amdgpu_move_ram_vram(struct ttm_buffer_object *bo, placements.fpfn =0 ; placements.lpfn = adev->mc.gtt_size >>PAGE_SHIFT ; placements.flags =TTM_PL_MASK_CACHING |TTM_PL_FLAG_TT ; - r =ttm_bo_mem_space (bo, &placement, &tmp_mem, - interruptible, no_wait_gpu); + r =ttm_bo_mem_space (bo, &placement, &tmp_mem, &ctx);if (unlikely (r)) {return r; }
drivers/gpu/drm/nouveau/nouveau_bo.c +4 -2
@@ -1126,6 +1126,7 @@ static int nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr, bool no_wait_gpu, struct ttm_mem_reg *new_mem) { + struct ttm_operation_ctx ctx = { intr, no_wait_gpu }; struct ttm_place placement_memtype = { .fpfn = 0, .lpfn = 0,
@@ -1140,7 +1141,7 @@ nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr, tmp_mem = *new_mem; tmp_mem.mm_node =NULL ; - ret =ttm_bo_mem_space (bo, &placement, &tmp_mem, intr, no_wait_gpu); + ret =ttm_bo_mem_space (bo, &placement, &tmp_mem, &ctx);if (ret)return ret;
@@ -1162,6 +1163,7 @@ static int nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict, bool intr, bool no_wait_gpu, struct ttm_mem_reg *new_mem) { + struct ttm_operation_ctx ctx = { intr, no_wait_gpu }; struct ttm_place placement_memtype = { .fpfn = 0, .lpfn = 0,
@@ -1176,7 +1178,7 @@ nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict, bool intr, tmp_mem = *new_mem; tmp_mem.mm_node =NULL ; - ret =ttm_bo_mem_space (bo, &placement, &tmp_mem, intr, no_wait_gpu); + ret =ttm_bo_mem_space (bo, &placement, &tmp_mem, &ctx);if (ret)return ret;
drivers/gpu/drm/radeon/radeon_ttm.c +4 -4
@@ -311,6 +311,7 @@ static int radeon_move_vram_ram(struct ttm_buffer_object *bo,bool no_wait_gpu, struct ttm_mem_reg *new_mem) { + struct ttm_operation_ctx ctx = { interruptible, no_wait_gpu };struct radeon_device *rdev;struct ttm_mem_reg *old_mem = &bo->mem;struct ttm_mem_reg tmp_mem;
@@ -328,8 +329,7 @@ static int radeon_move_vram_ram(struct ttm_buffer_object *bo, placements.fpfn =0 ; placements.lpfn =0 ; placements.flags =TTM_PL_MASK_CACHING |TTM_PL_FLAG_TT ; - r =ttm_bo_mem_space (bo, &placement, &tmp_mem, - interruptible, no_wait_gpu); + r =ttm_bo_mem_space (bo, &placement, &tmp_mem, &ctx);if (unlikely (r)) {return r; }
@@ -358,6 +358,7 @@ static int radeon_move_ram_vram(struct ttm_buffer_object *bo,bool no_wait_gpu, struct ttm_mem_reg *new_mem) { + struct ttm_operation_ctx ctx = { interruptible, no_wait_gpu };struct radeon_device *rdev;struct ttm_mem_reg *old_mem = &bo->mem;struct ttm_mem_reg tmp_mem;
@@ -375,8 +376,7 @@ static int radeon_move_ram_vram(struct ttm_buffer_object *bo, placements.fpfn =0 ; placements.lpfn =0 ; placements.flags =TTM_PL_MASK_CACHING |TTM_PL_FLAG_TT ; - r =ttm_bo_mem_space (bo, &placement, &tmp_mem, - interruptible, no_wait_gpu); + r =ttm_bo_mem_space (bo, &placement, &tmp_mem, &ctx);if (unlikely (r)) {return r; }
drivers/gpu/drm/ttm/ttm_bo.c +11 -11
@@ -665,6 +665,7 @@ EXPORT_SYMBOL(ttm_bo_unlock_delayed_workqueue);static int ttm_bo_evict (struct ttm_buffer_object *bo,bool interruptible,bool no_wait_gpu) { +struct ttm_operation_ctx ctx = { interruptible, no_wait_gpu };struct ttm_bo_device *bdev = bo->bdev;struct ttm_mem_reg evict_mem;struct ttm_placement placement;
@@ -680,8 +681,7 @@ static int ttm_bo_evict(struct ttm_buffer_object *bo, bool interruptible, placement.num_placement =0 ; placement.num_busy_placement =0 ; bdev->driver->evict_flags (bo, &placement); - ret =ttm_bo_mem_space (bo, &placement, &evict_mem, interruptible, - no_wait_gpu); + ret =ttm_bo_mem_space (bo, &placement, &evict_mem, &ctx);if (ret) {if (ret != -ERESTARTSYS ) { pr_err("Failed to find memory space for buffer 0x%p eviction\n",
@@ -691,8 +691,8 @@ static int ttm_bo_evict(struct ttm_buffer_object *bo, bool interruptible, goto out; } - ret =ttm_bo_handle_move_mem (bo, &evict_mem, true, interruptible, - no_wait_gpu); + ret =ttm_bo_handle_move_mem (bo, &evict_mem, true, + interruptible, no_wait_gpu);if (unlikely (ret)) {if (ret != -ERESTARTSYS )pr_err ("Buffer eviction failed\n" );
@@ -901,8 +901,7 @@ static bool ttm_bo_mt_compatible(struct ttm_mem_type_manager *man,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) +struct ttm_operation_ctx *ctx) {struct ttm_bo_device *bdev = bo->bdev;struct ttm_mem_type_manager *man;
@@ -997,7 +996,8 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo, } ret =ttm_bo_mem_force_space (bo, mem_type, place, mem, - interruptible, no_wait_gpu); + ctx->interruptible, + ctx->no_wait_gpu);if (ret ==0 && mem->mm_node) { mem->placement = cur_flags;return 0 ;
@@ -1020,6 +1020,7 @@ static int ttm_bo_move_buffer(struct ttm_buffer_object *bo, bool interruptible, bool no_wait_gpu) { +struct ttm_operation_ctx ctx = { interruptible, no_wait_gpu };int ret =0 ;struct ttm_mem_reg mem;
@@ -1033,12 +1034,11 @@ static int ttm_bo_move_buffer(struct ttm_buffer_object *bo,/* * Determine where to move the buffer. */ - ret =ttm_bo_mem_space (bo, placement, &mem, - interruptible, no_wait_gpu); + ret =ttm_bo_mem_space (bo, placement, &mem, &ctx);if (ret) goto out_unlock; - ret =ttm_bo_handle_move_mem (bo, &mem, false, - interruptible, no_wait_gpu); + ret =ttm_bo_handle_move_mem (bo, &mem, false, interruptible, + no_wait_gpu); out_unlock:if (ret && mem.mm_node)ttm_bo_mem_put (bo, &mem);
include/drm/ttm/ttm_bo_driver.h +1 -2
@@ -724,8 +724,7 @@ bool ttm_mem_reg_is_pci(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem);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); +struct ttm_operation_ctx *ctx);void ttm_bo_mem_put (struct ttm_buffer_object *bo,struct ttm_mem_reg *mem); void ttm_bo_mem_put_locked(struct ttm_buffer_object *bo,
Signature · 6 lines
2.5.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 7/11 drm/ttm: use the operation context inside TTM
In reply to a message not in the archiveFrom: Christian König <[email protected]>
Instead of passing down the parameters manually to every function.
--- drivers/gpu/drm/ttm/ttm_bo.c | 69 +++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 39 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +30 -39
@@ -286,9 +286,8 @@ static int ttm_bo_add_ttm(struct ttm_buffer_object *bo, bool zero_alloc) }static int ttm_bo_handle_move_mem (struct ttm_buffer_object *bo, -struct ttm_mem_reg *mem, -bool evict,bool interruptible, -bool no_wait_gpu) +struct ttm_mem_reg *mem,bool evict, +struct ttm_operation_ctx *ctx) {struct ttm_bo_device *bdev = bo->bdev;bool old_is_pci =ttm_mem_reg_is_pci (bdev, &bo->mem);
@@ -342,12 +341,14 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,if (!(old_man->flags &TTM_MEMTYPE_FLAG_FIXED ) && !(new_man->flags &TTM_MEMTYPE_FLAG_FIXED )) - ret =ttm_bo_move_ttm (bo, interruptible, no_wait_gpu, mem); + ret =ttm_bo_move_ttm (bo, ctx->interruptible, + ctx->no_wait_gpu, mem);else if (bdev->driver->move) - ret = bdev->driver->move (bo, evict, interruptible, - no_wait_gpu, mem); + ret = bdev->driver->move (bo, evict, ctx->interruptible, + ctx->no_wait_gpu, mem);else - ret =ttm_bo_move_memcpy (bo, interruptible, no_wait_gpu, mem); + ret =ttm_bo_move_memcpy (bo, ctx->interruptible, + ctx->no_wait_gpu, mem);if (ret) {if (bdev->driver->move_notify) {
@@ -662,10 +663,9 @@ void ttm_bo_unlock_delayed_workqueue(struct ttm_bo_device *bdev, int resched) }EXPORT_SYMBOL (ttm_bo_unlock_delayed_workqueue); -static int ttm_bo_evict (struct ttm_buffer_object *bo,bool interruptible, -bool no_wait_gpu) +static int ttm_bo_evict (struct ttm_buffer_object *bo, +struct ttm_operation_ctx *ctx) { -struct ttm_operation_ctx ctx = { interruptible, no_wait_gpu };struct ttm_bo_device *bdev = bo->bdev;struct ttm_mem_reg evict_mem;struct ttm_placement placement;
@@ -681,7 +681,7 @@ static int ttm_bo_evict(struct ttm_buffer_object *bo, bool interruptible, placement.num_placement =0 ; placement.num_busy_placement =0 ; bdev->driver->evict_flags (bo, &placement); - ret =ttm_bo_mem_space (bo, &placement, &evict_mem, &ctx); + ret =ttm_bo_mem_space (bo, &placement, &evict_mem, ctx);if (ret) {if (ret != -ERESTARTSYS ) { pr_err("Failed to find memory space for buffer 0x%p eviction\n",
@@ -691,8 +691,7 @@ static int ttm_bo_evict(struct ttm_buffer_object *bo, bool interruptible, goto out; } - ret =ttm_bo_handle_move_mem (bo, &evict_mem, true, - interruptible, no_wait_gpu); + ret =ttm_bo_handle_move_mem (bo, &evict_mem, true, ctx);if (unlikely (ret)) {if (ret != -ERESTARTSYS )pr_err ("Buffer eviction failed\n" );
@@ -719,10 +718,9 @@ bool ttm_bo_eviction_valuable(struct ttm_buffer_object *bo,EXPORT_SYMBOL (ttm_bo_eviction_valuable);static int ttm_mem_evict_first (struct ttm_bo_device *bdev, -uint32_t mem_type, -const struct ttm_place *place, -bool interruptible, -bool no_wait_gpu) +uint32_t mem_type, +const struct ttm_place *place, +struct ttm_operation_ctx *ctx) {struct ttm_bo_global *glob = bdev->glob;struct ttm_mem_type_manager *man = &bdev->man[mem_type];
@@ -759,8 +757,8 @@ static int ttm_mem_evict_first(struct ttm_bo_device *bdev,kref_get (&bo->list_kref);if (!list_empty (&bo->ddestroy)) { - ret =ttm_bo_cleanup_refs_and_unlock (bo, interruptible, - no_wait_gpu); + ret =ttm_bo_cleanup_refs_and_unlock (bo, ctx->interruptible, + ctx->no_wait_gpu);kref_put (&bo->list_kref, ttm_bo_release_list);return ret; }
@@ -772,7 +770,7 @@ static int ttm_mem_evict_first(struct ttm_bo_device *bdev,ttm_bo_list_ref_sub (bo, put_count, true); - ret =ttm_bo_evict (bo, interruptible, no_wait_gpu); + ret =ttm_bo_evict (bo, ctx);ttm_bo_unreserve (bo);kref_put (&bo->list_kref, ttm_bo_release_list);
@@ -824,8 +822,7 @@ static int ttm_bo_mem_force_space(struct ttm_buffer_object *bo,uint32_t mem_type, const struct ttm_place *place, struct ttm_mem_reg *mem, - bool interruptible, - bool no_wait_gpu) + struct ttm_operation_ctx *ctx) { struct ttm_bo_device *bdev = bo->bdev;struct ttm_mem_type_manager *man = &bdev->man[mem_type];
@@ -837,8 +834,7 @@ static int ttm_bo_mem_force_space(struct ttm_buffer_object *bo,return ret;if (mem->mm_node)break ; - ret =ttm_mem_evict_first (bdev, mem_type, place, - interruptible, no_wait_gpu); + ret =ttm_mem_evict_first (bdev, mem_type, place, ctx);if (unlikely (ret !=0 ))return ret; }while (1 );
@@ -995,9 +991,7 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo,return 0 ; } - ret =ttm_bo_mem_force_space (bo, mem_type, place, mem, - ctx->interruptible, - ctx->no_wait_gpu); + ret =ttm_bo_mem_force_space (bo, mem_type, place, mem, ctx);if (ret ==0 && mem->mm_node) { mem->placement = cur_flags;return 0 ;
@@ -1016,11 +1010,9 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo,EXPORT_SYMBOL (ttm_bo_mem_space);static int ttm_bo_move_buffer (struct ttm_buffer_object *bo, -struct ttm_placement *placement, -bool interruptible, -bool no_wait_gpu) +struct ttm_placement *placement, +struct ttm_operation_ctx *ctx) { -struct ttm_operation_ctx ctx = { interruptible, no_wait_gpu };int ret =0 ;struct ttm_mem_reg mem;
@@ -1034,11 +1026,10 @@ static int ttm_bo_move_buffer(struct ttm_buffer_object *bo,/* * Determine where to move the buffer. */ - ret =ttm_bo_mem_space (bo, placement, &mem, &ctx); + ret =ttm_bo_mem_space (bo, placement, &mem, ctx);if (ret) goto out_unlock; - ret =ttm_bo_handle_move_mem (bo, &mem, false, interruptible, - no_wait_gpu); + ret =ttm_bo_handle_move_mem (bo, &mem, false, ctx); out_unlock:if (ret && mem.mm_node)ttm_bo_mem_put (bo, &mem);
@@ -1100,8 +1091,7 @@ int ttm_bo_validate(struct ttm_buffer_object *bo,* Check whether we need to move buffer. */ if (!ttm_bo_mem_compat (placement, &bo->mem, &new_flags)) { - ret =ttm_bo_move_buffer (bo, placement, ctx->interruptible, - ctx->no_wait_gpu); + ret =ttm_bo_move_buffer (bo, placement, ctx);if (ret)return ret; }else {
@@ -1326,6 +1316,7 @@ EXPORT_SYMBOL(ttm_bo_create);static int ttm_bo_force_list_clean (struct ttm_bo_device *bdev,unsigned mem_type) { +struct ttm_operation_ctx ctx = { false, false };struct ttm_mem_type_manager *man = &bdev->man[mem_type];struct ttm_bo_global *glob = bdev->glob;struct fence *fence;
@@ -1340,7 +1331,7 @@ static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev,for (i =0 ; i <TTM_MAX_BO_PRIORITY ; ++i) {while (!list_empty (&man->lru[i])) {spin_unlock (&glob->lru_lock); - ret =ttm_mem_evict_first (bdev, mem_type,NULL , false, false); + ret =ttm_mem_evict_first (bdev, mem_type,NULL , &ctx);if (ret)return ret;spin_lock (&glob->lru_lock);
@@ -1741,6 +1732,7 @@ static int ttm_bo_swapout(struct ttm_mem_shrink *shrink)*/ if ((bo->mem.placement & swap_placement) != swap_placement) { +struct ttm_operation_ctx ctx = { false, false };struct ttm_mem_reg evict_mem; evict_mem = bo->mem;
@@ -1748,8 +1740,7 @@ static int ttm_bo_swapout(struct ttm_mem_shrink *shrink) evict_mem.placement =TTM_PL_FLAG_SYSTEM |TTM_PL_FLAG_CACHED ; evict_mem.mem_type =TTM_PL_SYSTEM ; - ret =ttm_bo_handle_move_mem (bo, &evict_mem, true, - false, false); + ret =ttm_bo_handle_move_mem (bo, &evict_mem, true, &ctx);if (unlikely (ret !=0 )) goto out; }
Signature · 6 lines
2.5.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 9/11 drm/ttm: add number of bytes moved to the operation context
In reply to a message not in the archiveFrom: Christian König <[email protected]>
Add some statistics how many bytes we have moved.
--- drivers/gpu/drm/ttm/ttm_bo.c | 1 + include/drm/ttm/ttm_bo_api.h | 1 + 2 files changed, 2 insertions(+)
drivers/gpu/drm/ttm/ttm_bo.c +1 -0
@@ -378,6 +378,7 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,else bo->offset =0 ; + ctx->bytes_moved += bo->num_pages <<PAGE_SHIFT ;return 0 ; out_err:
include/drm/ttm/ttm_bo_api.h +1 -0
@@ -270,6 +270,7 @@ struct ttm_bo_kmap_obj {struct ttm_operation_ctx {bool interruptible;bool no_wait_gpu; +uint64_t bytes_moved; };/**
Signature · 6 lines
2.5.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 10/11 drm/amdgpu: forward operation context to ttm_bo_mem_space
In reply to a message not in the archiveFrom: Christian König <[email protected]>
This way we can finally use some more stats.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +12 -18
@@ -364,12 +364,10 @@ static int amdgpu_move_blit(struct ttm_buffer_object *bo,return r; } -static int amdgpu_move_vram_ram (struct ttm_buffer_object *bo, -bool evict,bool interruptible, -bool no_wait_gpu, +static int amdgpu_move_vram_ram (struct ttm_buffer_object *bo,bool evict, +struct ttm_operation_ctx *ctx,struct ttm_mem_reg *new_mem) { -struct ttm_operation_ctx ctx = { interruptible, no_wait_gpu };struct amdgpu_device *adev;struct ttm_mem_reg *old_mem = &bo->mem;struct ttm_mem_reg tmp_mem;
@@ -387,7 +385,7 @@ static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo, placements.fpfn =0 ; placements.lpfn = adev->mc.gtt_size >>PAGE_SHIFT ; placements.flags =TTM_PL_MASK_CACHING |TTM_PL_FLAG_TT ; - r =ttm_bo_mem_space (bo, &placement, &tmp_mem, &ctx); + r =ttm_bo_mem_space (bo, &placement, &tmp_mem, ctx);if (unlikely (r)) {return r; }
@@ -401,22 +399,20 @@ static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo,if (unlikely (r)) { goto out_cleanup; } - r =amdgpu_move_blit (bo, true, no_wait_gpu, &tmp_mem, old_mem); + r =amdgpu_move_blit (bo, true, ctx->no_wait_gpu, &tmp_mem, old_mem);if (unlikely (r)) { goto out_cleanup; } - r =ttm_bo_move_ttm (bo, interruptible, no_wait_gpu, new_mem); + r =ttm_bo_move_ttm (bo, ctx->interruptible, ctx->no_wait_gpu, new_mem); out_cleanup:ttm_bo_mem_put (bo, &tmp_mem);return r; } -static int amdgpu_move_ram_vram (struct ttm_buffer_object *bo, -bool evict,bool interruptible, -bool no_wait_gpu, +static int amdgpu_move_ram_vram (struct ttm_buffer_object *bo,bool evict, +struct ttm_operation_ctx *ctx,struct ttm_mem_reg *new_mem) { -struct ttm_operation_ctx ctx = { interruptible, no_wait_gpu };struct amdgpu_device *adev;struct ttm_mem_reg *old_mem = &bo->mem;struct ttm_mem_reg tmp_mem;
@@ -434,15 +430,15 @@ static int amdgpu_move_ram_vram(struct ttm_buffer_object *bo, placements.fpfn =0 ; placements.lpfn = adev->mc.gtt_size >>PAGE_SHIFT ; placements.flags =TTM_PL_MASK_CACHING |TTM_PL_FLAG_TT ; - r =ttm_bo_mem_space (bo, &placement, &tmp_mem, &ctx); + r =ttm_bo_mem_space (bo, &placement, &tmp_mem, ctx);if (unlikely (r)) {return r; } - r =ttm_bo_move_ttm (bo, interruptible, no_wait_gpu, &tmp_mem); + r =ttm_bo_move_ttm (bo, ctx->interruptible, ctx->no_wait_gpu, &tmp_mem);if (unlikely (r)) { goto out_cleanup; } - r =amdgpu_move_blit (bo, true, no_wait_gpu, new_mem, old_mem); + r =amdgpu_move_blit (bo, true, ctx->no_wait_gpu, new_mem, old_mem);if (unlikely (r)) { goto out_cleanup; }
@@ -488,12 +484,10 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, bool evict,if (old_mem->mem_type ==TTM_PL_VRAM && new_mem->mem_type ==TTM_PL_SYSTEM ) { - r =amdgpu_move_vram_ram (bo, evict, ctx->interruptible, - ctx->no_wait_gpu, new_mem); + r =amdgpu_move_vram_ram (bo, evict, ctx, new_mem); }else if (old_mem->mem_type ==TTM_PL_SYSTEM && new_mem->mem_type ==TTM_PL_VRAM ) { - r =amdgpu_move_ram_vram (bo, evict, ctx->interruptible, - ctx->no_wait_gpu, new_mem); + r =amdgpu_move_ram_vram (bo, evict, ctx, new_mem); }else { r =amdgpu_move_blit (bo, evict, ctx->no_wait_gpu, new_mem, old_mem);
Signature · 6 lines
2.5.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 11/11 drm/amdgpu: use the new TTM bytes moved counter
In reply to a message not in the archiveFrom: Christian König <[email protected]>
Instead of the global statistics use the per context bytes moved counter.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 7 +------ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 5 +---- 2 files changed, 2 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +1 -6
@@ -372,9 +372,7 @@ void amdgpu_cs_report_moved_bytes(struct amdgpu_device *adev, u64 num_bytes)static int amdgpu_cs_bo_validate (struct amdgpu_cs_parser *p,struct amdgpu_bo *bo) { -struct amdgpu_device *adev =amdgpu_ttm_adev (bo->tbo.bdev);struct ttm_operation_ctx ctx = { true, false }; -u64 initial_bytes_moved;uint32_t domain;int r;
@@ -391,16 +389,13 @@ static int amdgpu_cs_bo_validate(struct amdgpu_cs_parser *p, retry:amdgpu_ttm_placement_from_domain (bo, domain); - initial_bytes_moved =atomic64_read (&adev->num_bytes_moved); r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx); - p->bytes_moved +=atomic64_read (&adev->num_bytes_moved) - - initial_bytes_moved; -if (unlikely (r == -ENOMEM ) && domain != bo->allowed_domains) { domain = bo->allowed_domains; goto retry; } + p->bytes_moved += ctx.bytes_moved;return r; }
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +1 -4
@@ -323,7 +323,6 @@ int amdgpu_bo_create_restricted(struct amdgpu_device *adev,struct amdgpu_bo *bo;enum ttm_bo_type type;unsigned long page_align; -u64 initial_bytes_moved;size_t acc_size;int r;
@@ -395,12 +394,10 @@ int amdgpu_bo_create_restricted(struct amdgpu_device *adev,amdgpu_fill_placement_to_bo (bo, placement);/* Kernel allocation are uninterruptible */ - initial_bytes_moved =atomic64_read (&adev->num_bytes_moved); r =ttm_bo_init_reserved (&adev->mman.bdev, &bo->tbo, size, type, &bo->placement, page_align, &ctx,NULL , acc_size, sg, resv, &amdgpu_ttm_bo_destroy); -amdgpu_cs_report_moved_bytes (adev, -atomic64_read (&adev->num_bytes_moved) - initial_bytes_moved); +amdgpu_cs_report_moved_bytes (adev, ctx.bytes_moved);if (unlikely (r !=0 ))return r;
Signature · 6 lines
2.5.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Ping, could anybody take a look at this set?
Thanks,
Christian.
Am 27.04.2017 um 18:23 schrieb Christian König:
Quoted 306 lines
From: Christian König <[email protected]>
Extern is the default for function declerations anyway and this solves a bunch of 80char per line issues.
Signed-off-by Christian König <[email protected]>--- include/drm/ttm/ttm_bo_api.h | 135 ++++++++++++++++++------------------------- 1 file changed, 56 insertions(+), 79 deletions(-)include/drm/ttm/ttm_bo_api.h +54
-73@@ -288,8 +288,7 @@ ttm_bo_reference(struct ttm_buffer_object *bo)* Returns -EBUSY if no_wait is true and the buffer is busy. * Returns -ERESTARTSYS if interrupted by a signal. */ -extern int ttm_bo_wait (struct ttm_buffer_object *bo, -bool interruptible,bool no_wait); +int ttm_bo_wait (struct ttm_buffer_object *bo,bool interruptible,bool no_wait);/** * ttm_bo_mem_compat - Check if proposed placement is compatible with a bo @@ -300,9 +299,8 @@ extern int ttm_bo_wait(struct ttm_buffer_object *bo,* * Returns true if the placement is compatible */ -extern bool ttm_bo_mem_compat (struct ttm_placement *placement, -struct ttm_mem_reg *mem, -uint32_t *new_flags); +bool ttm_bo_mem_compat (struct ttm_placement *placement,struct ttm_mem_reg *mem, +uint32_t *new_flags);/** * ttm_bo_validate @@ -320,10 +318,10 @@ extern bool ttm_bo_mem_compat(struct ttm_placement *placement,* -EBUSY if no_wait is true and buffer busy. * -ERESTARTSYS if interrupted by a signal. */ -extern int ttm_bo_validate (struct ttm_buffer_object *bo, -struct ttm_placement *placement, -bool interruptible, -bool no_wait_gpu); +int ttm_bo_validate (struct ttm_buffer_object *bo, +struct ttm_placement *placement, +bool interruptible, +bool no_wait_gpu);/** * ttm_bo_unref @@ -332,7 +330,7 @@ extern int ttm_bo_validate(struct ttm_buffer_object *bo,* * Unreference and clear a pointer to a buffer object. */ -extern void ttm_bo_unref (struct ttm_buffer_object **bo); +void ttm_bo_unref (struct ttm_buffer_object **bo);/** @@ -344,8 +342,8 @@ extern void ttm_bo_unref(struct ttm_buffer_object **bo);* * 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); +void ttm_bo_list_ref_sub (struct ttm_buffer_object *bo,int count, +bool never_free);/** * ttm_bo_add_to_lru @@ -357,7 +355,7 @@ extern void ttm_bo_list_ref_sub(struct ttm_buffer_object *bo, int count,* 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); +void ttm_bo_add_to_lru (struct ttm_buffer_object *bo);/** * ttm_bo_del_from_lru @@ -369,7 +367,7 @@ extern void ttm_bo_add_to_lru(struct ttm_buffer_object *bo);* 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); +int ttm_bo_del_from_lru (struct ttm_buffer_object *bo);/** * ttm_bo_move_to_lru_tail @@ -380,7 +378,7 @@ extern int ttm_bo_del_from_lru(struct ttm_buffer_object *bo);* object. This function must be called with struct ttm_bo_global::lru_lock * held, and is used to make a BO less likely to be considered for eviction. */ -extern void ttm_bo_move_to_lru_tail (struct ttm_buffer_object *bo); +void ttm_bo_move_to_lru_tail (struct ttm_buffer_object *bo);/** * ttm_bo_lock_delayed_workqueue @@ -389,15 +387,14 @@ extern void ttm_bo_move_to_lru_tail(struct ttm_buffer_object *bo);* Returns * True if the workqueue was queued at the time */ -extern int ttm_bo_lock_delayed_workqueue (struct ttm_bo_device *bdev); +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); +void ttm_bo_unlock_delayed_workqueue (struct ttm_bo_device *bdev,int resched);/** * ttm_bo_eviction_valuable @@ -424,8 +421,7 @@ bool ttm_bo_eviction_valuable(struct ttm_buffer_object *bo,* -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); +int ttm_bo_synccpu_write_grab (struct ttm_buffer_object *bo,bool no_wait);/** * ttm_bo_synccpu_write_release: @@ -434,7 +430,7 @@ ttm_bo_synccpu_write_grab(struct ttm_buffer_object *bo, bool no_wait);* * Releases a synccpu lock. */ -extern void ttm_bo_synccpu_write_release (struct ttm_buffer_object *bo); +void ttm_bo_synccpu_write_release (struct ttm_buffer_object *bo);/** * ttm_bo_acc_size @@ -493,18 +489,18 @@ size_t ttm_bo_dma_acc_size(struct ttm_bo_device *bdev,* -ERESTARTSYS: Interrupted by signal while sleeping waiting for resources. */ -extern int ttm_bo_init_reserved (struct ttm_bo_device *bdev, -struct ttm_buffer_object *bo, -unsigned long size, -enum ttm_bo_type type, -struct ttm_placement *placement, -uint32_t page_alignment, -bool interrubtible, -struct file *persistent_swap_storage, -size_t acc_size, -struct sg_table *sg, -struct reservation_object *resv, -void (*destroy) (struct ttm_buffer_object *)); +int ttm_bo_init_reserved (struct ttm_bo_device *bdev, +struct ttm_buffer_object *bo, +unsigned long size, +enum ttm_bo_type type, +struct ttm_placement *placement, +uint32_t page_alignment, +bool interrubtible, +struct file *persistent_swap_storage, +size_t acc_size, +struct sg_table *sg, +struct reservation_object *resv, +void (*destroy) (struct ttm_buffer_object *));/** * ttm_bo_init @@ -544,19 +540,13 @@ extern int ttm_bo_init_reserved(struct ttm_bo_device *bdev,* -EINVAL: Invalid placement flags. * -ERESTARTSYS: Interrupted by signal while sleeping waiting for resources. */ - -extern int ttm_bo_init (struct ttm_bo_device *bdev, -struct ttm_buffer_object *bo, -unsigned long size, -enum ttm_bo_type type, -struct ttm_placement *placement, -uint32_t page_alignment, -bool interrubtible, -struct file *persistent_swap_storage, -size_t acc_size, -struct sg_table *sg, -struct reservation_object *resv, -void (*destroy) (struct ttm_buffer_object *)); +int ttm_bo_init (struct ttm_bo_device *bdev,struct ttm_buffer_object *bo, +unsigned long size,enum ttm_bo_type type, +struct ttm_placement *placement, +uint32_t page_alignment,bool interrubtible, +struct file *persistent_swap_storage,size_t acc_size, +struct sg_table *sg,struct reservation_object *resv, +void (*destroy) (struct ttm_buffer_object *));/** * ttm_bo_create @@ -582,15 +572,11 @@ extern int ttm_bo_init(struct ttm_bo_device *bdev,* -EINVAL: Invalid placement flags. * -ERESTARTSYS: Interrupted by signal while waiting for resources. */ - -extern int ttm_bo_create (struct ttm_bo_device *bdev, -unsigned long size, -enum ttm_bo_type type, -struct ttm_placement *placement, -uint32_t page_alignment, -bool interruptible, -struct file *persistent_swap_storage, -struct ttm_buffer_object **p_bo); +int ttm_bo_create (struct ttm_bo_device *bdev,unsigned long size, +enum ttm_bo_type type,struct ttm_placement *placement, +uint32_t page_alignment,bool interruptible, +struct file *persistent_swap_storage, +struct ttm_buffer_object **p_bo);/** * ttm_bo_init_mm @@ -607,9 +593,9 @@ extern int ttm_bo_create(struct ttm_bo_device *bdev,* -ENOMEM: Not enough memory. * May also return driver-specified errors. */ +int ttm_bo_init_mm (struct ttm_bo_device *bdev,unsigned type, +unsigned long p_size); -extern int ttm_bo_init_mm (struct ttm_bo_device *bdev,unsigned type, -unsigned long p_size);/** * ttm_bo_clean_mm * @@ -636,8 +622,7 @@ extern int ttm_bo_init_mm(struct ttm_bo_device *bdev, unsigned type,* -EINVAL: invalid or uninitialized memory type. * -EBUSY: There are still buffers left in this memory type. */ - -extern int ttm_bo_clean_mm (struct ttm_bo_device *bdev,unsigned mem_type); +int ttm_bo_clean_mm (struct ttm_bo_device *bdev,unsigned mem_type);/** * ttm_bo_evict_mm @@ -657,8 +642,7 @@ extern int ttm_bo_clean_mm(struct ttm_bo_device *bdev, unsigned mem_type);* -ERESTARTSYS: The call was interrupted by a signal while waiting to * evict a buffer. */ - -extern int ttm_bo_evict_mm (struct ttm_bo_device *bdev,unsigned mem_type); +int ttm_bo_evict_mm (struct ttm_bo_device *bdev,unsigned mem_type);/** * ttm_kmap_obj_virtual @@ -671,7 +655,6 @@ extern int ttm_bo_evict_mm(struct ttm_bo_device *bdev, unsigned mem_type);* If *is_iomem is 1 on return, the virtual address points to an io memory area, * that should strictly be accessed by the iowriteXX() and similar functions. */ -static inline void *ttm_kmap_obj_virtual (struct ttm_bo_kmap_obj *map,bool *is_iomem) {@@ -695,9 +678,8 @@ static inline void *ttm_kmap_obj_virtual(struct ttm_bo_kmap_obj *map,* -ENOMEM: Out of memory. * -EINVAL: Invalid range. */ - -extern int ttm_bo_kmap (struct ttm_buffer_object *bo,unsigned long start_page, -unsigned long num_pages,struct ttm_bo_kmap_obj *map); +int ttm_bo_kmap (struct ttm_buffer_object *bo,unsigned long start_page, +unsigned long num_pages,struct ttm_bo_kmap_obj *map);/** * ttm_bo_kunmap @@ -706,8 +688,7 @@ extern int ttm_bo_kmap(struct ttm_buffer_object *bo, unsigned long start_page,* * Unmaps a kernel map set up by ttm_bo_kmap. */ - -extern void ttm_bo_kunmap (struct ttm_bo_kmap_obj *map); +void ttm_bo_kunmap (struct ttm_bo_kmap_obj *map);/** * ttm_fbdev_mmap - mmap fbdev memory backed by a ttm buffer object. @@ -719,9 +700,7 @@ extern void ttm_bo_kunmap(struct ttm_bo_kmap_obj *map);* This function is intended to be called by the fbdev mmap method * if the fbdev address space is to be backed by a bo. */ - -extern int ttm_fbdev_mmap (struct vm_area_struct *vma, -struct ttm_buffer_object *bo); +int ttm_fbdev_mmap (struct vm_area_struct *vma,struct ttm_buffer_object *bo);/** * ttm_bo_default_iomem_pfn - get a pfn for a page offset @@ -744,9 +723,8 @@ unsigned long ttm_bo_default_io_mem_pfn(struct ttm_buffer_object *bo,* This function is intended to be called by the device mmap method. * if the device address space is to be backed by the bo manager. */ - -extern int ttm_bo_mmap (struct file *filp,struct vm_area_struct *vma, -struct ttm_bo_device *bdev); +int ttm_bo_mmap (struct file *filp,struct vm_area_struct *vma, +struct ttm_bo_device *bdev);/** * ttm_bo_io @@ -768,11 +746,10 @@ extern int ttm_bo_mmap(struct file *filp, struct vm_area_struct *vma,* the function may return -ERESTARTSYS if * interrupted by a signal. */ +ssize_t ttm_bo_io (struct ttm_bo_device *bdev,struct file *filp, +const char __user *wbuf,char __user *rbuf, +size_t count,loff_t *f_pos,bool write);
include/drm/ttm/ttm_bo_api.h extern int ttm_bo_mmap(struct file *filp, struct vm_area_struct *vma, · line 755
Quoted 10 lines
include/drm/ttm/ttm_bo_api.h +2
-6-extern ssize_t ttm_bo_io (struct ttm_bo_device *bdev,struct file *filp, -const char __user *wbuf,char __user *rbuf, -size_t count,loff_t *f_pos,bool write); - -extern void ttm_bo_swapout_all (struct ttm_bo_device *bdev); -extern int ttm_bo_wait_unreserved (struct ttm_buffer_object *bo); +void ttm_bo_swapout_all (struct ttm_bo_device *bdev); +int ttm_bo_wait_unreserved (struct ttm_buffer_object *bo);#endif
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 7866ced0-a113-de78-0c06-6b7d319e02db-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org
Michel Dänzer
Reviewed-byQuoted 1 line · Christian König
Ping, could anybody take a look at this set?
For the series:
Might be worth converting e.g. ttm_bo_move_ttm to a context parameter as well?
Also, I wonder if the two booleans couldn't be converted to enums or something, so that one wouldn't always need to look up the struct ttm_operation_ctx definition to know what they mean.
Signature · 6 lines
Earthling Michel Dänzer | http://www.amd.com Libre software enthusiast | Mesa and X developer _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/11 drm/ttm: add operation ctx to ttm_bo_validate
In reply to Christian KönigFrom: Christian König <[email protected]>
Give moving a BO into place an operation context to work with.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 9 ++++++--- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 3 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 14 +++++++++----- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 6 ++++-- drivers/gpu/drm/ast/ast_ttm.c | 9 ++++++--- drivers/gpu/drm/bochs/bochs_mm.c | 6 ++++-- drivers/gpu/drm/cirrus/cirrus_ttm.c | 6 ++++-- drivers/gpu/drm/mgag200/mgag200_ttm.c | 9 ++++++--- drivers/gpu/drm/nouveau/nouveau_bo.c | 4 ++-- drivers/gpu/drm/qxl/qxl_ioctl.c | 4 ++-- drivers/gpu/drm/qxl/qxl_object.c | 6 ++++-- drivers/gpu/drm/qxl/qxl_release.c | 4 ++-- drivers/gpu/drm/radeon/radeon_gem.c | 3 ++- drivers/gpu/drm/radeon/radeon_mn.c | 3 ++- drivers/gpu/drm/radeon/radeon_object.c | 14 +++++++++----- drivers/gpu/drm/radeon/radeon_vm.c | 3 ++- drivers/gpu/drm/ttm/ttm_bo.c | 16 +++++++++------- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 11 ++++++----- drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 3 ++- drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c | 21 +++++++++++++-------- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 9 ++++----- drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 6 ++++-- drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 3 ++- include/drm/ttm/ttm_bo_api.h | 20 ++++++++++++++++---- 25 files changed, 124 insertions(+), 71 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +6 -3
@@ -373,6 +373,7 @@ static int amdgpu_cs_bo_validate(struct amdgpu_cs_parser *p, struct amdgpu_bo *bo) {struct amdgpu_device *adev =amdgpu_ttm_adev (bo->tbo.bdev); +struct ttm_operation_ctx ctx = { true, false };u64 initial_bytes_moved;uint32_t domain;int r;
@@ -391,7 +392,7 @@ static int amdgpu_cs_bo_validate(struct amdgpu_cs_parser *p, retry:amdgpu_ttm_placement_from_domain (bo, domain); initial_bytes_moved =atomic64_read (&adev->num_bytes_moved); - r =ttm_bo_validate (&bo->tbo, &bo->placement, true, false); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx); p->bytes_moved +=atomic64_read (&adev->num_bytes_moved) - initial_bytes_moved;
@@ -408,6 +409,7 @@ static bool amdgpu_cs_try_evict(struct amdgpu_cs_parser *p, struct amdgpu_bo *validated) {uint32_t domain = validated->allowed_domains; +struct ttm_operation_ctx ctx = { true, false };int r;if (!p->evictable)
@@ -440,7 +442,7 @@ static bool amdgpu_cs_try_evict(struct amdgpu_cs_parser *p,/* Good we can try to move this BO somewhere else */ amdgpu_ttm_placement_from_domain (bo, other); initial_bytes_moved =atomic64_read (&adev->num_bytes_moved); - r =ttm_bo_validate (&bo->tbo, &bo->placement, true, false); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx); p->bytes_moved +=atomic64_read (&adev->num_bytes_moved) - initial_bytes_moved;
@@ -1419,6 +1421,7 @@ amdgpu_cs_find_mapping(struct amdgpu_cs_parser *parser,*/ int amdgpu_cs_sysvm_access_required (struct amdgpu_cs_parser *parser) { +struct ttm_operation_ctx ctx = { false, false };unsigned i;int r;
@@ -1437,7 +1440,7 @@ int amdgpu_cs_sysvm_access_required(struct amdgpu_cs_parser *parser) bo->flags |=AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS ;amdgpu_ttm_placement_from_domain (bo, bo->allowed_domains); - r =ttm_bo_validate (&bo->tbo, &bo->placement, false, false); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx);if (unlikely (r))return r; }
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +2 -1
@@ -306,6 +306,7 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data,int amdgpu_gem_userptr_ioctl (struct drm_device *dev,void *data,struct drm_file *filp) { +struct ttm_operation_ctx ctx = { true, false };struct amdgpu_device *adev = dev->dev_private;struct drm_amdgpu_gem_userptr *args = data;struct drm_gem_object *gobj;
@@ -362,7 +363,7 @@ int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data, goto free_pages;amdgpu_ttm_placement_from_domain (bo,AMDGPU_GEM_DOMAIN_GTT ); - r =ttm_bo_validate (&bo->tbo, &bo->placement, true, false); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx);amdgpu_bo_unreserve (bo);if (r) goto free_pages;
drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c +2 -1
@@ -118,6 +118,7 @@ static void amdgpu_mn_invalidate_node(struct amdgpu_mn_node *node, unsigned long start, unsigned long end) { +struct ttm_operation_ctx ctx = { false, false };struct amdgpu_bo *bo;long r;
@@ -138,7 +139,7 @@ static void amdgpu_mn_invalidate_node(struct amdgpu_mn_node *node,DRM_ERROR ("(%ld) failed to wait for user bo\n" , r);amdgpu_ttm_placement_from_domain (bo,AMDGPU_GEM_DOMAIN_CPU ); - r =ttm_bo_validate (&bo->tbo, &bo->placement, false, false); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx);if (r)DRM_ERROR ("(%ld) failed to validate user bo\n" , r);
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +9 -5
@@ -545,6 +545,7 @@ int amdgpu_bo_backup_to_shadow(struct amdgpu_device *adev,int amdgpu_bo_validate (struct amdgpu_bo *bo) { +struct ttm_operation_ctx ctx = { false, false };uint32_t domain;int r;
@@ -555,7 +556,7 @@ int amdgpu_bo_validate(struct amdgpu_bo *bo) retry:amdgpu_ttm_placement_from_domain (bo, domain); - r =ttm_bo_validate (&bo->tbo, &bo->placement, false, false); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx);if (unlikely (r == -ENOMEM ) && domain != bo->allowed_domains) { domain = bo->allowed_domains; goto retry;
@@ -662,6 +663,7 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain, u64 *gpu_addr) {struct amdgpu_device *adev =amdgpu_ttm_adev (bo->tbo.bdev); +struct ttm_operation_ctx ctx = { false, false };int r, i;unsigned fpfn, lpfn;
@@ -719,7 +721,7 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain, bo->placements[i].flags |=TTM_PL_FLAG_NO_EVICT ; } - r =ttm_bo_validate (&bo->tbo, &bo->placement, false, false); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx);if (unlikely (r)) {dev_err (adev->dev,"%p pin failed\n" , bo); goto error;
@@ -753,6 +755,7 @@ int amdgpu_bo_pin(struct amdgpu_bo *bo, u32 domain, u64 *gpu_addr)int amdgpu_bo_unpin (struct amdgpu_bo *bo) {struct amdgpu_device *adev =amdgpu_ttm_adev (bo->tbo.bdev); +struct ttm_operation_ctx ctx = { false, false };int r, i;if (!bo->pin_count) {
@@ -766,7 +769,7 @@ int amdgpu_bo_unpin(struct amdgpu_bo *bo) bo->placements[i].lpfn =0 ; bo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT ; } - r =ttm_bo_validate (&bo->tbo, &bo->placement, false, false); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx);if (unlikely (r)) {dev_err (adev->dev,"%p validate failed for unpin\n" , bo); goto error;
@@ -938,6 +941,7 @@ void amdgpu_bo_move_notify(struct ttm_buffer_object *bo,int amdgpu_bo_fault_reserve_notify (struct ttm_buffer_object *bo) {struct amdgpu_device *adev =amdgpu_ttm_adev (bo->bdev); +struct ttm_operation_ctx ctx = { false, false };struct amdgpu_bo *abo;unsigned long offset, size, lpfn;int i, r;
@@ -969,10 +973,10 @@ int amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo) abo->placements[i].lpfn > lpfn)) abo->placements[i].lpfn = lpfn; } - r =ttm_bo_validate (bo, &abo->placement, false, false); + r =ttm_bo_validate (bo, &abo->placement, &ctx);if (unlikely (r == -ENOMEM )) {amdgpu_ttm_placement_from_domain (abo,AMDGPU_GEM_DOMAIN_GTT ); -return ttm_bo_validate (bo, &abo->placement, false, false); +return ttm_bo_validate (bo, &abo->placement, &ctx); }else if (unlikely (r !=0 )) {return r; }
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +4 -2
@@ -404,6 +404,7 @@ static u64 amdgpu_uvd_get_addr_from_ctx(struct amdgpu_uvd_cs_ctx *ctx)*/ static int amdgpu_uvd_cs_pass1 (struct amdgpu_uvd_cs_ctx *ctx) { +struct ttm_operation_ctx tctx = { false, false };struct amdgpu_bo_va_mapping *mapping;struct amdgpu_bo *bo;uint32_t cmd;
@@ -426,7 +427,7 @@ static int amdgpu_uvd_cs_pass1(struct amdgpu_uvd_cs_ctx *ctx) }amdgpu_uvd_force_into_uvd_segment (bo); - r =ttm_bo_validate (&bo->tbo, &bo->placement, false, false); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &tctx); }return r;
@@ -945,6 +946,7 @@ int amdgpu_uvd_ring_parse_cs(struct amdgpu_cs_parser *parser, uint32_t ib_idx)static int amdgpu_uvd_send_msg (struct amdgpu_ring *ring,struct amdgpu_bo *bo,bool direct,struct fence **fence) { +struct ttm_operation_ctx ctx = { true, false };struct ttm_validate_buffer tv;struct ww_acquire_ctx ticket;struct list_head head;
@@ -971,7 +973,7 @@ static int amdgpu_uvd_send_msg(struct amdgpu_ring *ring, struct amdgpu_bo *bo,amdgpu_uvd_force_into_uvd_segment (bo); } - r =ttm_bo_validate (&bo->tbo, &bo->placement, true, false); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx);if (r) goto err;
drivers/gpu/drm/ast/ast_ttm.c +6 -3
@@ -352,6 +352,7 @@ static inline u64 ast_bo_gpu_offset(struct ast_bo *bo)int ast_bo_pin (struct ast_bo *bo,u32 pl_flag,u64 *gpu_addr) { +struct ttm_operation_ctx ctx = { false, false };int i, ret;if (bo->pin_count) {
@@ -363,7 +364,7 @@ int ast_bo_pin(struct ast_bo *bo, u32 pl_flag, u64 *gpu_addr)ast_ttm_placement (bo, pl_flag);for (i =0 ; i < bo->placement.num_placement; i++) bo->placements[i].flags |=TTM_PL_FLAG_NO_EVICT ; - ret =ttm_bo_validate (&bo->bo, &bo->placement, false, false); + ret =ttm_bo_validate (&bo->bo, &bo->placement, &ctx);if (ret)return ret;
@@ -375,6 +376,7 @@ int ast_bo_pin(struct ast_bo *bo, u32 pl_flag, u64 *gpu_addr)int ast_bo_unpin (struct ast_bo *bo) { +struct ttm_operation_ctx ctx = { false, false };int i, ret;if (!bo->pin_count) {DRM_ERROR ("unpin bad %p\n" , bo);
@@ -386,7 +388,7 @@ int ast_bo_unpin(struct ast_bo *bo)for (i =0 ; i < bo->placement.num_placement ; i++) bo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT ; - ret =ttm_bo_validate (&bo->bo, &bo->placement, false, false); + ret =ttm_bo_validate (&bo->bo, &bo->placement, &ctx);if (ret)return ret;
@@ -395,6 +397,7 @@ int ast_bo_unpin(struct ast_bo *bo)int ast_bo_push_sysram (struct ast_bo *bo) { +struct ttm_operation_ctx ctx = { false, false };int i, ret;if (!bo->pin_count) {DRM_ERROR ("unpin bad %p\n" , bo);
@@ -411,7 +414,7 @@ int ast_bo_push_sysram(struct ast_bo *bo)for (i =0 ; i < bo->placement.num_placement ; i++) bo->placements[i].flags |=TTM_PL_FLAG_NO_EVICT ; - ret =ttm_bo_validate (&bo->bo, &bo->placement, false, false); + ret =ttm_bo_validate (&bo->bo, &bo->placement, &ctx);if (ret) {DRM_ERROR ("pushing to VRAM failed\n" );return ret;
drivers/gpu/drm/bochs/bochs_mm.c +4 -2
@@ -283,6 +283,7 @@ static inline u64 bochs_bo_gpu_offset(struct bochs_bo *bo)int bochs_bo_pin (struct bochs_bo *bo,u32 pl_flag,u64 *gpu_addr) { +struct ttm_operation_ctx ctx = { false, false };int i, ret;if (bo->pin_count) {
@@ -295,7 +296,7 @@ int bochs_bo_pin(struct bochs_bo *bo, u32 pl_flag, u64 *gpu_addr)bochs_ttm_placement (bo, pl_flag);for (i =0 ; i < bo->placement.num_placement; i++) bo->placements[i].flags |=TTM_PL_FLAG_NO_EVICT ; - ret =ttm_bo_validate (&bo->bo, &bo->placement, false, false); + ret =ttm_bo_validate (&bo->bo, &bo->placement, &ctx);if (ret)return ret;
@@ -307,6 +308,7 @@ int bochs_bo_pin(struct bochs_bo *bo, u32 pl_flag, u64 *gpu_addr)int bochs_bo_unpin (struct bochs_bo *bo) { +struct ttm_operation_ctx ctx = { false, false };int i, ret;if (!bo->pin_count) {
@@ -320,7 +322,7 @@ int bochs_bo_unpin(struct bochs_bo *bo)for (i =0 ; i < bo->placement.num_placement; i++) bo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT ; - ret =ttm_bo_validate (&bo->bo, &bo->placement, false, false); + ret =ttm_bo_validate (&bo->bo, &bo->placement, &ctx);if (ret)return ret;
drivers/gpu/drm/cirrus/cirrus_ttm.c +4 -2
@@ -357,6 +357,7 @@ static inline u64 cirrus_bo_gpu_offset(struct cirrus_bo *bo)int cirrus_bo_pin (struct cirrus_bo *bo,u32 pl_flag,u64 *gpu_addr) { +struct ttm_operation_ctx ctx = { false, false };int i, ret;if (bo->pin_count) {
@@ -368,7 +369,7 @@ int cirrus_bo_pin(struct cirrus_bo *bo, u32 pl_flag, u64 *gpu_addr)cirrus_ttm_placement (bo, pl_flag);for (i =0 ; i < bo->placement.num_placement; i++) bo->placements[i].flags |=TTM_PL_FLAG_NO_EVICT ; - ret =ttm_bo_validate (&bo->bo, &bo->placement, false, false); + ret =ttm_bo_validate (&bo->bo, &bo->placement, &ctx);if (ret)return ret;
@@ -380,6 +381,7 @@ int cirrus_bo_pin(struct cirrus_bo *bo, u32 pl_flag, u64 *gpu_addr)int cirrus_bo_push_sysram (struct cirrus_bo *bo) { +struct ttm_operation_ctx ctx = { false, false };int i, ret;if (!bo->pin_count) {DRM_ERROR ("unpin bad %p\n" , bo);
@@ -396,7 +398,7 @@ int cirrus_bo_push_sysram(struct cirrus_bo *bo)for (i =0 ; i < bo->placement.num_placement ; i++) bo->placements[i].flags |=TTM_PL_FLAG_NO_EVICT ; - ret =ttm_bo_validate (&bo->bo, &bo->placement, false, false); + ret =ttm_bo_validate (&bo->bo, &bo->placement, &ctx);if (ret) {DRM_ERROR ("pushing to VRAM failed\n" );return ret;
drivers/gpu/drm/mgag200/mgag200_ttm.c +6 -3
@@ -353,6 +353,7 @@ static inline u64 mgag200_bo_gpu_offset(struct mgag200_bo *bo)int mgag200_bo_pin (struct mgag200_bo *bo,u32 pl_flag,u64 *gpu_addr) { +struct ttm_operation_ctx ctx = { false, false };int i, ret;if (bo->pin_count) {
@@ -365,7 +366,7 @@ int mgag200_bo_pin(struct mgag200_bo *bo, u32 pl_flag, u64 *gpu_addr)mgag200_ttm_placement (bo, pl_flag);for (i =0 ; i < bo->placement.num_placement; i++) bo->placements[i].flags |=TTM_PL_FLAG_NO_EVICT ; - ret =ttm_bo_validate (&bo->bo, &bo->placement, false, false); + ret =ttm_bo_validate (&bo->bo, &bo->placement, &ctx);if (ret)return ret;
@@ -377,6 +378,7 @@ int mgag200_bo_pin(struct mgag200_bo *bo, u32 pl_flag, u64 *gpu_addr)int mgag200_bo_unpin (struct mgag200_bo *bo) { +struct ttm_operation_ctx ctx = { false, false };int i;if (!bo->pin_count) {DRM_ERROR ("unpin bad %p\n" , bo);
@@ -388,11 +390,12 @@ int mgag200_bo_unpin(struct mgag200_bo *bo)for (i =0 ; i < bo->placement.num_placement ; i++) bo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT ; -return ttm_bo_validate (&bo->bo, &bo->placement, false, false); +return ttm_bo_validate (&bo->bo, &bo->placement, &ctx); }int mgag200_bo_push_sysram (struct mgag200_bo *bo) { +struct ttm_operation_ctx ctx = { false, false };int i, ret;if (!bo->pin_count) {DRM_ERROR ("unpin bad %p\n" , bo);
@@ -409,7 +412,7 @@ int mgag200_bo_push_sysram(struct mgag200_bo *bo)for (i =0 ; i < bo->placement.num_placement ; i++) bo->placements[i].flags |=TTM_PL_FLAG_NO_EVICT ; - ret =ttm_bo_validate (&bo->bo, &bo->placement, false, false); + ret =ttm_bo_validate (&bo->bo, &bo->placement, &ctx);if (ret) {DRM_ERROR ("pushing to VRAM failed\n" );return ret;
drivers/gpu/drm/nouveau/nouveau_bo.c +2 -2
@@ -483,10 +483,10 @@ int nouveau_bo_validate(struct nouveau_bo *nvbo, bool interruptible, bool no_wait_gpu) { + struct ttm_operation_ctx ctx = { interruptible, no_wait_gpu };int ret; - ret =ttm_bo_validate (&nvbo->bo, &nvbo->placement, - interruptible, no_wait_gpu); + ret =ttm_bo_validate (&nvbo->bo, &nvbo->placement, &ctx);if (ret)return ret;
drivers/gpu/drm/qxl/qxl_ioctl.c +2 -2
@@ -308,6 +308,7 @@ static int qxl_update_area_ioctl(struct drm_device *dev, void *data,int ret;struct drm_gem_object *gobj =NULL ;struct qxl_bo *qobj =NULL ; +struct ttm_operation_ctx ctx = { true, false };if (update_area->left >= update_area->right || update_area->top >= update_area->bottom)
@@ -325,8 +326,7 @@ static int qxl_update_area_ioctl(struct drm_device *dev, void *data,if (!qobj->pin_count) {qxl_ttm_placement_from_domain (qobj, qobj->type, false); - ret =ttm_bo_validate (&qobj->tbo, &qobj->placement, - true, false); + ret =ttm_bo_validate (&qobj->tbo, &qobj->placement, &ctx);if (unlikely (ret)) goto out; }
drivers/gpu/drm/qxl/qxl_object.c +4 -2
@@ -224,6 +224,7 @@ struct qxl_bo *qxl_bo_ref(struct qxl_bo *bo)int qxl_bo_pin (struct qxl_bo *bo,u32 domain,u64 *gpu_addr) {struct qxl_device *qdev = (struct qxl_device *)bo->gem_base.dev->dev_private; +struct ttm_operation_ctx ctx = { false, false };int r;if (bo->pin_count) {
@@ -233,7 +234,7 @@ int qxl_bo_pin(struct qxl_bo *bo, u32 domain, u64 *gpu_addr)return 0 ; }qxl_ttm_placement_from_domain (bo, domain, true); - r =ttm_bo_validate (&bo->tbo, &bo->placement, false, false); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx);if (likely (r ==0 )) { bo->pin_count =1 ;if (gpu_addr !=NULL )
@@ -247,6 +248,7 @@ int qxl_bo_pin(struct qxl_bo *bo, u32 domain, u64 *gpu_addr)int qxl_bo_unpin (struct qxl_bo *bo) {struct qxl_device *qdev = (struct qxl_device *)bo->gem_base.dev->dev_private; +struct ttm_operation_ctx ctx = { false, false };int r, i;if (!bo->pin_count) {
@@ -258,7 +260,7 @@ int qxl_bo_unpin(struct qxl_bo *bo)return 0 ;for (i =0 ; i < bo->placement.num_placement; i++) bo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT ; - r =ttm_bo_validate (&bo->tbo, &bo->placement, false, false); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx);if (unlikely (r !=0 ))dev_err (qdev->dev,"%p validate failed for unpin\n" , bo);return r;
drivers/gpu/drm/qxl/qxl_release.c +2 -2
@@ -230,12 +230,12 @@ int qxl_release_list_add(struct qxl_release *release, struct qxl_bo *bo)static int qxl_release_validate_bo (struct qxl_bo *bo) { +struct ttm_operation_ctx ctx = { true, false };int ret;if (!bo->pin_count) {qxl_ttm_placement_from_domain (bo, bo->type, false); - ret =ttm_bo_validate (&bo->tbo, &bo->placement, - true, false); + ret =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx);if (ret)return ret; }
drivers/gpu/drm/radeon/radeon_gem.c +2 -1
@@ -285,6 +285,7 @@ int radeon_gem_create_ioctl(struct drm_device *dev, void *data,int radeon_gem_userptr_ioctl (struct drm_device *dev,void *data,struct drm_file *filp) { +struct ttm_operation_ctx ctx = { true, false };struct radeon_device *rdev = dev->dev_private;struct drm_radeon_gem_userptr *args = data;struct drm_gem_object *gobj;
@@ -343,7 +344,7 @@ int radeon_gem_userptr_ioctl(struct drm_device *dev, void *data, }radeon_ttm_placement_from_domain (bo,RADEON_GEM_DOMAIN_GTT ); - r =ttm_bo_validate (&bo->tbo, &bo->placement, true, false); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx);radeon_bo_unreserve (bo);up_read (¤t->mm->mmap_sem);if (r)
drivers/gpu/drm/radeon/radeon_mn.c +2 -1
@@ -124,6 +124,7 @@ static void radeon_mn_invalidate_range_start(struct mmu_notifier *mn, unsigned long end) { struct radeon_mn *rmn = container_of(mn, struct radeon_mn, mn); +struct ttm_operation_ctx ctx = { false, false };struct interval_tree_node *it;/* notification is exclusive, but interval is inclusive */
@@ -157,7 +158,7 @@ static void radeon_mn_invalidate_range_start(struct mmu_notifier *mn,DRM_ERROR ("(%ld) failed to wait for user bo\n" , r);radeon_ttm_placement_from_domain (bo,RADEON_GEM_DOMAIN_CPU ); - r =ttm_bo_validate (&bo->tbo, &bo->placement, false, false); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx);if (r)DRM_ERROR ("(%ld) failed to validate user bo\n" , r);
drivers/gpu/drm/radeon/radeon_object.c +9 -5
@@ -329,6 +329,7 @@ void radeon_bo_unref(struct radeon_bo **bo)int radeon_bo_pin_restricted (struct radeon_bo *bo,u32 domain,u64 max_offset,u64 *gpu_addr) { +struct ttm_operation_ctx ctx = { false, false };int r, i;if (radeon_ttm_tt_has_userptr (bo->tbo.ttm))
@@ -371,7 +372,7 @@ int radeon_bo_pin_restricted(struct radeon_bo *bo, u32 domain, u64 max_offset, bo->placements[i].flags |=TTM_PL_FLAG_NO_EVICT ; } - r =ttm_bo_validate (&bo->tbo, &bo->placement, false, false); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx);if (likely (r ==0 )) { bo->pin_count =1 ;if (gpu_addr !=NULL )
@@ -393,6 +394,7 @@ int radeon_bo_pin(struct radeon_bo *bo, u32 domain, u64 *gpu_addr)int radeon_bo_unpin (struct radeon_bo *bo) { +struct ttm_operation_ctx ctx = { false, false };int r, i;if (!bo->pin_count) {
@@ -406,7 +408,7 @@ int radeon_bo_unpin(struct radeon_bo *bo) bo->placements[i].lpfn =0 ; bo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT ; } - r =ttm_bo_validate (&bo->tbo, &bo->placement, false, false); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx);if (likely (r ==0 )) {if (bo->tbo.mem.mem_type ==TTM_PL_VRAM ) bo->rdev->vram_pin_size -=radeon_bo_size (bo);
@@ -531,6 +533,7 @@ int radeon_bo_list_validate(struct radeon_device *rdev,struct ww_acquire_ctx *ticket, struct list_head *head, int ring) { + struct ttm_operation_ctx ctx = { true, false };struct radeon_bo_list *lobj;struct list_head duplicates;int r;
@@ -572,7 +575,7 @@ int radeon_bo_list_validate(struct radeon_device *rdev,radeon_uvd_force_into_uvd_segment (bo, allowed); initial_bytes_moved =atomic64_read (&rdev->num_bytes_moved); - r =ttm_bo_validate (&bo->tbo, &bo->placement, true, false); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx); bytes_moved +=atomic64_read (&rdev->num_bytes_moved) - initial_bytes_moved;
@@ -792,6 +795,7 @@ void radeon_bo_move_notify(struct ttm_buffer_object *bo,int radeon_bo_fault_reserve_notify (struct ttm_buffer_object *bo) { +struct ttm_operation_ctx ctx = { false, false };struct radeon_device *rdev;struct radeon_bo *rbo;unsigned long offset, size, lpfn;
@@ -823,10 +827,10 @@ int radeon_bo_fault_reserve_notify(struct ttm_buffer_object *bo) (!rbo->placements[i].lpfn || rbo->placements[i].lpfn > lpfn)) rbo->placements[i].lpfn = lpfn; } - r =ttm_bo_validate (bo, &rbo->placement, false, false); + r =ttm_bo_validate (bo, &rbo->placement, &ctx);if (unlikely (r == -ENOMEM )) {radeon_ttm_placement_from_domain (rbo,RADEON_GEM_DOMAIN_GTT ); -return ttm_bo_validate (bo, &rbo->placement, false, false); +return ttm_bo_validate (bo, &rbo->placement, &ctx); }else if (unlikely (r !=0 )) {return r; }
drivers/gpu/drm/radeon/radeon_vm.c +2 -1
@@ -387,6 +387,7 @@ static void radeon_vm_set_pages(struct radeon_device *rdev,static int radeon_vm_clear_bo (struct radeon_device *rdev,struct radeon_bo *bo) { +struct ttm_operation_ctx ctx = { true, false };struct radeon_ib ib;unsigned entries;uint64_t addr;
@@ -396,7 +397,7 @@ static int radeon_vm_clear_bo(struct radeon_device *rdev,if (r)return r; - r =ttm_bo_validate (&bo->tbo, &bo->placement, true, false); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx);if (r) goto error_unreserve;
drivers/gpu/drm/ttm/ttm_bo.c +9 -7
@@ -1089,9 +1089,8 @@ bool ttm_bo_mem_compat(struct ttm_placement *placement,EXPORT_SYMBOL (ttm_bo_mem_compat);int ttm_bo_validate (struct ttm_buffer_object *bo, -struct ttm_placement *placement, -bool interruptible, -bool no_wait_gpu) +struct ttm_placement *placement, +struct ttm_operation_ctx *ctx) {int ret;uint32_t new_flags;
@@ -1101,8 +1100,8 @@ int ttm_bo_validate(struct ttm_buffer_object *bo,* Check whether we need to move buffer. */ if (!ttm_bo_mem_compat (placement, &bo->mem, &new_flags)) { - ret =ttm_bo_move_buffer (bo, placement, interruptible, - no_wait_gpu); + ret =ttm_bo_move_buffer (bo, placement, ctx->interruptible, + ctx->no_wait_gpu);if (ret)return ret; }else {
@@ -1217,8 +1216,11 @@ int ttm_bo_init_reserved(struct ttm_bo_device *bdev,WARN_ON (!locked); } -if (likely (!ret)) - ret =ttm_bo_validate (bo, placement, interruptible, false); +if (likely (!ret)) { +struct ttm_operation_ctx ctx = { interruptible, false }; + + ret =ttm_bo_validate (bo, placement, &ctx); + }if (unlikely (ret)) {if (!resv)
drivers/gpu/drm/virtio/virtgpu_ioctl.c +6 -5
@@ -55,6 +55,7 @@ static int virtio_gpu_map_ioctl(struct drm_device *dev, void *data,static int virtio_gpu_object_list_validate (struct ww_acquire_ctx *ticket,struct list_head *head) { +struct ttm_operation_ctx ctx = { false, false };struct ttm_validate_buffer *buf;struct ttm_buffer_object *bo;struct virtio_gpu_object *qobj;
@@ -67,7 +68,7 @@ static int virtio_gpu_object_list_validate(struct ww_acquire_ctx *ticket,list_for_each_entry (buf, head, head) { bo = buf->bo; qobj = container_of(bo, struct virtio_gpu_object, tbo); - ret =ttm_bo_validate (bo, &qobj->placement, false, false); + ret =ttm_bo_validate (bo, &qobj->placement, &ctx);if (ret) {ttm_eu_backoff_reservation (ticket, head);return ret;
@@ -350,6 +351,7 @@ static int virtio_gpu_transfer_from_host_ioctl(struct drm_device *dev,struct virtio_gpu_device *vgdev = dev->dev_private;struct virtio_gpu_fpriv *vfpriv = file->driver_priv;struct drm_virtgpu_3d_transfer_from_host *args = data; +struct ttm_operation_ctx ctx = { true, false };struct drm_gem_object *gobj =NULL ;struct virtio_gpu_object *qobj =NULL ;struct virtio_gpu_fence *fence;
@@ -370,8 +372,7 @@ static int virtio_gpu_transfer_from_host_ioctl(struct drm_device *dev,if (ret) goto out; - ret =ttm_bo_validate (&qobj->tbo, &qobj->placement, - true, false); + ret =ttm_bo_validate (&qobj->tbo, &qobj->placement, &ctx);if (unlikely (ret)) goto out_unres;
@@ -397,6 +398,7 @@ static int virtio_gpu_transfer_to_host_ioctl(struct drm_device *dev, void *data,struct virtio_gpu_device *vgdev = dev->dev_private;struct virtio_gpu_fpriv *vfpriv = file->driver_priv;struct drm_virtgpu_3d_transfer_to_host *args = data; +struct ttm_operation_ctx ctx = { true, false };struct drm_gem_object *gobj =NULL ;struct virtio_gpu_object *qobj =NULL ;struct virtio_gpu_fence *fence;
@@ -414,8 +416,7 @@ static int virtio_gpu_transfer_to_host_ioctl(struct drm_device *dev, void *data,if (ret) goto out; - ret =ttm_bo_validate (&qobj->tbo, &qobj->placement, - true, false); + ret =ttm_bo_validate (&qobj->tbo, &qobj->placement, &ctx);if (unlikely (ret)) goto out_unres;
drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c +2 -1
@@ -386,6 +386,7 @@ static int vmw_cotable_readback(struct vmw_resource *res)*/ static int vmw_cotable_resize (struct vmw_resource *res,size_t new_size) { +struct ttm_operation_ctx ctx = { false, false };struct vmw_private *dev_priv = res->dev_priv;struct vmw_cotable *vcotbl =vmw_cotable (res);struct vmw_dma_buffer *buf, *old_buf = res->backup;
@@ -454,7 +455,7 @@ static int vmw_cotable_resize(struct vmw_resource *res, size_t new_size) }/* Unpin new buffer, and switch backup buffers. */ - ret =ttm_bo_validate (bo, &vmw_mob_placement, false, false); + ret =ttm_bo_validate (bo, &vmw_mob_placement, &ctx);if (unlikely (ret !=0 )) {DRM_ERROR ("Failed validating new COTable backup buffer.\n" ); goto out_wait;
drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c +13 -8
@@ -47,6 +47,7 @@ int vmw_dmabuf_pin_in_placement(struct vmw_private *dev_priv, struct ttm_placement *placement, bool interruptible) { +struct ttm_operation_ctx ctx = {interruptible, false };struct ttm_buffer_object *bo = &buf->base;int ret;uint32_t new_flags;
@@ -65,7 +66,7 @@ int vmw_dmabuf_pin_in_placement(struct vmw_private *dev_priv, ret =ttm_bo_mem_compat (placement, &bo->mem, &new_flags) == true ?0 : -EINVAL ; else - ret =ttm_bo_validate (bo, placement, interruptible, false); + ret =ttm_bo_validate (bo, placement, &ctx);if (!ret)vmw_bo_pin_reserved (buf, true);
@@ -95,6 +96,7 @@ int vmw_dmabuf_pin_in_vram_or_gmr(struct vmw_private *dev_priv, struct vmw_dma_buffer *buf, bool interruptible) { +struct ttm_operation_ctx ctx = {interruptible, false };struct ttm_buffer_object *bo = &buf->base;int ret;uint32_t new_flags;
@@ -115,12 +117,11 @@ int vmw_dmabuf_pin_in_vram_or_gmr(struct vmw_private *dev_priv, goto out_unreserve; } - ret =ttm_bo_validate (bo, &vmw_vram_gmr_placement, interruptible, - false); + ret =ttm_bo_validate (bo, &vmw_vram_gmr_placement, &ctx);if (likely (ret ==0 ) || ret == -ERESTARTSYS ) goto out_unreserve; - ret =ttm_bo_validate (bo, &vmw_vram_placement, interruptible, false); + ret =ttm_bo_validate (bo, &vmw_vram_placement, &ctx); out_unreserve:if (!ret)
@@ -170,6 +171,7 @@ int vmw_dmabuf_pin_in_start_of_vram(struct vmw_private *dev_priv, struct vmw_dma_buffer *buf, bool interruptible) { +struct ttm_operation_ctx ctx = {interruptible, false };struct ttm_buffer_object *bo = &buf->base;struct ttm_placement placement;struct ttm_place place;
@@ -200,14 +202,16 @@ int vmw_dmabuf_pin_in_start_of_vram(struct vmw_private *dev_priv,if (bo->mem.mem_type ==TTM_PL_VRAM && bo->mem.start < bo->num_pages && bo->mem.start >0 && - buf->pin_count ==0 ) - (void )ttm_bo_validate (bo, &vmw_sys_placement, false, false); + buf->pin_count ==0 ) { + ctx.interruptible = false; + (void )ttm_bo_validate (bo, &vmw_sys_placement, &ctx); + }if (buf->pin_count >0 ) ret =ttm_bo_mem_compat (&placement, &bo->mem, &new_flags) == true ?0 : -EINVAL ;else - ret =ttm_bo_validate (bo, &placement, interruptible, false); + ret =ttm_bo_validate (bo, &placement, &ctx);/* For some reason we didn't end up at the start of vram */ WARN_ON (ret ==0 && bo->offset !=0 );
@@ -286,6 +290,7 @@ void vmw_bo_get_guest_ptr(const struct ttm_buffer_object *bo,*/ void vmw_bo_pin_reserved (struct vmw_dma_buffer *vbo,bool pin) { +struct ttm_operation_ctx ctx = { false, true };struct ttm_place pl;struct ttm_placement placement;struct ttm_buffer_object *bo = &vbo->base;
@@ -314,7 +319,7 @@ void vmw_bo_pin_reserved(struct vmw_dma_buffer *vbo, bool pin) placement.num_placement =1 ; placement.placement = &pl; - ret =ttm_bo_validate (bo, &placement, false, true); + ret =ttm_bo_validate (bo, &placement, &ctx);BUG_ON (ret !=0 || bo->mem.mem_type != old_mem_type); }
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +4 -5
@@ -3652,14 +3652,14 @@ int vmw_validate_single_buffer(struct vmw_private *dev_priv, { struct vmw_dma_buffer *vbo = container_of(bo, struct vmw_dma_buffer, base); +struct ttm_operation_ctx ctx = { interruptible, true };int ret;if (vbo->pin_count >0 )return 0 ;if (validate_as_mob) -return ttm_bo_validate (bo, &vmw_mob_placement, interruptible, - false); +return ttm_bo_validate (bo, &vmw_mob_placement, &ctx);/** * Put BO in VRAM if there is space, otherwise as a GMR.
@@ -3668,8 +3668,7 @@ int vmw_validate_single_buffer(struct vmw_private *dev_priv,* used as a GMR, this will return -ENOMEM. */ - ret =ttm_bo_validate (bo, &vmw_vram_gmr_placement, interruptible, - false); + ret =ttm_bo_validate (bo, &vmw_vram_gmr_placement, &ctx);if (likely (ret ==0 || ret == -ERESTARTSYS ))return ret;
@@ -3678,7 +3677,7 @@ int vmw_validate_single_buffer(struct vmw_private *dev_priv,* previous contents. */ - ret =ttm_bo_validate (bo, &vmw_vram_placement, interruptible, false); + ret =ttm_bo_validate (bo, &vmw_vram_placement, &ctx);return ret; }
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c +4 -2
@@ -1222,6 +1222,7 @@ vmw_resource_check_buffer(struct vmw_resource *res,bool interruptible, struct ttm_validate_buffer *val_buf) { + struct ttm_operation_ctx ctx = { true, false };struct list_head val_list;bool backup_dirty = false;int ret;
@@ -1246,7 +1247,7 @@ vmw_resource_check_buffer(struct vmw_resource *res, backup_dirty = res->backup_dirty; ret =ttm_bo_validate (&res->backup->base, res->func->backup_placement, - true, false); + &ctx);if (unlikely (ret !=0 )) goto out_no_validate;
@@ -1700,6 +1701,7 @@ void vmw_resource_evict_all(struct vmw_private *dev_priv)*/ int vmw_resource_pin (struct vmw_resource *res,bool interruptible) { +struct ttm_operation_ctx ctx = { interruptible, false };struct vmw_private *dev_priv = res->dev_priv;int ret;
@@ -1720,7 +1722,7 @@ int vmw_resource_pin(struct vmw_resource *res, bool interruptible) ret =ttm_bo_validate (&vbo->base, res->func->backup_placement, - interruptible, false); + &ctx);if (ret) {ttm_bo_unreserve (&vbo->base); goto out_no_validate;
drivers/gpu/drm/vmwgfx/vmwgfx_shader.c +2 -1
@@ -969,6 +969,7 @@ int vmw_compat_shader_add(struct vmw_private *dev_priv,size_t size, struct list_head *list) { + struct ttm_operation_ctx ctx = { false, true };struct vmw_dma_buffer *buf;struct ttm_bo_kmap_obj map;bool is_iomem;
@@ -1004,7 +1005,7 @@ int vmw_compat_shader_add(struct vmw_private *dev_priv,WARN_ON (is_iomem);ttm_bo_kunmap (&map); - ret =ttm_bo_validate (&buf->base, &vmw_sys_placement, false, true); + ret =ttm_bo_validate (&buf->base, &vmw_sys_placement, &ctx);WARN_ON (ret !=0 );ttm_bo_unreserve (&buf->base);
include/drm/ttm/ttm_bo_api.h +16 -4
@@ -259,6 +259,20 @@ struct ttm_bo_kmap_obj { };/** +* struct ttm_operation_ctx +* +* @interruptible: Sleep interruptible if sleeping. +* @no_wait_gpu: Return immediately if the GPU is busy. +* +* Context for TTM operations like changing buffer placement or general memory +* allocation. +*/ +struct ttm_operation_ctx { +bool interruptible; +bool no_wait_gpu; +}; + +/** * ttm_bo_reference - reference a struct ttm_buffer_object * * @bo: The buffer object.
@@ -306,8 +320,7 @@ bool ttm_bo_mem_compat(struct ttm_placement *placement, struct ttm_mem_reg *mem,* * @bo: The buffer object. * @placement: Proposed placement for the buffer object. -* @interruptible: Sleep interruptible if sleeping. -* @no_wait_gpu: Return immediately if the GPU is busy. +* @ctx: validation parameters. * * Changes placement and caching policy of the buffer object * according proposed placement.
@@ -319,8 +332,7 @@ bool ttm_bo_mem_compat(struct ttm_placement *placement, struct ttm_mem_reg *mem,*/ int ttm_bo_validate (struct ttm_buffer_object *bo,struct ttm_placement *placement, -bool interruptible, -bool no_wait_gpu); +struct ttm_operation_ctx *ctx);/** * ttm_bo_unref
Signature · 6 lines
2.5.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 8/11 drm/ttm: add context to driver move callback as well
In reply to Christian KönigFrom: Christian König <[email protected]>
Instead of passing the parameters manually.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 21 +++++++++++---------- drivers/gpu/drm/nouveau/nouveau_bo.c | 27 ++++++++++++++++----------- drivers/gpu/drm/qxl/qxl_ttm.c | 9 ++++----- drivers/gpu/drm/radeon/radeon_ttm.c | 23 ++++++++++++----------- drivers/gpu/drm/ttm/ttm_bo.c | 3 +-- drivers/gpu/drm/virtio/virtgpu_ttm.c | 7 +++---- include/drm/ttm/ttm_bo_driver.h | 6 ++---- 7 files changed, 49 insertions(+), 47 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +11 -10
@@ -451,10 +451,9 @@ static int amdgpu_move_ram_vram(struct ttm_buffer_object *bo,return r; } -static int amdgpu_bo_move (struct ttm_buffer_object *bo, -bool evict,bool interruptible, -bool no_wait_gpu, -struct ttm_mem_reg *new_mem) +static int amdgpu_bo_move (struct ttm_buffer_object *bo,bool evict, +struct ttm_operation_ctx *ctx, +struct ttm_mem_reg *new_mem) {struct amdgpu_device *adev;struct amdgpu_bo *abo;
@@ -489,19 +488,21 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo,if (old_mem->mem_type ==TTM_PL_VRAM && new_mem->mem_type ==TTM_PL_SYSTEM ) { - r =amdgpu_move_vram_ram (bo, evict, interruptible, - no_wait_gpu, new_mem); + r =amdgpu_move_vram_ram (bo, evict, ctx->interruptible, + ctx->no_wait_gpu, new_mem); }else if (old_mem->mem_type ==TTM_PL_SYSTEM && new_mem->mem_type ==TTM_PL_VRAM ) { - r =amdgpu_move_ram_vram (bo, evict, interruptible, - no_wait_gpu, new_mem); + r =amdgpu_move_ram_vram (bo, evict, ctx->interruptible, + ctx->no_wait_gpu, new_mem); }else { - r =amdgpu_move_blit (bo, evict, no_wait_gpu, new_mem, old_mem); + r =amdgpu_move_blit (bo, evict, ctx->no_wait_gpu, + new_mem, old_mem); }if (r) { memcpy: - r =ttm_bo_move_memcpy (bo, interruptible, no_wait_gpu, new_mem); + r =ttm_bo_move_memcpy (bo, ctx->interruptible, + ctx->no_wait_gpu, new_mem);if (r) {return r; }
drivers/gpu/drm/nouveau/nouveau_bo.c +16 -11
@@ -1253,8 +1253,9 @@ nouveau_bo_vm_cleanup(struct ttm_buffer_object *bo, }static int -nouveau_bo_move (struct ttm_buffer_object *bo,bool evict,bool intr, -bool no_wait_gpu,struct ttm_mem_reg *new_mem) +nouveau_bo_move (struct ttm_buffer_object *bo,bool evict, +struct ttm_operation_ctx *ctx, +struct ttm_mem_reg *new_mem) {struct nouveau_drm *drm =nouveau_bdev (bo->bdev);struct nouveau_bo *nvbo =nouveau_bo (bo);
@@ -1262,7 +1263,7 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, bool intr,struct nouveau_drm_tile *new_tile =NULL ;int ret =0 ; - ret =ttm_bo_wait (bo, intr, no_wait_gpu); + ret =ttm_bo_wait (bo, ctx->interruptible, ctx->no_wait_gpu);if (ret)return ret;
@@ -1286,22 +1287,26 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, bool intr,/* Hardware assisted copy. */ if (drm->ttm.move) {if (new_mem->mem_type ==TTM_PL_SYSTEM ) - ret =nouveau_bo_move_flipd (bo, evict, intr, - no_wait_gpu, new_mem); + ret =nouveau_bo_move_flipd (bo, evict, + ctx->interruptible, + ctx->no_wait_gpu, new_mem);else if (old_mem->mem_type ==TTM_PL_SYSTEM ) - ret =nouveau_bo_move_flips (bo, evict, intr, - no_wait_gpu, new_mem); + ret =nouveau_bo_move_flips (bo, evict, + ctx->interruptible, + ctx->no_wait_gpu, new_mem);else - ret =nouveau_bo_move_m2mf (bo, evict, intr, - no_wait_gpu, new_mem); + ret =nouveau_bo_move_m2mf (bo, evict, + ctx->interruptible, + ctx->no_wait_gpu, new_mem);if (!ret) goto out; }/* Fallback to software copy. */ - ret =ttm_bo_wait (bo, intr, no_wait_gpu); + ret =ttm_bo_wait (bo, ctx->interruptible, ctx->no_wait_gpu);if (ret ==0 ) - ret =ttm_bo_move_memcpy (bo, intr, no_wait_gpu, new_mem); + ret =ttm_bo_move_memcpy (bo, ctx->interruptible, + ctx->no_wait_gpu, new_mem); out:if (drm->device.info.family <NV_DEVICE_INFO_V0_TESLA ) {
drivers/gpu/drm/qxl/qxl_ttm.c +4 -5
@@ -345,15 +345,14 @@ static void qxl_move_null(struct ttm_buffer_object *bo, new_mem->mm_node =NULL ; } -static int qxl_bo_move (struct ttm_buffer_object *bo, -bool evict,bool interruptible, -bool no_wait_gpu, +static int qxl_bo_move (struct ttm_buffer_object *bo,bool evict, +struct ttm_operation_ctx *ctx,struct ttm_mem_reg *new_mem) {struct ttm_mem_reg *old_mem = &bo->mem;int ret; - ret =ttm_bo_wait (bo, interruptible, no_wait_gpu); + ret =ttm_bo_wait (bo, ctx->interruptible, ctx->no_wait_gpu);if (ret)return ret;
@@ -362,7 +361,7 @@ static int qxl_bo_move(struct ttm_buffer_object *bo,qxl_move_null (bo, new_mem);return 0 ; } -return ttm_bo_move_memcpy (bo, interruptible, no_wait_gpu, +return ttm_bo_move_memcpy (bo, ctx->interruptible, ctx->no_wait_gpu, new_mem); }
drivers/gpu/drm/radeon/radeon_ttm.c +12 -11
@@ -393,17 +393,16 @@ static int radeon_move_ram_vram(struct ttm_buffer_object *bo,return r; } -static int radeon_bo_move (struct ttm_buffer_object *bo, -bool evict,bool interruptible, -bool no_wait_gpu, -struct ttm_mem_reg *new_mem) +static int radeon_bo_move (struct ttm_buffer_object *bo,bool evict, +struct ttm_operation_ctx *ctx, +struct ttm_mem_reg *new_mem) {struct radeon_device *rdev;struct radeon_bo *rbo;struct ttm_mem_reg *old_mem = &bo->mem;int r; - r =ttm_bo_wait (bo, interruptible, no_wait_gpu); + r =ttm_bo_wait (bo, ctx->interruptible, ctx->no_wait_gpu);if (r)return r;
@@ -433,19 +432,21 @@ static int radeon_bo_move(struct ttm_buffer_object *bo,if (old_mem->mem_type ==TTM_PL_VRAM && new_mem->mem_type ==TTM_PL_SYSTEM ) { - r =radeon_move_vram_ram (bo, evict, interruptible, - no_wait_gpu, new_mem); + r =radeon_move_vram_ram (bo, evict, ctx->interruptible, + ctx->no_wait_gpu, new_mem); }else if (old_mem->mem_type ==TTM_PL_SYSTEM && new_mem->mem_type ==TTM_PL_VRAM ) { - r =radeon_move_ram_vram (bo, evict, interruptible, - no_wait_gpu, new_mem); + r =radeon_move_ram_vram (bo, evict, ctx->interruptible, + ctx->no_wait_gpu, new_mem); }else { - r =radeon_move_blit (bo, evict, no_wait_gpu, new_mem, old_mem); + r =radeon_move_blit (bo, evict, ctx->no_wait_gpu, + new_mem, old_mem); }if (r) { memcpy: - r =ttm_bo_move_memcpy (bo, interruptible, no_wait_gpu, new_mem); + r =ttm_bo_move_memcpy (bo, ctx->interruptible, + ctx->no_wait_gpu, new_mem);if (r) {return r; }
drivers/gpu/drm/ttm/ttm_bo.c +1 -2
@@ -344,8 +344,7 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo, ret =ttm_bo_move_ttm (bo, ctx->interruptible, ctx->no_wait_gpu, mem); else if (bdev->driver->move) - ret = bdev->driver->move (bo, evict, ctx->interruptible, - ctx->no_wait_gpu, mem); + ret = bdev->driver->move (bo, evict, ctx, mem); else ret =ttm_bo_move_memcpy (bo, ctx->interruptible, ctx->no_wait_gpu, mem);
drivers/gpu/drm/virtio/virtgpu_ttm.c +3 -4
@@ -370,14 +370,13 @@ static void virtio_gpu_move_null(struct ttm_buffer_object *bo, new_mem->mm_node =NULL ; } -static int virtio_gpu_bo_move (struct ttm_buffer_object *bo, -bool evict,bool interruptible, -bool no_wait_gpu, +static int virtio_gpu_bo_move (struct ttm_buffer_object *bo,bool evict, +struct ttm_operation_ctx *ctx,struct ttm_mem_reg *new_mem) {int ret; - ret =ttm_bo_wait (bo, interruptible, no_wait_gpu); + ret =ttm_bo_wait (bo, ctx->interruptible, ctx->no_wait_gpu);if (ret)return ret;
include/drm/ttm/ttm_bo_driver.h +2 -4
@@ -407,15 +407,13 @@ struct ttm_bo_driver {* @bo: the buffer to move * @evict: whether this motion is evicting the buffer from * the graphics address space -* @interruptible: Use interruptible sleeps if possible when sleeping. -* @no_wait: whether this should give up and return -EBUSY -* if this move would require sleeping +* @ctx: context for this move with parameters * @new_mem: the new memory region receiving the buffer * * Move a buffer between two memory regions. */ int (*move)(struct ttm_buffer_object *bo,bool evict, -bool interruptible,bool no_wait_gpu, +struct ttm_operation_ctx *ctx,struct ttm_mem_reg *new_mem);/**
Signature · 6 lines
2.5.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel