[PATCH 2/5] drm/amdgpu: nuke amdgpu_ttm_is_bound()

[ckoenig.leichtzumerken@xxxxxxxxx (Christian König)]

Am 23.10.2017 um 09:33 schrieb Chunming Zhou:
> using ttm->state == tt_bound seems make more sense.

That won't work. We set ttm->state = tt_bound even when we haven't 
allocated GART space.

That's also a reason why I wanted to remove it, the name is confusing.

Christian.

>
>
> On 2017å¹´10æ??20æ?¥ 17:20, Christian König wrote:
>> From: Christian König <christian.koenig at amd.com>
>>
>> use amdgpu_gtt_mgr_is_allocated() instead.
>>
>> Signed-off-by: Christian König <christian.koenig at amd.com>
>> ---
>> Â  drivers/gpu/drm/amd/amdgpu/amdgpu_object.c |Â  2 +-
>> Â  drivers/gpu/drm/amd/amdgpu/amdgpu_object.h |Â  2 +-
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c    | 15 +++++----------
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h    |  1 -
>> Â  4 files changed, 7 insertions(+), 13 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c 
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
>> index 8b4ed8a98a18..71a0c1a477ae 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
>> @@ -980,7 +980,7 @@ u64 amdgpu_bo_gpu_offset(struct amdgpu_bo *bo)
>> Â  {
>> Â Â Â Â Â  WARN_ON_ONCE(bo->tbo.mem.mem_type == TTM_PL_SYSTEM);
>> Â Â Â Â Â  WARN_ON_ONCE(bo->tbo.mem.mem_type == TTM_PL_TT &&
>> -Â Â Â Â Â Â Â Â Â Â Â Â  !amdgpu_ttm_is_bound(bo->tbo.ttm));
>> + !amdgpu_gtt_mgr_is_allocated(&bo->tbo.mem));
>> WARN_ON_ONCE(!ww_mutex_is_locked(&bo->tbo.resv->lock) &&
>> Â Â Â Â Â Â Â Â Â Â Â Â Â Â  !bo->pin_count);
>> Â Â Â Â Â  WARN_ON_ONCE(bo->tbo.mem.start == AMDGPU_BO_INVALID_OFFSET);
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h 
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
>> index 428aae048f4b..3affcc497be6 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
>> @@ -187,7 +187,7 @@ static inline u64 amdgpu_bo_mmap_offset(struct 
>> amdgpu_bo *bo)
>> Â  static inline bool amdgpu_bo_gpu_accessible(struct amdgpu_bo *bo)
>> Â  {
>> Â Â Â Â Â  switch (bo->tbo.mem.mem_type) {
>> -Â Â Â  case TTM_PL_TT: return amdgpu_ttm_is_bound(bo->tbo.ttm);
>> +Â Â Â  case TTM_PL_TT: return amdgpu_gtt_mgr_is_allocated(&bo->tbo.mem);
>> Â Â Â Â Â  case TTM_PL_VRAM: return true;
>> Â Â Â Â Â  default: return false;
>> Â Â Â Â Â  }
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c 
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>> index 32c822f3db11..1c9faa1a53ce 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>> @@ -861,8 +861,10 @@ static int amdgpu_ttm_backend_bind(struct ttm_tt 
>> *ttm,
>> Â Â Â Â Â Â Â Â Â  bo_mem->mem_type == AMDGPU_PL_OA)
>> Â Â Â Â Â Â Â Â Â  return -EINVAL;
>> Â  -Â Â Â  if (!amdgpu_gtt_mgr_is_allocated(bo_mem))
>> +Â Â Â  if (!amdgpu_gtt_mgr_is_allocated(bo_mem)) {
>> +Â Â Â Â Â Â Â  gtt->offset = AMDGPU_BO_INVALID_OFFSET;
>> Â Â Â Â Â Â Â Â Â  return 0;
>> +Â Â Â  }
>> Â  Â Â Â Â Â  spin_lock(&gtt->adev->gtt_list_lock);
>> Â Â Â Â Â  flags = amdgpu_ttm_tt_pte_flags(gtt->adev, ttm, bo_mem);
>> @@ -882,13 +884,6 @@ static int amdgpu_ttm_backend_bind(struct ttm_tt 
>> *ttm,
>> Â Â Â Â Â  return r;
>> Â  }
>> Â  -bool amdgpu_ttm_is_bound(struct ttm_tt *ttm)
>> -{
>> -Â Â Â  struct amdgpu_ttm_tt *gtt = (void *)ttm;
>> -
>> -Â Â Â  return gtt && !list_empty(&gtt->list);
>> -}
>> -
>> Â  int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct 
>> ttm_mem_reg *bo_mem)
>> Â  {
>> Â Â Â Â Â  struct amdgpu_device *adev = amdgpu_ttm_adev(bo->bdev);
>> @@ -899,7 +894,7 @@ int amdgpu_ttm_bind(struct ttm_buffer_object *bo, 
>> struct ttm_mem_reg *bo_mem)
>> Â Â Â Â Â  struct ttm_place placements;
>> Â Â Â Â Â  int r;
>> Â  -Â Â Â  if (!ttm || amdgpu_ttm_is_bound(ttm))
>> +Â Â Â  if (!ttm || amdgpu_gtt_mgr_is_allocated(bo_mem))
>> Â Â Â Â Â Â Â Â Â  return 0;
>> Â  Â Â Â Â Â  tmp = bo->mem;
>> @@ -960,7 +955,7 @@ static int amdgpu_ttm_backend_unbind(struct 
>> ttm_tt *ttm)
>> Â Â Â Â Â  if (gtt->userptr)
>> Â Â Â Â Â Â Â Â Â  amdgpu_ttm_tt_unpin_userptr(ttm);
>> Â  -Â Â Â  if (!amdgpu_ttm_is_bound(ttm))
>> +Â Â Â  if (gtt->offset == AMDGPU_BO_INVALID_OFFSET)
>> Â Â Â Â Â Â Â Â Â  return 0;
>> Â  Â Â Â Â Â  /* unbind shouldn't be done for GDS/GWS/OA in ttm_bo_clean_mm */
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h 
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
>> index abd4084982a3..89a71abc71e0 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
>> @@ -90,7 +90,6 @@ int amdgpu_fill_buffer(struct amdgpu_bo *bo,
>> Â Â Â Â Â Â Â Â Â Â Â Â Â  struct dma_fence **fence);
>> Â  Â  int amdgpu_mmap(struct file *filp, struct vm_area_struct *vma);
>> -bool amdgpu_ttm_is_bound(struct ttm_tt *ttm);
>> Â  int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct 
>> ttm_mem_reg *bo_mem);
>> Â  int amdgpu_ttm_recover_gart(struct amdgpu_device *adev);
>