[PATCH 07/10] drm/amdgpu: stop using gart_start as offset for the GTT domain

[Zhang, Jerry (Junwei)]

On 08/28/2018 03:07 AM, Alex Deucher wrote:
> On Mon, Aug 27, 2018 at 12:56 PM Christian König
> <ckoenig.leichtzumerken at gmail.com> wrote:
>>
>> Further separate GART and GTT domain.
>>
>> Signed-off-by: Christian König <christian.koenig at amd.com>
>
> Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

Reviewed-by: Junwei Zhang <Jerry.Zhang at amd.com>

>
>> ---
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 3 ++-
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c     | 6 +++---
>>   2 files changed, 5 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
>> index da7b1b92d9cf..c2539f6821c0 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
>> @@ -143,7 +143,8 @@ static int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man,
>>          spin_unlock(&mgr->lock);
>>
>>          if (!r)
>> -               mem->start = node->node.start;
>> +               mem->start = node->node.start +
>> +                       (adev->gmc.gart_start >> PAGE_SHIFT);
>>
>>          return r;
>>   }
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>> index 2f304f9dd543..5cadf4f1ee2c 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>> @@ -188,7 +188,7 @@ static int amdgpu_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
>>          case TTM_PL_TT:
>>                  /* GTT memory  */
>>                  man->func = &amdgpu_gtt_mgr_func;
>> -               man->gpu_offset = adev->gmc.gart_start;
>> +               man->gpu_offset = 0;
>>                  man->available_caching = TTM_PL_MASK_CACHING;
>>                  man->default_caching = TTM_PL_FLAG_CACHED;
>>                  man->flags = TTM_MEMTYPE_FLAG_MAPPABLE | TTM_MEMTYPE_FLAG_CMA;
>> @@ -1062,7 +1062,7 @@ static int amdgpu_ttm_backend_bind(struct ttm_tt *ttm,
>>          flags = amdgpu_ttm_tt_pte_flags(adev, ttm, bo_mem);
>>
>>          /* bind pages into GART page tables */
>> -       gtt->offset = (u64)bo_mem->start << PAGE_SHIFT;
>> +       gtt->offset = ((u64)bo_mem->start << PAGE_SHIFT) - adev->gmc.gart_start;
>>          r = amdgpu_gart_bind(adev, gtt->offset, ttm->num_pages,
>>                  ttm->pages, gtt->ttm.dma_address, flags);
>>
>> @@ -1110,7 +1110,7 @@ int amdgpu_ttm_alloc_gart(struct ttm_buffer_object *bo)
>>          flags = amdgpu_ttm_tt_pte_flags(adev, bo->ttm, &tmp);
>>
>>          /* Bind pages */
>> -       gtt->offset = (u64)tmp.start << PAGE_SHIFT;
>> +       gtt->offset = ((u64)tmp.start << PAGE_SHIFT) - adev->gmc.gart_start;
>>          r = amdgpu_ttm_gart_bind(adev, bo, flags);
>>          if (unlikely(r)) {
>>                  ttm_bo_mem_put(bo, &tmp);
>> --
>> 2.17.1
>>
>> _______________________________________________
>> amd-gfx mailing list
>> amd-gfx at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
>