Message ID | 20200917043040.146575-6-airlied@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm/ttm: bind/unbind + cleanups | expand |
Am 17.09.20 um 06:30 schrieb Dave Airlie: > From: Dave Airlie <airlied@redhat.com> > > This pattern is called in a few places, just clean it up. > > Signed-off-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Christian König <christian.koenig@amd.com> > --- > drivers/gpu/drm/ttm/ttm_bo_util.c | 18 ++++++------------ > include/drm/ttm/ttm_bo_driver.h | 10 ++++++++-- > 2 files changed, 14 insertions(+), 14 deletions(-) > > diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c > index 919489f6a5a3..5a8d77ef504f 100644 > --- a/drivers/gpu/drm/ttm/ttm_bo_util.c > +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c > @@ -87,9 +87,7 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo, > return ret; > } > > - *old_mem = *new_mem; > - new_mem->mm_node = NULL; > - > + ttm_bo_assign_mem(bo, new_mem); > return 0; > } > EXPORT_SYMBOL(ttm_bo_move_ttm); > @@ -299,8 +297,8 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo, > mb(); > out2: > old_copy = *old_mem; > - *old_mem = *new_mem; > - new_mem->mm_node = NULL; > + > + ttm_bo_assign_mem(bo, new_mem); > > if (!man->use_tt) > ttm_bo_tt_destroy(bo); > @@ -535,7 +533,6 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo, > { > struct ttm_bo_device *bdev = bo->bdev; > struct ttm_resource_manager *man = ttm_manager_type(bdev, new_mem->mem_type); > - struct ttm_resource *old_mem = &bo->mem; > int ret; > struct ttm_buffer_object *ghost_obj; > > @@ -582,8 +579,7 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo, > ttm_bo_put(ghost_obj); > } > > - *old_mem = *new_mem; > - new_mem->mm_node = NULL; > + ttm_bo_assign_mem(bo, new_mem); > > return 0; > } > @@ -594,9 +590,8 @@ int ttm_bo_pipeline_move(struct ttm_buffer_object *bo, > struct ttm_resource *new_mem) > { > struct ttm_bo_device *bdev = bo->bdev; > - struct ttm_resource *old_mem = &bo->mem; > > - struct ttm_resource_manager *from = ttm_manager_type(bdev, old_mem->mem_type); > + struct ttm_resource_manager *from = ttm_manager_type(bdev, bo->mem.mem_type); > struct ttm_resource_manager *to = ttm_manager_type(bdev, new_mem->mem_type); > > int ret; > @@ -673,8 +668,7 @@ int ttm_bo_pipeline_move(struct ttm_buffer_object *bo, > ttm_bo_free_old_node(bo); > } > > - *old_mem = *new_mem; > - new_mem->mm_node = NULL; > + ttm_bo_assign_mem(bo, new_mem); > > return 0; > } > diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h > index 7846dfa507f7..25cc932d63f1 100644 > --- a/include/drm/ttm/ttm_bo_driver.h > +++ b/include/drm/ttm/ttm_bo_driver.h > @@ -539,6 +539,13 @@ static inline void ttm_bo_move_to_lru_tail_unlocked(struct ttm_buffer_object *bo > spin_unlock(&ttm_bo_glob.lru_lock); > } > > +static inline void ttm_bo_assign_mem(struct ttm_buffer_object *bo, > + struct ttm_resource *new_mem) > +{ > + bo->mem = *new_mem; > + new_mem->mm_node = NULL; > +} > + > /** > * ttm_bo_move_null = assign memory for a buffer object. > * @bo: The bo to assign the memory to > @@ -552,8 +559,7 @@ static inline void ttm_bo_move_null(struct ttm_buffer_object *bo, > struct ttm_resource *old_mem = &bo->mem; > > WARN_ON(old_mem->mm_node != NULL); > - *old_mem = *new_mem; > - new_mem->mm_node = NULL; > + ttm_bo_assign_mem(bo, new_mem); > } > > /**
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index 919489f6a5a3..5a8d77ef504f 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c @@ -87,9 +87,7 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo, return ret; } - *old_mem = *new_mem; - new_mem->mm_node = NULL; - + ttm_bo_assign_mem(bo, new_mem); return 0; } EXPORT_SYMBOL(ttm_bo_move_ttm); @@ -299,8 +297,8 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo, mb(); out2: old_copy = *old_mem; - *old_mem = *new_mem; - new_mem->mm_node = NULL; + + ttm_bo_assign_mem(bo, new_mem); if (!man->use_tt) ttm_bo_tt_destroy(bo); @@ -535,7 +533,6 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo, { struct ttm_bo_device *bdev = bo->bdev; struct ttm_resource_manager *man = ttm_manager_type(bdev, new_mem->mem_type); - struct ttm_resource *old_mem = &bo->mem; int ret; struct ttm_buffer_object *ghost_obj; @@ -582,8 +579,7 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo, ttm_bo_put(ghost_obj); } - *old_mem = *new_mem; - new_mem->mm_node = NULL; + ttm_bo_assign_mem(bo, new_mem); return 0; } @@ -594,9 +590,8 @@ int ttm_bo_pipeline_move(struct ttm_buffer_object *bo, struct ttm_resource *new_mem) { struct ttm_bo_device *bdev = bo->bdev; - struct ttm_resource *old_mem = &bo->mem; - struct ttm_resource_manager *from = ttm_manager_type(bdev, old_mem->mem_type); + struct ttm_resource_manager *from = ttm_manager_type(bdev, bo->mem.mem_type); struct ttm_resource_manager *to = ttm_manager_type(bdev, new_mem->mem_type); int ret; @@ -673,8 +668,7 @@ int ttm_bo_pipeline_move(struct ttm_buffer_object *bo, ttm_bo_free_old_node(bo); } - *old_mem = *new_mem; - new_mem->mm_node = NULL; + ttm_bo_assign_mem(bo, new_mem); return 0; } diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index 7846dfa507f7..25cc932d63f1 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h @@ -539,6 +539,13 @@ static inline void ttm_bo_move_to_lru_tail_unlocked(struct ttm_buffer_object *bo spin_unlock(&ttm_bo_glob.lru_lock); } +static inline void ttm_bo_assign_mem(struct ttm_buffer_object *bo, + struct ttm_resource *new_mem) +{ + bo->mem = *new_mem; + new_mem->mm_node = NULL; +} + /** * ttm_bo_move_null = assign memory for a buffer object. * @bo: The bo to assign the memory to @@ -552,8 +559,7 @@ static inline void ttm_bo_move_null(struct ttm_buffer_object *bo, struct ttm_resource *old_mem = &bo->mem; WARN_ON(old_mem->mm_node != NULL); - *old_mem = *new_mem; - new_mem->mm_node = NULL; + ttm_bo_assign_mem(bo, new_mem); } /**