drm/amdgpu: remove extra root PD alignment
Subsystems (3)
PATCH 1/11 drm/amdgpu: remove extra root PD alignment
Just another leftover from radeon.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 3 --- 2 files changed, 1 insertion(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1 -3
@@ -2566,8 +2566,6 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, {struct amdgpu_bo_param bp;struct amdgpu_bo *root; -const unsigned align =min (AMDGPU_VM_PTB_ALIGN_SIZE , -AMDGPU_VM_PTE_COUNT (adev) *8 );unsigned long size;uint64_t flags;int r, i;
@@ -2615,7 +2613,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, size =amdgpu_vm_bo_size (adev, adev->vm_manager.root_level);memset (&bp,0 ,sizeof (bp)); bp.size = size; - bp.byte_align = align; + bp.byte_align =AMDGPU_GPU_PAGE_SIZE ; bp.domain =AMDGPU_GEM_DOMAIN_VRAM ; bp.flags = flags; bp.type = ttm_bo_type_kernel;
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +0 -3
@@ -48,9 +48,6 @@ struct amdgpu_bo_list_entry;/* number of entries in page table */ #define AMDGPU_VM_PTE_COUNT (adev) (1 << (adev)->vm_manager.block_size) -/* PTBs (Page Table Blocks) need to be aligned to 32K */ -#define AMDGPU_VM_PTB_ALIGN_SIZE 32768 -#define AMDGPU_PTE_VALID (1ULL << 0)#define AMDGPU_PTE_SYSTEM (1ULL << 1)#define AMDGPU_PTE_SNOOPED (1ULL << 2)
Signature · 6 lines
2.17.1 _______________________________________________ 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): 20180822150517.2330-1-christian.koenig-5C7GfCeVMHo@public.gmane.org
PATCH 2/11 drm/amdgpu: validate the VM root PD from the VM code
Preparation for following changes. This validates the root PD twice, but the overhead of that should be minimal.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +4 -4
@@ -291,11 +291,11 @@ int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm,list_for_each_entry_safe (bo_base, tmp, &vm->evicted, vm_status) {struct amdgpu_bo *bo = bo_base->bo; -if (bo->parent) { - r =validate (param, bo); -if (r) -break ; + r =validate (param, bo); +if (r) +break ; +if (bo->parent) {spin_lock (&glob->lru_lock);ttm_bo_move_to_lru_tail (&bo->tbo);if (bo->shadow)
Signature · 6 lines
2.17.1 _______________________________________________ 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): 20180822150517.2330-2-christian.koenig-5C7GfCeVMHo@public.gmane.org
Zhang, Jerry (Junwei)
Reviewed-by Junwei ZhangRe: [PATCH 02/11] drm/amdgpu: validate the VM root PD from the VM code
Patch 2 ~ 6 are
Jerry
Quoted 19 lines · Christian König
Preparation for following changes. This validates the root PD twice, but the overhead of that should be minimal.
Signed-off-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0
-2@@ -291,11 +291,11 @@ int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm,list_for_each_entry_safe (bo_base, tmp, &vm->evicted, vm_status) {struct amdgpu_bo *bo = bo_base->bo; -if (bo->parent) { - r =validate (param, bo);
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm, · line 301
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +4
-2-if (r) -break ; + r =validate (param, bo); +if (r) +break ; +if (bo->parent) {spin_lock (&glob->lru_lock);ttm_bo_move_to_lru_tail (&bo->tbo);if (bo->shadow)
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 02/11] drm/amdgpu: validate the VM root PD from the VM code
In reply to a message not in the archiveQuoted 13 lines · Christian König
Preparation for following changes. This validates the root PD twice, but the overhead of that should be minimal.
Signed-off-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0
-0
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm, · line 296
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +3
-4@@ -291,11 +291,11 @@ int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm,list_for_each_entry_safe (bo_base, tmp, &vm->evicted, vm_status) {struct amdgpu_bo *bo = bo_base->bo; -if (bo->parent) { - r =validate (param, bo); -if (r) -break ; + r =validate (param, bo); +if (r) +break ;
In orignal case, we skip the root PD. But now, it is validated one time. May I know where is another time?
Thanks,
Ray
Quoted 12 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1
-0+if (bo->parent) {spin_lock (&glob->lru_lock);ttm_bo_move_to_lru_tail (&bo->tbo);if (bo->shadow)Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 02/11] drm/amdgpu: validate the VM root PD from the VM code
Am 23.08.2018 um 09:28 schrieb Huang Rui:
Quoted 17 lines · Christian König
Quoted 16 lines
Preparation for following changes. This validates the root PD twice, but the overhead of that should be minimal.
Signed-off-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0
-0@@ -291,11 +291,11 @@ int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm,list_for_each_entry_safe (bo_base, tmp, &vm->evicted, vm_status) {struct amdgpu_bo *bo = bo_base->bo;
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm, · line 296
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +3
-4-if (bo->parent) { - r =validate (param, bo); -if (r) -break ; + r =validate (param, bo); +if (r) +break ;In orignal case, we skip the root PD. But now, it is validated one time. May I know where is another time?
That is in the CS code, we add the root PD to the list of BOs which are validated there.
Christian.
Quoted 12 lines
Thanks,
RayQuoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1
-0+if (bo->parent) {spin_lock (&glob->lru_lock);ttm_bo_move_to_lru_tail (&bo->tbo);if (bo->shadow)Signature · 1 line
2.17.1
Quoted 4 lines
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/11 drm/amdgpu: cleanup VM handling in the CS a bit
In reply to a message not in the archiveAdd a helper function for getting the root PD addr and cleanup join the two VM related functions and cleanup the function name.
No functional change.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 160 ++++++++++++------------- 1 file changed, 74 insertions(+), 86 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +74 -86
@@ -804,8 +804,9 @@ static void amdgpu_cs_parser_fini(struct amdgpu_cs_parser *parser, int error,amdgpu_bo_unref (&parser->uf_entry.robj); } -static int amdgpu_bo_vm_update_pte (struct amdgpu_cs_parser *p) +static int amdgpu_cs_vm_handling (struct amdgpu_cs_parser *p) { +struct amdgpu_ring *ring =to_amdgpu_ring (p->entity->rq->sched);struct amdgpu_fpriv *fpriv = p->filp->driver_priv;struct amdgpu_device *adev = p->adev;struct amdgpu_vm *vm = &fpriv->vm;
@@ -814,6 +815,71 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p)struct amdgpu_bo *bo;int r; +/* Only for UVD/VCE VM emulation */ +if (ring->funcs->parse_cs || ring->funcs->patch_cs_in_place) { +unsigned i, j; + +for (i =0 , j =0 ; i < p->nchunks && j < p->job->num_ibs; i++) { +struct drm_amdgpu_cs_chunk_ib *chunk_ib; +struct amdgpu_bo_va_mapping *m; +struct amdgpu_bo *aobj =NULL ; +struct amdgpu_cs_chunk *chunk; +uint64_t offset, va_start; +struct amdgpu_ib *ib; +uint8_t *kptr; + + chunk = &p->chunks[i]; + ib = &p->job->ibs[j]; + chunk_ib = chunk->kdata; + +if (chunk->chunk_id !=AMDGPU_CHUNK_ID_IB ) +continue ; + + va_start = chunk_ib->va_start &AMDGPU_VA_HOLE_MASK ; + r =amdgpu_cs_find_mapping (p, va_start, &aobj, &m); +if (r) { +DRM_ERROR ("IB va_start is invalid\n" ); +return r; + } + +if ((va_start + chunk_ib->ib_bytes) > + (m->last +1 ) *AMDGPU_GPU_PAGE_SIZE ) { +DRM_ERROR ("IB va_start+ib_bytes is invalid\n" ); +return -EINVAL ; + } + +/* the IB should be reserved at this point */ + r =amdgpu_bo_kmap (aobj, (void **)&kptr); +if (r) { +return r; + } + + offset = m->start *AMDGPU_GPU_PAGE_SIZE ; + kptr += va_start - offset; + +if (ring->funcs->parse_cs) { +memcpy (ib->ptr, kptr, chunk_ib->ib_bytes); +amdgpu_bo_kunmap (aobj); + + r =amdgpu_ring_parse_cs (ring, p, j); +if (r) +return r; + }else { + ib->ptr = (uint32_t *)kptr; + r =amdgpu_ring_patch_cs_in_place (ring, p, j); +amdgpu_bo_kunmap (aobj); +if (r) +return r; + } + + j++; + } + } + +if (!p->job->vm) +return amdgpu_cs_sync_rings (p); + + r =amdgpu_vm_clear_freed (adev, vm,NULL );if (r)return r;
@@ -876,6 +942,12 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p)if (r)return r; + r =reservation_object_reserve_shared (vm->root.base.bo->tbo.resv); +if (r) +return r; + + p->job->vm_pd_addr =amdgpu_bo_gpu_offset (vm->root.base.bo); +if (amdgpu_vm_debug) {/* Invalidate all BOs to test for userspace bugs */ amdgpu_bo_list_for_each_entry (e, p->bo_list) {
@@ -887,90 +959,6 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p) } } -return r; -} - -static int amdgpu_cs_ib_vm_chunk (struct amdgpu_device *adev, -struct amdgpu_cs_parser *p) -{ -struct amdgpu_ring *ring =to_amdgpu_ring (p->entity->rq->sched); -struct amdgpu_fpriv *fpriv = p->filp->driver_priv; -struct amdgpu_vm *vm = &fpriv->vm; -int r; - -/* Only for UVD/VCE VM emulation */ -if (ring->funcs->parse_cs || ring->funcs->patch_cs_in_place) { -unsigned i, j; - -for (i =0 , j =0 ; i < p->nchunks && j < p->job->num_ibs; i++) { -struct drm_amdgpu_cs_chunk_ib *chunk_ib; -struct amdgpu_bo_va_mapping *m; -struct amdgpu_bo *aobj =NULL ; -struct amdgpu_cs_chunk *chunk; -uint64_t offset, va_start; -struct amdgpu_ib *ib; -uint8_t *kptr; - - chunk = &p->chunks[i]; - ib = &p->job->ibs[j]; - chunk_ib = chunk->kdata; - -if (chunk->chunk_id !=AMDGPU_CHUNK_ID_IB ) -continue ; - - va_start = chunk_ib->va_start &AMDGPU_VA_HOLE_MASK ; - r =amdgpu_cs_find_mapping (p, va_start, &aobj, &m); -if (r) { -DRM_ERROR ("IB va_start is invalid\n" ); -return r; - } - -if ((va_start + chunk_ib->ib_bytes) > - (m->last +1 ) *AMDGPU_GPU_PAGE_SIZE ) { -DRM_ERROR ("IB va_start+ib_bytes is invalid\n" ); -return -EINVAL ; - } - -/* the IB should be reserved at this point */ - r =amdgpu_bo_kmap (aobj, (void **)&kptr); -if (r) { -return r; - } - - offset = m->start *AMDGPU_GPU_PAGE_SIZE ; - kptr += va_start - offset; - -if (ring->funcs->parse_cs) { -memcpy (ib->ptr, kptr, chunk_ib->ib_bytes); -amdgpu_bo_kunmap (aobj); - - r =amdgpu_ring_parse_cs (ring, p, j); -if (r) -return r; - }else { - ib->ptr = (uint32_t *)kptr; - r =amdgpu_ring_patch_cs_in_place (ring, p, j); -amdgpu_bo_kunmap (aobj); -if (r) -return r; - } - - j++; - } - } - -if (p->job->vm) { - p->job->vm_pd_addr =amdgpu_bo_gpu_offset (vm->root.base.bo); - - r =amdgpu_bo_vm_update_pte (p); -if (r) -return r; - - r =reservation_object_reserve_shared (vm->root.base.bo->tbo.resv); -if (r) -return r; - } -return amdgpu_cs_sync_rings (p); }
@@ -1307,7 +1295,7 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)for (i =0 ; i < parser.job->num_ibs; i++)trace_amdgpu_cs (&parser, i); - r =amdgpu_cs_ib_vm_chunk (adev, &parser); + r =amdgpu_cs_vm_handling (&parser);if (r) goto out;
Signature · 6 lines
2.17.1 _______________________________________________ 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): 20180822150517.2330-3-christian.koenig-5C7GfCeVMHo@public.gmane.org
Alex Deucher
Reviewed-byRe: [PATCH 03/11] drm/amdgpu: cleanup VM handling in the CS a bit
Quoted 7 lines · Christian König
Add a helper function for getting the root PD addr and cleanup join the two VM related functions and cleanup the function name.
No functional change.
Signed-off-by Christian König <[email protected]>
Quoted 207 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 160 ++++++++++++------------- 1 file changed, 74 insertions(+), 86 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +74
-87@@ -804,8 +804,9 @@ static void amdgpu_cs_parser_fini(struct amdgpu_cs_parser *parser, int error,amdgpu_bo_unref (&parser->uf_entry.robj); } -static int amdgpu_bo_vm_update_pte (struct amdgpu_cs_parser *p) +static int amdgpu_cs_vm_handling (struct amdgpu_cs_parser *p) { +struct amdgpu_ring *ring =to_amdgpu_ring (p->entity->rq->sched);struct amdgpu_fpriv *fpriv = p->filp->driver_priv;struct amdgpu_device *adev = p->adev;struct amdgpu_vm *vm = &fpriv->vm;@@ -814,6 +815,71 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p)struct amdgpu_bo *bo;int r; +/* Only for UVD/VCE VM emulation */ +if (ring->funcs->parse_cs || ring->funcs->patch_cs_in_place) { +unsigned i, j; + +for (i =0 , j =0 ; i < p->nchunks && j < p->job->num_ibs; i++) { +struct drm_amdgpu_cs_chunk_ib *chunk_ib; +struct amdgpu_bo_va_mapping *m; +struct amdgpu_bo *aobj =NULL ; +struct amdgpu_cs_chunk *chunk; +uint64_t offset, va_start; +struct amdgpu_ib *ib; +uint8_t *kptr; + + chunk = &p->chunks[i]; + ib = &p->job->ibs[j]; + chunk_ib = chunk->kdata; + +if (chunk->chunk_id !=AMDGPU_CHUNK_ID_IB ) +continue ; + + va_start = chunk_ib->va_start &AMDGPU_VA_HOLE_MASK ; + r =amdgpu_cs_find_mapping (p, va_start, &aobj, &m); +if (r) { +DRM_ERROR ("IB va_start is invalid\n" ); +return r; + } + +if ((va_start + chunk_ib->ib_bytes) > + (m->last +1 ) *AMDGPU_GPU_PAGE_SIZE ) { +DRM_ERROR ("IB va_start+ib_bytes is invalid\n" ); +return -EINVAL ; + } + +/* the IB should be reserved at this point */ + r =amdgpu_bo_kmap (aobj, (void **)&kptr); +if (r) { +return r; + } + + offset = m->start *AMDGPU_GPU_PAGE_SIZE ; + kptr += va_start - offset; + +if (ring->funcs->parse_cs) { +memcpy (ib->ptr, kptr, chunk_ib->ib_bytes); +amdgpu_bo_kunmap (aobj); + + r =amdgpu_ring_parse_cs (ring, p, j); +if (r) +return r; + }else { + ib->ptr = (uint32_t *)kptr; + r =amdgpu_ring_patch_cs_in_place (ring, p, j); +amdgpu_bo_kunmap (aobj); +if (r) +return r; + } + + j++; + } + } + +if (!p->job->vm) +return amdgpu_cs_sync_rings (p); + + r =amdgpu_vm_clear_freed (adev, vm,NULL );if (r)return r;@@ -876,6 +942,12 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p)if (r)return r; + r =reservation_object_reserve_shared (vm->root.base.bo->tbo.resv); +if (r) +return r; + + p->job->vm_pd_addr =amdgpu_bo_gpu_offset (vm->root.base.bo); +if (amdgpu_vm_debug) {/* Invalidate all BOs to test for userspace bugs */ amdgpu_bo_list_for_each_entry (e, p->bo_list) {@@ -887,90 +959,6 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p) } } -return r; -} - -static int amdgpu_cs_ib_vm_chunk (struct amdgpu_device *adev, -struct amdgpu_cs_parser *p) -{ -struct amdgpu_ring *ring =to_amdgpu_ring (p->entity->rq->sched); -struct amdgpu_fpriv *fpriv = p->filp->driver_priv; -struct amdgpu_vm *vm = &fpriv->vm; -int r; - -/* Only for UVD/VCE VM emulation */ -if (ring->funcs->parse_cs || ring->funcs->patch_cs_in_place) { -unsigned i, j; - -for (i =0 , j =0 ; i < p->nchunks && j < p->job->num_ibs; i++) { -struct drm_amdgpu_cs_chunk_ib *chunk_ib; -struct amdgpu_bo_va_mapping *m; -struct amdgpu_bo *aobj =NULL ; -struct amdgpu_cs_chunk *chunk; -uint64_t offset, va_start; -struct amdgpu_ib *ib; -uint8_t *kptr; - - chunk = &p->chunks[i]; - ib = &p->job->ibs[j]; - chunk_ib = chunk->kdata; - -if (chunk->chunk_id !=AMDGPU_CHUNK_ID_IB ) -continue ; - - va_start = chunk_ib->va_start &AMDGPU_VA_HOLE_MASK ; - r =amdgpu_cs_find_mapping (p, va_start, &aobj, &m); -if (r) { -DRM_ERROR ("IB va_start is invalid\n" ); -return r; - } - -if ((va_start + chunk_ib->ib_bytes) > - (m->last +1 ) *AMDGPU_GPU_PAGE_SIZE ) { -DRM_ERROR ("IB va_start+ib_bytes is invalid\n" ); -return -EINVAL ; - } - -/* the IB should be reserved at this point */ - r =amdgpu_bo_kmap (aobj, (void **)&kptr); -if (r) { -return r; - } - - offset = m->start *AMDGPU_GPU_PAGE_SIZE ; - kptr += va_start - offset; - -if (ring->funcs->parse_cs) { -memcpy (ib->ptr, kptr, chunk_ib->ib_bytes); -amdgpu_bo_kunmap (aobj); - - r =amdgpu_ring_parse_cs (ring, p, j); -if (r) -return r; - }else { - ib->ptr = (uint32_t *)kptr; - r =amdgpu_ring_patch_cs_in_place (ring, p, j); -amdgpu_bo_kunmap (aobj); -if (r) -return r; - } - - j++; - } - } - -if (p->job->vm) { - p->job->vm_pd_addr =amdgpu_bo_gpu_offset (vm->root.base.bo); - - r =amdgpu_bo_vm_update_pte (p); -if (r) -return r; - - r =reservation_object_reserve_shared (vm->root.base.bo->tbo.resv); -if (r) -return r; - } -return amdgpu_cs_sync_rings (p); }@@ -1307,7 +1295,7 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)for (i =0 ; i < parser.job->num_ibs; i++)trace_amdgpu_cs (&parser, i); - r =amdgpu_cs_ib_vm_chunk (adev, &parser); + r =amdgpu_cs_vm_handling (&parser);if (r) goto out; --2.17.1
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Huang Rui
Reviewed-byRe: [PATCH 03/11] drm/amdgpu: cleanup VM handling in the CS a bit
In reply to a message not in the archiveQuoted 6 lines · Christian König
Add a helper function for getting the root PD addr and cleanup join the two VM related functions and cleanup the function name.
No functional change.
Signed-off-by Christian König <[email protected]>
Quoted 211 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 160 ++++++++++++------------- 1 file changed, 74 insertions(+), 86 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +74
-86@@ -804,8 +804,9 @@ static void amdgpu_cs_parser_fini(struct amdgpu_cs_parser *parser, int error,amdgpu_bo_unref (&parser->uf_entry.robj); } -static int amdgpu_bo_vm_update_pte (struct amdgpu_cs_parser *p) +static int amdgpu_cs_vm_handling (struct amdgpu_cs_parser *p) { +struct amdgpu_ring *ring =to_amdgpu_ring (p->entity->rq->sched);struct amdgpu_fpriv *fpriv = p->filp->driver_priv;struct amdgpu_device *adev = p->adev;struct amdgpu_vm *vm = &fpriv->vm;@@ -814,6 +815,71 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p)struct amdgpu_bo *bo;int r; +/* Only for UVD/VCE VM emulation */ +if (ring->funcs->parse_cs || ring->funcs->patch_cs_in_place) { +unsigned i, j; + +for (i =0 , j =0 ; i < p->nchunks && j < p->job->num_ibs; i++) { +struct drm_amdgpu_cs_chunk_ib *chunk_ib; +struct amdgpu_bo_va_mapping *m; +struct amdgpu_bo *aobj =NULL ; +struct amdgpu_cs_chunk *chunk; +uint64_t offset, va_start; +struct amdgpu_ib *ib; +uint8_t *kptr; + + chunk = &p->chunks[i]; + ib = &p->job->ibs[j]; + chunk_ib = chunk->kdata; + +if (chunk->chunk_id !=AMDGPU_CHUNK_ID_IB ) +continue ; + + va_start = chunk_ib->va_start &AMDGPU_VA_HOLE_MASK ; + r =amdgpu_cs_find_mapping (p, va_start, &aobj, &m); +if (r) { +DRM_ERROR ("IB va_start is invalid\n" ); +return r; + } + +if ((va_start + chunk_ib->ib_bytes) > + (m->last +1 ) *AMDGPU_GPU_PAGE_SIZE ) { +DRM_ERROR ("IB va_start+ib_bytes is invalid\n" ); +return -EINVAL ; + } + +/* the IB should be reserved at this point */ + r =amdgpu_bo_kmap (aobj, (void **)&kptr); +if (r) { +return r; + } + + offset = m->start *AMDGPU_GPU_PAGE_SIZE ; + kptr += va_start - offset; + +if (ring->funcs->parse_cs) { +memcpy (ib->ptr, kptr, chunk_ib->ib_bytes); +amdgpu_bo_kunmap (aobj); + + r =amdgpu_ring_parse_cs (ring, p, j); +if (r) +return r; + }else { + ib->ptr = (uint32_t *)kptr; + r =amdgpu_ring_patch_cs_in_place (ring, p, j); +amdgpu_bo_kunmap (aobj); +if (r) +return r; + } + + j++; + } + } + +if (!p->job->vm) +return amdgpu_cs_sync_rings (p); + + r =amdgpu_vm_clear_freed (adev, vm,NULL );if (r)return r;@@ -876,6 +942,12 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p)if (r)return r; + r =reservation_object_reserve_shared (vm->root.base.bo->tbo.resv); +if (r) +return r; + + p->job->vm_pd_addr =amdgpu_bo_gpu_offset (vm->root.base.bo); +if (amdgpu_vm_debug) {/* Invalidate all BOs to test for userspace bugs */ amdgpu_bo_list_for_each_entry (e, p->bo_list) {@@ -887,90 +959,6 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p) } } -return r; -} - -static int amdgpu_cs_ib_vm_chunk (struct amdgpu_device *adev, -struct amdgpu_cs_parser *p) -{ -struct amdgpu_ring *ring =to_amdgpu_ring (p->entity->rq->sched); -struct amdgpu_fpriv *fpriv = p->filp->driver_priv; -struct amdgpu_vm *vm = &fpriv->vm; -int r; - -/* Only for UVD/VCE VM emulation */ -if (ring->funcs->parse_cs || ring->funcs->patch_cs_in_place) { -unsigned i, j; - -for (i =0 , j =0 ; i < p->nchunks && j < p->job->num_ibs; i++) { -struct drm_amdgpu_cs_chunk_ib *chunk_ib; -struct amdgpu_bo_va_mapping *m; -struct amdgpu_bo *aobj =NULL ; -struct amdgpu_cs_chunk *chunk; -uint64_t offset, va_start; -struct amdgpu_ib *ib; -uint8_t *kptr; - - chunk = &p->chunks[i]; - ib = &p->job->ibs[j]; - chunk_ib = chunk->kdata; - -if (chunk->chunk_id !=AMDGPU_CHUNK_ID_IB ) -continue ; - - va_start = chunk_ib->va_start &AMDGPU_VA_HOLE_MASK ; - r =amdgpu_cs_find_mapping (p, va_start, &aobj, &m); -if (r) { -DRM_ERROR ("IB va_start is invalid\n" ); -return r; - } - -if ((va_start + chunk_ib->ib_bytes) > - (m->last +1 ) *AMDGPU_GPU_PAGE_SIZE ) { -DRM_ERROR ("IB va_start+ib_bytes is invalid\n" ); -return -EINVAL ; - } - -/* the IB should be reserved at this point */ - r =amdgpu_bo_kmap (aobj, (void **)&kptr); -if (r) { -return r; - } - - offset = m->start *AMDGPU_GPU_PAGE_SIZE ; - kptr += va_start - offset; - -if (ring->funcs->parse_cs) { -memcpy (ib->ptr, kptr, chunk_ib->ib_bytes); -amdgpu_bo_kunmap (aobj); - - r =amdgpu_ring_parse_cs (ring, p, j); -if (r) -return r; - }else { - ib->ptr = (uint32_t *)kptr; - r =amdgpu_ring_patch_cs_in_place (ring, p, j); -amdgpu_bo_kunmap (aobj); -if (r) -return r; - } - - j++; - } - } - -if (p->job->vm) { - p->job->vm_pd_addr =amdgpu_bo_gpu_offset (vm->root.base.bo); - - r =amdgpu_bo_vm_update_pte (p); -if (r) -return r; - - r =reservation_object_reserve_shared (vm->root.base.bo->tbo.resv); -if (r) -return r; - } -return amdgpu_cs_sync_rings (p); }@@ -1307,7 +1295,7 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)for (i =0 ; i < parser.job->num_ibs; i++)trace_amdgpu_cs (&parser, i); - r =amdgpu_cs_ib_vm_chunk (adev, &parser); + r =amdgpu_cs_vm_handling (&parser);if (r) goto out;Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/11 drm/amdgpu: move setting the GART addr into TTM
In reply to a message not in the archiveMove setting the GART addr for window based copies into the TTM code who uses it.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 -- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +0 -2
@@ -82,8 +82,6 @@ int amdgpu_job_alloc_with_ib(struct amdgpu_device *adev, unsigned size, r =amdgpu_ib_get (adev,NULL , size, &(*job)->ibs[0 ]);if (r)kfree (*job); -else - (*job)->vm_pd_addr = adev->gart.table_addr;return r; }
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +4 -1
@@ -2048,7 +2048,10 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint64_t src_offset,if (r)return r; - job->vm_needs_flush = vm_needs_flush; +if (vm_needs_flush) { + job->vm_pd_addr = adev->gart.table_addr; + job->vm_needs_flush = true; + }if (resv) { r = amdgpu_sync_resv(adev, &job->sync, resv, AMDGPU_FENCE_OWNER_UNDEFINED,
Signature · 6 lines
2.17.1 _______________________________________________ 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): 20180822150517.2330-4-christian.koenig-5C7GfCeVMHo@public.gmane.org
Alex Deucher
Reviewed-byRe: [PATCH 04/11] drm/amdgpu: move setting the GART addr into TTM
Quoted 5 lines · Christian König
Move setting the GART addr for window based copies into the TTM code who uses it.
Signed-off-by Christian König <[email protected]>
Quoted 37 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 -- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +0
-2@@ -82,8 +82,6 @@ int amdgpu_job_alloc_with_ib(struct amdgpu_device *adev, unsigned size, r =amdgpu_ib_get (adev,NULL , size, &(*job)->ibs[0 ]);if (r)kfree (*job); -else - (*job)->vm_pd_addr = adev->gart.table_addr;return r; }drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +4
-2@@ -2048,7 +2048,10 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint64_t src_offset,if (r)return r; - job->vm_needs_flush = vm_needs_flush; +if (vm_needs_flush) { + job->vm_pd_addr = adev->gart.table_addr; + job->vm_needs_flush = true; + }if (resv) { r = amdgpu_sync_resv(adev, &job->sync, resv, AMDGPU_FENCE_OWNER_UNDEFINED, --2.17.1
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Huang Rui
Reviewed-byRe: [PATCH 04/11] drm/amdgpu: move setting the GART addr into TTM
In reply to a message not in the archiveQuoted 4 lines · Christian König
Move setting the GART addr for window based copies into the TTM code who uses it.
Signed-off-by Christian König <[email protected]>
Quoted 41 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 -- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +0
-2@@ -82,8 +82,6 @@ int amdgpu_job_alloc_with_ib(struct amdgpu_device *adev, unsigned size, r =amdgpu_ib_get (adev,NULL , size, &(*job)->ibs[0 ]);if (r)kfree (*job); -else - (*job)->vm_pd_addr = adev->gart.table_addr;return r; }drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +4
-1@@ -2048,7 +2048,10 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint64_t src_offset,if (r)return r; - job->vm_needs_flush = vm_needs_flush; +if (vm_needs_flush) { + job->vm_pd_addr = adev->gart.table_addr; + job->vm_needs_flush = true; + }if (resv) { r = amdgpu_sync_resv(adev, &job->sync, resv, AMDGPU_FENCE_OWNER_UNDEFINED,Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/11 drm/amdgpu: rename gart.robj into gart.bo
In reply to a message not in the archivesed -i "s/gart.robj/gart.bo/" drivers/gpu/drm/amd/amdgpu/*.c sed -i "s/gart.robj/gart.bo/" drivers/gpu/drm/amd/amdgpu/*.h
Just cleaning up radeon leftovers.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 32 ++++++++++++------------ drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 4 +-- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 4 +-- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 4 +-- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 +-- 6 files changed, 25 insertions(+), 25 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c +16 -16
@@ -112,7 +112,7 @@ int amdgpu_gart_table_vram_alloc(struct amdgpu_device *adev) {int r; -if (adev->gart.robj ==NULL ) { +if (adev->gart.bo ==NULL ) {struct amdgpu_bo_param bp;memset (&bp,0 ,sizeof (bp));
@@ -123,7 +123,7 @@ int amdgpu_gart_table_vram_alloc(struct amdgpu_device *adev)AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS ; bp.type = ttm_bo_type_kernel; bp.resv =NULL ; - r =amdgpu_bo_create (adev, &bp, &adev->gart.robj); + r =amdgpu_bo_create (adev, &bp, &adev->gart.bo);if (r) {return r; }
@@ -145,19 +145,19 @@ int amdgpu_gart_table_vram_pin(struct amdgpu_device *adev) {int r; - r =amdgpu_bo_reserve (adev->gart.robj, false); + r =amdgpu_bo_reserve (adev->gart.bo, false);if (unlikely (r !=0 ))return r; - r =amdgpu_bo_pin (adev->gart.robj,AMDGPU_GEM_DOMAIN_VRAM ); + r =amdgpu_bo_pin (adev->gart.bo,AMDGPU_GEM_DOMAIN_VRAM );if (r) { -amdgpu_bo_unreserve (adev->gart.robj); +amdgpu_bo_unreserve (adev->gart.bo);return r; } - r =amdgpu_bo_kmap (adev->gart.robj, &adev->gart.ptr); + r =amdgpu_bo_kmap (adev->gart.bo, &adev->gart.ptr);if (r) -amdgpu_bo_unpin (adev->gart.robj); -amdgpu_bo_unreserve (adev->gart.robj); - adev->gart.table_addr =amdgpu_bo_gpu_offset (adev->gart.robj); +amdgpu_bo_unpin (adev->gart.bo); +amdgpu_bo_unreserve (adev->gart.bo); + adev->gart.table_addr =amdgpu_bo_gpu_offset (adev->gart.bo);return r; }
@@ -173,14 +173,14 @@ void amdgpu_gart_table_vram_unpin(struct amdgpu_device *adev) {int r; -if (adev->gart.robj ==NULL ) { +if (adev->gart.bo ==NULL ) {return ; } - r =amdgpu_bo_reserve (adev->gart.robj, true); + r =amdgpu_bo_reserve (adev->gart.bo, true);if (likely (r ==0 )) { -amdgpu_bo_kunmap (adev->gart.robj); -amdgpu_bo_unpin (adev->gart.robj); -amdgpu_bo_unreserve (adev->gart.robj); +amdgpu_bo_kunmap (adev->gart.bo); +amdgpu_bo_unpin (adev->gart.bo); +amdgpu_bo_unreserve (adev->gart.bo); adev->gart.ptr =NULL ; } }
@@ -196,10 +196,10 @@ void amdgpu_gart_table_vram_unpin(struct amdgpu_device *adev)*/ void amdgpu_gart_table_vram_free (struct amdgpu_device *adev) { -if (adev->gart.robj ==NULL ) { +if (adev->gart.bo ==NULL ) {return ; } -amdgpu_bo_unref (&adev->gart.robj); +amdgpu_bo_unref (&adev->gart.bo); }/*
drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h +1 -1
@@ -41,7 +41,7 @@ struct amdgpu_bo;struct amdgpu_gart {u64 table_addr; -struct amdgpu_bo *robj; +struct amdgpu_bo *bo;void *ptr;unsigned num_gpu_pages;unsigned num_cpu_pages;
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +2 -2
@@ -497,7 +497,7 @@ static int gmc_v6_0_gart_enable(struct amdgpu_device *adev)int r, i;u32 field; -if (adev->gart.robj ==NULL ) { +if (adev->gart.bo ==NULL ) {dev_err (adev->dev,"No VRAM object for PCIE GART.\n" );return -EINVAL ; }
@@ -588,7 +588,7 @@ static int gmc_v6_0_gart_init(struct amdgpu_device *adev) {int r; -if (adev->gart.robj) { +if (adev->gart.bo) {dev_warn (adev->dev,"gmc_v6_0 PCIE GART already initialized\n" );return 0 ; }
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +2 -2
@@ -607,7 +607,7 @@ static int gmc_v7_0_gart_enable(struct amdgpu_device *adev)int r, i;u32 tmp, field; -if (adev->gart.robj ==NULL ) { +if (adev->gart.bo ==NULL ) {dev_err (adev->dev,"No VRAM object for PCIE GART.\n" );return -EINVAL ; }
@@ -708,7 +708,7 @@ static int gmc_v7_0_gart_init(struct amdgpu_device *adev) {int r; -if (adev->gart.robj) { +if (adev->gart.bo) {WARN (1 ,"R600 PCIE GART already initialized\n" );return 0 ; }
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +2 -2
@@ -809,7 +809,7 @@ static int gmc_v8_0_gart_enable(struct amdgpu_device *adev)int r, i;u32 tmp, field; -if (adev->gart.robj ==NULL ) { +if (adev->gart.bo ==NULL ) {dev_err (adev->dev,"No VRAM object for PCIE GART.\n" );return -EINVAL ; }
@@ -927,7 +927,7 @@ static int gmc_v8_0_gart_init(struct amdgpu_device *adev) {int r; -if (adev->gart.robj) { +if (adev->gart.bo) {WARN (1 ,"R600 PCIE GART already initialized\n" );return 0 ; }
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +2 -2
@@ -843,7 +843,7 @@ static int gmc_v9_0_gart_init(struct amdgpu_device *adev) {int r; -if (adev->gart.robj) { +if (adev->gart.bo) {WARN (1 ,"VEGA10 PCIE GART already initialized\n" );return 0 ; }
@@ -1081,7 +1081,7 @@ static int gmc_v9_0_gart_enable(struct amdgpu_device *adev) golden_settings_vega10_hdp, ARRAY_SIZE(golden_settings_vega10_hdp)); -if (adev->gart.robj ==NULL ) { +if (adev->gart.bo ==NULL ) {dev_err (adev->dev,"No VRAM object for PCIE GART.\n" );return -EINVAL ; }
Signature · 6 lines
2.17.1 _______________________________________________ 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): 20180822150517.2330-5-christian.koenig-5C7GfCeVMHo@public.gmane.org
Alex Deucher
Reviewed-byRe: [PATCH 05/11] drm/amdgpu: rename gart.robj into gart.bo
Quoted 7 lines · Christian König
sed -i "s/gart.robj/gart.bo/"
drivers/gpu/drm/amd/amdgpu/*.csed -i "s/gart.robj/gart.bo/"drivers/gpu/drm/amd/amdgpu/*.hJust cleaning up radeon leftovers.
Signed-off-by Christian König <[email protected]>
Quoted 195 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 32 ++++++++++++------------ drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 4 +-- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 4 +-- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 4 +-- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 +-- 6 files changed, 25 insertions(+), 25 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c +16
-16@@ -112,7 +112,7 @@ int amdgpu_gart_table_vram_alloc(struct amdgpu_device *adev) {int r; -if (adev->gart.robj ==NULL ) { +if (adev->gart.bo ==NULL ) {struct amdgpu_bo_param bp;memset (&bp,0 ,sizeof (bp));@@ -123,7 +123,7 @@ int amdgpu_gart_table_vram_alloc(struct amdgpu_device *adev)AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS ; bp.type = ttm_bo_type_kernel; bp.resv =NULL ; - r =amdgpu_bo_create (adev, &bp, &adev->gart.robj); + r =amdgpu_bo_create (adev, &bp, &adev->gart.bo);if (r) {return r; }@@ -145,19 +145,19 @@ int amdgpu_gart_table_vram_pin(struct amdgpu_device *adev) {int r; - r =amdgpu_bo_reserve (adev->gart.robj, false); + r =amdgpu_bo_reserve (adev->gart.bo, false);if (unlikely (r !=0 ))return r; - r =amdgpu_bo_pin (adev->gart.robj,AMDGPU_GEM_DOMAIN_VRAM ); + r =amdgpu_bo_pin (adev->gart.bo,AMDGPU_GEM_DOMAIN_VRAM );if (r) { -amdgpu_bo_unreserve (adev->gart.robj); +amdgpu_bo_unreserve (adev->gart.bo);return r; } - r =amdgpu_bo_kmap (adev->gart.robj, &adev->gart.ptr); + r =amdgpu_bo_kmap (adev->gart.bo, &adev->gart.ptr);if (r) -amdgpu_bo_unpin (adev->gart.robj); -amdgpu_bo_unreserve (adev->gart.robj); - adev->gart.table_addr =amdgpu_bo_gpu_offset (adev->gart.robj); +amdgpu_bo_unpin (adev->gart.bo); +amdgpu_bo_unreserve (adev->gart.bo); + adev->gart.table_addr =amdgpu_bo_gpu_offset (adev->gart.bo);return r; }@@ -173,14 +173,14 @@ void amdgpu_gart_table_vram_unpin(struct amdgpu_device *adev) {int r; -if (adev->gart.robj ==NULL ) { +if (adev->gart.bo ==NULL ) {return ; } - r =amdgpu_bo_reserve (adev->gart.robj, true); + r =amdgpu_bo_reserve (adev->gart.bo, true);if (likely (r ==0 )) { -amdgpu_bo_kunmap (adev->gart.robj); -amdgpu_bo_unpin (adev->gart.robj); -amdgpu_bo_unreserve (adev->gart.robj); +amdgpu_bo_kunmap (adev->gart.bo); +amdgpu_bo_unpin (adev->gart.bo); +amdgpu_bo_unreserve (adev->gart.bo); adev->gart.ptr =NULL ; } }@@ -196,10 +196,10 @@ void amdgpu_gart_table_vram_unpin(struct amdgpu_device *adev)*/ void amdgpu_gart_table_vram_free (struct amdgpu_device *adev) { -if (adev->gart.robj ==NULL ) { +if (adev->gart.bo ==NULL ) {return ; } -amdgpu_bo_unref (&adev->gart.robj); +amdgpu_bo_unref (&adev->gart.bo); }/* drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h +1
-1@@ -41,7 +41,7 @@ struct amdgpu_bo;struct amdgpu_gart {u64 table_addr; -struct amdgpu_bo *robj; +struct amdgpu_bo *bo;void *ptr;unsigned num_gpu_pages;unsigned num_cpu_pages;drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +2
-2@@ -497,7 +497,7 @@ static int gmc_v6_0_gart_enable(struct amdgpu_device *adev)int r, i;u32 field; -if (adev->gart.robj ==NULL ) { +if (adev->gart.bo ==NULL ) {dev_err (adev->dev,"No VRAM object for PCIE GART.\n" );return -EINVAL ; }@@ -588,7 +588,7 @@ static int gmc_v6_0_gart_init(struct amdgpu_device *adev) {int r; -if (adev->gart.robj) { +if (adev->gart.bo) {dev_warn (adev->dev,"gmc_v6_0 PCIE GART already initialized\n" );return 0 ; }drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +2
-2@@ -607,7 +607,7 @@ static int gmc_v7_0_gart_enable(struct amdgpu_device *adev)int r, i;u32 tmp, field; -if (adev->gart.robj ==NULL ) { +if (adev->gart.bo ==NULL ) {dev_err (adev->dev,"No VRAM object for PCIE GART.\n" );return -EINVAL ; }@@ -708,7 +708,7 @@ static int gmc_v7_0_gart_init(struct amdgpu_device *adev) {int r; -if (adev->gart.robj) { +if (adev->gart.bo) {WARN (1 ,"R600 PCIE GART already initialized\n" );return 0 ; }drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +2
-2@@ -809,7 +809,7 @@ static int gmc_v8_0_gart_enable(struct amdgpu_device *adev)int r, i;u32 tmp, field; -if (adev->gart.robj ==NULL ) { +if (adev->gart.bo ==NULL ) {dev_err (adev->dev,"No VRAM object for PCIE GART.\n" );return -EINVAL ; }@@ -927,7 +927,7 @@ static int gmc_v8_0_gart_init(struct amdgpu_device *adev) {int r; -if (adev->gart.robj) { +if (adev->gart.bo) {WARN (1 ,"R600 PCIE GART already initialized\n" );return 0 ; }drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +2
-3@@ -843,7 +843,7 @@ static int gmc_v9_0_gart_init(struct amdgpu_device *adev) {int r; -if (adev->gart.robj) { +if (adev->gart.bo) {WARN (1 ,"VEGA10 PCIE GART already initialized\n" );return 0 ; }@@ -1081,7 +1081,7 @@ static int gmc_v9_0_gart_enable(struct amdgpu_device *adev) golden_settings_vega10_hdp, ARRAY_SIZE(golden_settings_vega10_hdp)); -if (adev->gart.robj ==NULL ) { +if (adev->gart.bo ==NULL ) {dev_err (adev->dev,"No VRAM object for PCIE GART.\n" );return -EINVAL ; } --2.17.1
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Huang Rui
Reviewed-byRe: [PATCH 05/11] drm/amdgpu: rename gart.robj into gart.bo
In reply to a message not in the archiveQuoted 6 lines · Christian König
sed -i "s/gart.robj/gart.bo/"
drivers/gpu/drm/amd/amdgpu/*.csed -i "s/gart.robj/gart.bo/"drivers/gpu/drm/amd/amdgpu/*.hJust cleaning up radeon leftovers.
Signed-off-by Christian König <[email protected]>
Yes, the 'bo' is the better name of gart table than 'robj'.
Quoted 199 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 32 ++++++++++++------------ drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 4 +-- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 4 +-- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 4 +-- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 +-- 6 files changed, 25 insertions(+), 25 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c +16
-16@@ -112,7 +112,7 @@ int amdgpu_gart_table_vram_alloc(struct amdgpu_device *adev) {int r; -if (adev->gart.robj ==NULL ) { +if (adev->gart.bo ==NULL ) {struct amdgpu_bo_param bp;memset (&bp,0 ,sizeof (bp));@@ -123,7 +123,7 @@ int amdgpu_gart_table_vram_alloc(struct amdgpu_device *adev)AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS ; bp.type = ttm_bo_type_kernel; bp.resv =NULL ; - r =amdgpu_bo_create (adev, &bp, &adev->gart.robj); + r =amdgpu_bo_create (adev, &bp, &adev->gart.bo);if (r) {return r; }@@ -145,19 +145,19 @@ int amdgpu_gart_table_vram_pin(struct amdgpu_device *adev) {int r; - r =amdgpu_bo_reserve (adev->gart.robj, false); + r =amdgpu_bo_reserve (adev->gart.bo, false);if (unlikely (r !=0 ))return r; - r =amdgpu_bo_pin (adev->gart.robj,AMDGPU_GEM_DOMAIN_VRAM ); + r =amdgpu_bo_pin (adev->gart.bo,AMDGPU_GEM_DOMAIN_VRAM );if (r) { -amdgpu_bo_unreserve (adev->gart.robj); +amdgpu_bo_unreserve (adev->gart.bo);return r; } - r =amdgpu_bo_kmap (adev->gart.robj, &adev->gart.ptr); + r =amdgpu_bo_kmap (adev->gart.bo, &adev->gart.ptr);if (r) -amdgpu_bo_unpin (adev->gart.robj); -amdgpu_bo_unreserve (adev->gart.robj); - adev->gart.table_addr =amdgpu_bo_gpu_offset (adev->gart.robj); +amdgpu_bo_unpin (adev->gart.bo); +amdgpu_bo_unreserve (adev->gart.bo); + adev->gart.table_addr =amdgpu_bo_gpu_offset (adev->gart.bo);return r; }@@ -173,14 +173,14 @@ void amdgpu_gart_table_vram_unpin(struct amdgpu_device *adev) {int r; -if (adev->gart.robj ==NULL ) { +if (adev->gart.bo ==NULL ) {return ; } - r =amdgpu_bo_reserve (adev->gart.robj, true); + r =amdgpu_bo_reserve (adev->gart.bo, true);if (likely (r ==0 )) { -amdgpu_bo_kunmap (adev->gart.robj); -amdgpu_bo_unpin (adev->gart.robj); -amdgpu_bo_unreserve (adev->gart.robj); +amdgpu_bo_kunmap (adev->gart.bo); +amdgpu_bo_unpin (adev->gart.bo); +amdgpu_bo_unreserve (adev->gart.bo); adev->gart.ptr =NULL ; } }@@ -196,10 +196,10 @@ void amdgpu_gart_table_vram_unpin(struct amdgpu_device *adev)*/ void amdgpu_gart_table_vram_free (struct amdgpu_device *adev) { -if (adev->gart.robj ==NULL ) { +if (adev->gart.bo ==NULL ) {return ; } -amdgpu_bo_unref (&adev->gart.robj); +amdgpu_bo_unref (&adev->gart.bo); }/* drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h +1
-1@@ -41,7 +41,7 @@ struct amdgpu_bo;struct amdgpu_gart {u64 table_addr; -struct amdgpu_bo *robj; +struct amdgpu_bo *bo;void *ptr;unsigned num_gpu_pages;unsigned num_cpu_pages;drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +2
-2@@ -497,7 +497,7 @@ static int gmc_v6_0_gart_enable(struct amdgpu_device *adev)int r, i;u32 field; -if (adev->gart.robj ==NULL ) { +if (adev->gart.bo ==NULL ) {dev_err (adev->dev,"No VRAM object for PCIE GART.\n" );return -EINVAL ; }@@ -588,7 +588,7 @@ static int gmc_v6_0_gart_init(struct amdgpu_device *adev) {int r; -if (adev->gart.robj) { +if (adev->gart.bo) {dev_warn (adev->dev,"gmc_v6_0 PCIE GART already initialized\n" );return 0 ; }drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +2
-2@@ -607,7 +607,7 @@ static int gmc_v7_0_gart_enable(struct amdgpu_device *adev)int r, i;u32 tmp, field; -if (adev->gart.robj ==NULL ) { +if (adev->gart.bo ==NULL ) {dev_err (adev->dev,"No VRAM object for PCIE GART.\n" );return -EINVAL ; }@@ -708,7 +708,7 @@ static int gmc_v7_0_gart_init(struct amdgpu_device *adev) {int r; -if (adev->gart.robj) { +if (adev->gart.bo) {WARN (1 ,"R600 PCIE GART already initialized\n" );return 0 ; }drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +2
-2@@ -809,7 +809,7 @@ static int gmc_v8_0_gart_enable(struct amdgpu_device *adev)int r, i;u32 tmp, field; -if (adev->gart.robj ==NULL ) { +if (adev->gart.bo ==NULL ) {dev_err (adev->dev,"No VRAM object for PCIE GART.\n" );return -EINVAL ; }@@ -927,7 +927,7 @@ static int gmc_v8_0_gart_init(struct amdgpu_device *adev) {int r; -if (adev->gart.robj) { +if (adev->gart.bo) {WARN (1 ,"R600 PCIE GART already initialized\n" );return 0 ; }drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +2
-2@@ -843,7 +843,7 @@ static int gmc_v9_0_gart_init(struct amdgpu_device *adev) {int r; -if (adev->gart.robj) { +if (adev->gart.bo) {WARN (1 ,"VEGA10 PCIE GART already initialized\n" );return 0 ; }@@ -1081,7 +1081,7 @@ static int gmc_v9_0_gart_enable(struct amdgpu_device *adev) golden_settings_vega10_hdp, ARRAY_SIZE(golden_settings_vega10_hdp)); -if (adev->gart.robj ==NULL ) { +if (adev->gart.bo ==NULL ) {dev_err (adev->dev,"No VRAM object for PCIE GART.\n" );return -EINVAL ; }Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/11 drm/amdgpu: remove gart.table_addr
In reply to a message not in the archiveWe can easily figure out the address on the fly.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 7 +++---- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 9 +++++---- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 9 +++++---- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 9 +++++---- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 7 +++---- 9 files changed, 24 insertions(+), 25 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c +0 -1
@@ -157,7 +157,6 @@ int amdgpu_gart_table_vram_pin(struct amdgpu_device *adev)if (r)amdgpu_bo_unpin (adev->gart.bo);amdgpu_bo_unreserve (adev->gart.bo); - adev->gart.table_addr =amdgpu_bo_gpu_offset (adev->gart.bo);return r; }
drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h +0 -1
@@ -40,7 +40,6 @@ struct amdgpu_bo;#define AMDGPU_GPU_PAGES_IN_CPU_PAGE (PAGE_SIZE / AMDGPU_GPU_PAGE_SIZE)struct amdgpu_gart { -u64 table_addr;struct amdgpu_bo *bo;void *ptr;unsigned num_gpu_pages;
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +2 -2
@@ -1988,7 +1988,7 @@ static int amdgpu_map_buffer(struct ttm_buffer_object *bo, src_addr = num_dw *4 ; src_addr += job->ibs[0 ].gpu_addr; - dst_addr = adev->gart.table_addr; + dst_addr =amdgpu_bo_gpu_offset (adev->gart.bo); dst_addr += window *AMDGPU_GTT_MAX_TRANSFER_SIZE *8 ;amdgpu_emit_copy_buffer (adev, &job->ibs[0 ], src_addr, dst_addr, num_bytes);
@@ -2049,7 +2049,7 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint64_t src_offset,return r;if (vm_needs_flush) { - job->vm_pd_addr = adev->gart.table_addr; + job->vm_pd_addr =amdgpu_bo_gpu_offset (adev->gart.bo); job->vm_needs_flush = true; }if (resv) {
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +3 -4
@@ -37,11 +37,10 @@ u64 gfxhub_v1_0_get_mc_fb_offset(struct amdgpu_device *adev)static void gfxhub_v1_0_init_gart_pt_regs (struct amdgpu_device *adev) { -uint64_t value; +uint64_t value =amdgpu_bo_gpu_offset (adev->gart.bo); -BUG_ON (adev->gart.table_addr & (~0x0000FFFFFFFFF000ULL )); - value = adev->gart.table_addr - adev->gmc.vram_start - + adev->vm_manager.vram_base_offset; +BUG_ON (value & (~0x0000FFFFFFFFF000ULL )); + value -= adev->gmc.vram_start + adev->vm_manager.vram_base_offset; value &=0x0000FFFFFFFFF000ULL ; value |=0x1 ;/*valid bit*/
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +5 -4
@@ -494,6 +494,7 @@ static void gmc_v6_0_set_prt(struct amdgpu_device *adev, bool enable)static int gmc_v6_0_gart_enable (struct amdgpu_device *adev) { +uint64_t table_addr =amdgpu_bo_gpu_offset (adev->gart.bo);int r, i;u32 field;
@@ -532,7 +533,7 @@ static int gmc_v6_0_gart_enable(struct amdgpu_device *adev)/* setup context0 */ WREG32 (mmVM_CONTEXT0_PAGE_TABLE_START_ADDR, adev->gmc.gart_start >>12 );WREG32 (mmVM_CONTEXT0_PAGE_TABLE_END_ADDR, adev->gmc.gart_end >>12 ); -WREG32 (mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR, adev->gart.table_addr >>12 ); +WREG32 (mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR, table_addr >>12 );WREG32 (mmVM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR, (u32)(adev->dummy_page_addr >>12 ));WREG32 (mmVM_CONTEXT0_CNTL2,0 );
@@ -556,10 +557,10 @@ static int gmc_v6_0_gart_enable(struct amdgpu_device *adev)for (i =1 ; i <16 ; i++) {if (i <8 )WREG32 (mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR + i, - adev->gart.table_addr >>12 ); + table_addr >>12 );else WREG32 (mmVM_CONTEXT8_PAGE_TABLE_BASE_ADDR + i -8 , - adev->gart.table_addr >>12 ); + table_addr >>12 ); }/* enable context1-15 */
@@ -579,7 +580,7 @@ static int gmc_v6_0_gart_enable(struct amdgpu_device *adev)gmc_v6_0_flush_gpu_tlb (adev,0 );dev_info (adev->dev,"PCIE GART of %uM enabled (table at 0x%016llX).\n" , (unsigned )(adev->gmc.gart_size >>20 ), - (unsigned long long )adev->gart.table_addr); + (unsigned long long )table_addr); adev->gart.ready = true;return 0 ; }
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +5 -4
@@ -604,6 +604,7 @@ static void gmc_v7_0_set_prt(struct amdgpu_device *adev, bool enable)*/ static int gmc_v7_0_gart_enable (struct amdgpu_device *adev) { +uint64_t table_addr =amdgpu_bo_gpu_offset (adev->gart.bo);int r, i;u32 tmp, field;
@@ -645,7 +646,7 @@ static int gmc_v7_0_gart_enable(struct amdgpu_device *adev)/* setup context0 */ WREG32 (mmVM_CONTEXT0_PAGE_TABLE_START_ADDR, adev->gmc.gart_start >>12 );WREG32 (mmVM_CONTEXT0_PAGE_TABLE_END_ADDR, adev->gmc.gart_end >>12 ); -WREG32 (mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR, adev->gart.table_addr >>12 ); +WREG32 (mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR, table_addr >>12 );WREG32 (mmVM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR, (u32)(adev->dummy_page_addr >>12 ));WREG32 (mmVM_CONTEXT0_CNTL2,0 );
@@ -669,10 +670,10 @@ static int gmc_v7_0_gart_enable(struct amdgpu_device *adev)for (i =1 ; i <16 ; i++) {if (i <8 )WREG32 (mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR + i, - adev->gart.table_addr >>12 ); + table_addr >>12 );else WREG32 (mmVM_CONTEXT8_PAGE_TABLE_BASE_ADDR + i -8 , - adev->gart.table_addr >>12 ); + table_addr >>12 ); }/* enable context1-15 */
@@ -699,7 +700,7 @@ static int gmc_v7_0_gart_enable(struct amdgpu_device *adev)gmc_v7_0_flush_gpu_tlb (adev,0 );DRM_INFO ("PCIE GART of %uM enabled (table at 0x%016llX).\n" , (unsigned )(adev->gmc.gart_size >>20 ), - (unsigned long long )adev->gart.table_addr); + (unsigned long long )table_addr); adev->gart.ready = true;return 0 ; }
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +5 -4
@@ -806,6 +806,7 @@ static void gmc_v8_0_set_prt(struct amdgpu_device *adev, bool enable)*/ static int gmc_v8_0_gart_enable (struct amdgpu_device *adev) { +uint64_t table_addr =amdgpu_bo_gpu_offset (adev->gart.bo);int r, i;u32 tmp, field;
@@ -863,7 +864,7 @@ static int gmc_v8_0_gart_enable(struct amdgpu_device *adev)/* setup context0 */ WREG32 (mmVM_CONTEXT0_PAGE_TABLE_START_ADDR, adev->gmc.gart_start >>12 );WREG32 (mmVM_CONTEXT0_PAGE_TABLE_END_ADDR, adev->gmc.gart_end >>12 ); -WREG32 (mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR, adev->gart.table_addr >>12 ); +WREG32 (mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR, table_addr >>12 );WREG32 (mmVM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR, (u32)(adev->dummy_page_addr >>12 ));WREG32 (mmVM_CONTEXT0_CNTL2,0 );
@@ -887,10 +888,10 @@ static int gmc_v8_0_gart_enable(struct amdgpu_device *adev)for (i =1 ; i <16 ; i++) {if (i <8 )WREG32 (mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR + i, - adev->gart.table_addr >>12 ); + table_addr >>12 );else WREG32 (mmVM_CONTEXT8_PAGE_TABLE_BASE_ADDR + i -8 , - adev->gart.table_addr >>12 ); + table_addr >>12 ); }/* enable context1-15 */
@@ -918,7 +919,7 @@ static int gmc_v8_0_gart_enable(struct amdgpu_device *adev)gmc_v8_0_flush_gpu_tlb (adev,0 );DRM_INFO ("PCIE GART of %uM enabled (table at 0x%016llX).\n" , (unsigned )(adev->gmc.gart_size >>20 ), - (unsigned long long )adev->gart.table_addr); + (unsigned long long )table_addr); adev->gart.ready = true;return 0 ; }
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +1 -1
@@ -1125,7 +1125,7 @@ static int gmc_v9_0_gart_enable(struct amdgpu_device *adev)DRM_INFO ("PCIE GART of %uM enabled (table at 0x%016llX).\n" , (unsigned )(adev->gmc.gart_size >>20 ), - (unsigned long long )adev->gart.table_addr); + (unsigned long long )amdgpu_bo_gpu_offset (adev->gart.bo)); adev->gart.ready = true;return 0 ; }
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +3 -4
@@ -47,11 +47,10 @@ u64 mmhub_v1_0_get_fb_location(struct amdgpu_device *adev)static void mmhub_v1_0_init_gart_pt_regs (struct amdgpu_device *adev) { -uint64_t value; +uint64_t value =amdgpu_bo_gpu_offset (adev->gart.bo); -BUG_ON (adev->gart.table_addr & (~0x0000FFFFFFFFF000ULL )); - value = adev->gart.table_addr - adev->gmc.vram_start + - adev->vm_manager.vram_base_offset; +BUG_ON (value & (~0x0000FFFFFFFFF000ULL )); + value -= adev->gmc.vram_start + adev->vm_manager.vram_base_offset; value &=0x0000FFFFFFFFF000ULL ; value |=0x1 ;/* valid bit */
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 7/11 drm/amdgpu: add GMC9 support for PDs/PTs in system memory
In reply to a message not in the archiveAdd the necessary handling.
--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +1 -1
@@ -571,7 +571,7 @@ static uint64_t gmc_v9_0_get_vm_pte_flags(struct amdgpu_device *adev,static void gmc_v9_0_get_vm_pde (struct amdgpu_device *adev,int level,uint64_t *addr,uint64_t *flags) { -if (!(*flags &AMDGPU_PDE_PTE )) +if (!(*flags &AMDGPU_PDE_PTE ) && !(*flags &AMDGPU_PTE_SYSTEM )) *addr = adev->vm_manager.vram_base_offset + *addr - adev->gmc.vram_start;BUG_ON (*addr &0xFFFF00000000003FULL );
Signature · 6 lines
2.17.1 _______________________________________________ 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): 20180822150517.2330-7-christian.koenig-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 07/11] drm/amdgpu: add GMC9 support for PDs/PTs in system memory
Quoted 3 lines · Christian König
Add the necessary handling.
Signed-off-by Christian König <[email protected]>
Looks going to use GTT for page table.
What kind of scenario to use that?
could it be replaced by CPU updating page table in system memory?
Regards,
Jerry
Quoted 10 lines
--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +0
-0
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c static uint64_t gmc_v9_0_get_vm_pte_flags(struct amdgpu_device *adev, · line 577
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +1
-1@@ -571,7 +571,7 @@ static uint64_t gmc_v9_0_get_vm_pte_flags(struct amdgpu_device *adev,static void gmc_v9_0_get_vm_pde (struct amdgpu_device *adev,int level,uint64_t *addr,uint64_t *flags) { -if (!(*flags &AMDGPU_PDE_PTE )) +if (!(*flags &AMDGPU_PDE_PTE ) && !(*flags &AMDGPU_PTE_SYSTEM )) *addr = adev->vm_manager.vram_base_offset + *addr - adev->gmc.vram_start;BUG_ON (*addr &0xFFFF00000000003FULL );
_______________________________________________
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): [email protected]
Re: [PATCH 07/11] drm/amdgpu: add GMC9 support for PDs/PTs in system memory
Quoted 8 lines · Jerry (Junwei)
Quoted 3 lines · Christian König
Add the necessary handling.
Signed-off-by Christian König <[email protected]>Looks going to use GTT for page table.
What kind of scenario to use that?
could it be replaced by CPU updating page table in system memory?
If the system bit is not set in the PTE entry, it will map the page of video memory.
Thanks,
Ray
Quoted 18 lines
Regards,
JerryQuoted 14 lines
--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +1
-1@@ -571,7 +571,7 @@ static uint64_t gmc_v9_0_get_vm_pte_flags(struct amdgpu_device *adev,static void gmc_v9_0_get_vm_pde (struct amdgpu_device *adev,int level,uint64_t *addr,uint64_t *flags) { -if (!(*flags &AMDGPU_PDE_PTE )) +if (!(*flags &AMDGPU_PDE_PTE ) && !(*flags &AMDGPU_PTE_SYSTEM ))
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c static uint64_t gmc_v9_0_get_vm_pte_flags(struct amdgpu_device *adev, · line 577
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +0
-0*addr = adev->vm_manager.vram_base_offset + *addr - adev->gmc.vram_start;BUG_ON (*addr &0xFFFF00000000003FULL );_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Huang Rui
Reviewed-byRe: [PATCH 07/11] drm/amdgpu: add GMC9 support for PDs/PTs in system memory
In reply to a message not in the archiveQuoted 3 lines · Christian König
Add the necessary handling.
Signed-off-by Christian König <[email protected]>
Quoted 24 lines
--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +1
-1@@ -571,7 +571,7 @@ static uint64_t gmc_v9_0_get_vm_pte_flags(struct amdgpu_device *adev,static void gmc_v9_0_get_vm_pde (struct amdgpu_device *adev,int level,uint64_t *addr,uint64_t *flags) { -if (!(*flags &AMDGPU_PDE_PTE )) +if (!(*flags &AMDGPU_PDE_PTE ) && !(*flags &AMDGPU_PTE_SYSTEM )) *addr = adev->vm_manager.vram_base_offset + *addr - adev->gmc.vram_start;BUG_ON (*addr &0xFFFF00000000003FULL );Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 8/11 drm/amdgpu: add amdgpu_gmc_pd_addr helper
In reply to a message not in the archiveAdd a helper to get the root PD address and remove the workarounds from the GMC9 code for that.
--- drivers/gpu/drm/amd/amdgpu/Makefile | 3 +- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 47 +++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 7 +-- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 -- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 7 +-- 9 files changed, 56 insertions(+), 23 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
drivers/gpu/drm/amd/amdgpu/Makefile +2 -1
@@ -51,7 +51,8 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ amdgpu_prime.o amdgpu_vm.o amdgpu_ib.o amdgpu_pll.o \ amdgpu_ucode.o amdgpu_bo_list.o amdgpu_ctx.o amdgpu_sync.o \ amdgpu_gtt_mgr.o amdgpu_vram_mgr.o amdgpu_virt.o amdgpu_atomfirmware.o \ - amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o + amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o \ + amdgpu_gmc.o # add asic specific block amdgpu-$(CONFIG_DRM_AMDGPU_CIK)+= cik.o cik_ih.o kv_smc.o kv_dpm.o \
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +1 -4
@@ -364,7 +364,6 @@ static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm)struct amdgpu_bo *pd = vm->root.base.bo;struct amdgpu_device *adev =amdgpu_ttm_adev (pd->tbo.bdev);struct amdgpu_vm_parser param; -uint64_t addr, flags =AMDGPU_PTE_VALID ;int ret; param.domain =AMDGPU_GEM_DOMAIN_VRAM ;
@@ -383,9 +382,7 @@ static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm)return ret; } - addr =amdgpu_bo_gpu_offset (vm->root.base.bo); -amdgpu_gmc_get_vm_pde (adev,-1 , &addr, &flags); - vm->pd_phys_addr = addr; + vm->pd_phys_addr =amdgpu_gmc_pd_addr (vm->root.base.bo);if (vm->use_cpu_for_update) { ret =amdgpu_bo_kmap (pd,NULL );
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +1 -1
@@ -946,7 +946,7 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p)if (r)return r; - p->job->vm_pd_addr =amdgpu_bo_gpu_offset (vm->root.base.bo); + p->job->vm_pd_addr =amdgpu_gmc_pd_addr (vm->root.base.bo);if (amdgpu_vm_debug) {/* Invalidate all BOs to test for userspace bugs */
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c new file +47 -0
47 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h +2 -0
@@ -131,4 +131,6 @@ static inline bool amdgpu_gmc_vram_full_visible(struct amdgpu_gmc *gmc) return (gmc->real_vram_size == gmc->visible_vram_size); } +uint64_t amdgpu_gmc_pd_addr (struct amdgpu_bo *bo); +#endif
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +1 -1
@@ -2049,7 +2049,7 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint64_t src_offset,return r;if (vm_needs_flush) { - job->vm_pd_addr =amdgpu_bo_gpu_offset (adev->gart.bo); + job->vm_pd_addr =amdgpu_gmc_pd_addr (adev->gart.bo); job->vm_needs_flush = true; }if (resv) {
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +1 -6
@@ -37,12 +37,7 @@ u64 gfxhub_v1_0_get_mc_fb_offset(struct amdgpu_device *adev)static void gfxhub_v1_0_init_gart_pt_regs (struct amdgpu_device *adev) { -uint64_t value =amdgpu_bo_gpu_offset (adev->gart.bo); - -BUG_ON (value & (~0x0000FFFFFFFFF000ULL )); - value -= adev->gmc.vram_start + adev->vm_manager.vram_base_offset; - value &=0x0000FFFFFFFFF000ULL ; - value |=0x1 ;/*valid bit*/ +uint64_t value =amdgpu_gmc_pd_addr (adev->gart.bo);WREG32_SOC15 (GC ,0 , mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32,lower_32_bits (value));
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +0 -4
@@ -436,12 +436,8 @@ static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,struct amdgpu_device *adev = ring->adev;struct amdgpu_vmhub *hub = &adev->vmhub[ring->funcs->vmhub];uint32_t req =gmc_v9_0_get_invalidate_req (vmid); -uint64_t flags =AMDGPU_PTE_VALID ;unsigned eng = ring->vm_inv_eng; -amdgpu_gmc_get_vm_pde (adev,-1 , &pd_addr, &flags); - pd_addr |= flags; -amdgpu_ring_emit_wreg (ring, hub->ctx0_ptb_addr_lo32 + (2 * vmid),lower_32_bits (pd_addr));
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +1 -6
@@ -47,12 +47,7 @@ u64 mmhub_v1_0_get_fb_location(struct amdgpu_device *adev)static void mmhub_v1_0_init_gart_pt_regs (struct amdgpu_device *adev) { -uint64_t value =amdgpu_bo_gpu_offset (adev->gart.bo); - -BUG_ON (value & (~0x0000FFFFFFFFF000ULL )); - value -= adev->gmc.vram_start + adev->vm_manager.vram_base_offset; - value &=0x0000FFFFFFFFF000ULL ; - value |=0x1 ;/* valid bit */ +uint64_t value =amdgpu_gmc_pd_addr (adev->gart.bo);WREG32_SOC15 (MMHUB ,0 , mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32,lower_32_bits (value));
Signature · 6 lines
2.17.1 _______________________________________________ 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): 20180822150517.2330-8-christian.koenig-5C7GfCeVMHo@public.gmane.org
Felix Kuehling
Acked-byRe: [PATCH 08/11] drm/amdgpu: add amdgpu_gmc_pd_addr helper
The amdgpu_amdkfd_gpuvm code looked different than I remembered. There are some important patches missing upstream that I'll roll into my next patch series.
Regards,
Felix
Quoted 187 lines · Christian König
Add a helper to get the root PD address and remove the workarounds from the GMC9 code for that.
Signed-off-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/Makefile | 3 +- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 47 +++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 7 +-- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 -- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 7 +-- 9 files changed, 56 insertions(+), 23 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.cdrivers/gpu/drm/amd/amdgpu/Makefile +2
-1@@ -51,7 +51,8 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ amdgpu_prime.o amdgpu_vm.o amdgpu_ib.o amdgpu_pll.o \ amdgpu_ucode.o amdgpu_bo_list.o amdgpu_ctx.o amdgpu_sync.o \ amdgpu_gtt_mgr.o amdgpu_vram_mgr.o amdgpu_virt.o amdgpu_atomfirmware.o \ - amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o + amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o \ + amdgpu_gmc.o # add asic specific block amdgpu-$(CONFIG_DRM_AMDGPU_CIK)+= cik.o cik_ih.o kv_smc.o kv_dpm.o \drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +1
-4@@ -364,7 +364,6 @@ static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm)struct amdgpu_bo *pd = vm->root.base.bo;struct amdgpu_device *adev =amdgpu_ttm_adev (pd->tbo.bdev);struct amdgpu_vm_parser param; -uint64_t addr, flags =AMDGPU_PTE_VALID ;int ret; param.domain =AMDGPU_GEM_DOMAIN_VRAM ;@@ -383,9 +382,7 @@ static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm)return ret; } - addr =amdgpu_bo_gpu_offset (vm->root.base.bo); -amdgpu_gmc_get_vm_pde (adev,-1 , &addr, &flags); - vm->pd_phys_addr = addr; + vm->pd_phys_addr =amdgpu_gmc_pd_addr (vm->root.base.bo);if (vm->use_cpu_for_update) { ret =amdgpu_bo_kmap (pd,NULL );drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +1
-1@@ -946,7 +946,7 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p)if (r)return r; - p->job->vm_pd_addr =amdgpu_bo_gpu_offset (vm->root.base.bo); + p->job->vm_pd_addr =amdgpu_gmc_pd_addr (vm->root.base.bo);if (amdgpu_vm_debug) {/* Invalidate all BOs to test for userspace bugs */ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c new file +47
-0@@ -0,0 +1,47 @@ +/* +* Copyright 2018 Advanced Micro Devices, Inc. +* All Rights Reserved. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the +* "Software"), to deal in the Software without restriction, including +* without limitation the rights to use, copy, modify, merge, publish, +* distribute, sub license, and/or sell copies of the Software, and to +* permit persons to whom the Software is furnished to do so, subject to +* the following conditions: +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, +* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +* USE OR OTHER DEALINGS IN THE SOFTWARE. +* +* The above copyright notice and this permission notice (including the +* next paragraph) shall be included in all copies or substantial portions +* of the Software. +* +*/ + +#include "amdgpu.h" + +/** +* amdgpu_gmc_pd_addr - return the address of the root directory +* +*/ +uint64_t amdgpu_gmc_pd_addr (struct amdgpu_bo *bo) +{ +struct amdgpu_device *adev =amdgpu_ttm_adev (bo->tbo.bdev); +uint64_t pd_addr; + + pd_addr =amdgpu_bo_gpu_offset (bo); +/* TODO: move that into ASIC specific code */ +if (adev->asic_type >=CHIP_VEGA10 ) { +uint64_t flags =AMDGPU_PTE_VALID ; + +amdgpu_gmc_get_vm_pde (adev,-1 , &pd_addr, &flags); + pd_addr |= flags; + } +return pd_addr; +}drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h +2
-0@@ -131,4 +131,6 @@ static inline bool amdgpu_gmc_vram_full_visible(struct amdgpu_gmc *gmc) return (gmc->real_vram_size == gmc->visible_vram_size); } +uint64_t amdgpu_gmc_pd_addr (struct amdgpu_bo *bo); +#endif drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +1
-1@@ -2049,7 +2049,7 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint64_t src_offset,return r;if (vm_needs_flush) { - job->vm_pd_addr =amdgpu_bo_gpu_offset (adev->gart.bo); + job->vm_pd_addr =amdgpu_gmc_pd_addr (adev->gart.bo); job->vm_needs_flush = true; }if (resv) {drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +1
-6@@ -37,12 +37,7 @@ u64 gfxhub_v1_0_get_mc_fb_offset(struct amdgpu_device *adev)static void gfxhub_v1_0_init_gart_pt_regs (struct amdgpu_device *adev) { -uint64_t value =amdgpu_bo_gpu_offset (adev->gart.bo); - -BUG_ON (value & (~0x0000FFFFFFFFF000ULL )); - value -= adev->gmc.vram_start + adev->vm_manager.vram_base_offset; - value &=0x0000FFFFFFFFF000ULL ; - value |=0x1 ;/*valid bit*/ +uint64_t value =amdgpu_gmc_pd_addr (adev->gart.bo);WREG32_SOC15 (GC ,0 , mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32,lower_32_bits (value));drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +0
-4@@ -436,12 +436,8 @@ static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,struct amdgpu_device *adev = ring->adev;struct amdgpu_vmhub *hub = &adev->vmhub[ring->funcs->vmhub];uint32_t req =gmc_v9_0_get_invalidate_req (vmid); -uint64_t flags =AMDGPU_PTE_VALID ;unsigned eng = ring->vm_inv_eng; -amdgpu_gmc_get_vm_pde (adev,-1 , &pd_addr, &flags); - pd_addr |= flags; -amdgpu_ring_emit_wreg (ring, hub->ctx0_ptb_addr_lo32 + (2 * vmid),lower_32_bits (pd_addr));drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +0
-0@@ -47,12 +47,7 @@ u64 mmhub_v1_0_get_fb_location(struct amdgpu_device *adev)static void mmhub_v1_0_init_gart_pt_regs (struct amdgpu_device *adev) {
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c u64 mmhub_v1_0_get_fb_location(struct amdgpu_device *adev) · line 53
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +1
-6-uint64_t value =amdgpu_bo_gpu_offset (adev->gart.bo); - -BUG_ON (value & (~0x0000FFFFFFFFF000ULL )); - value -= adev->gmc.vram_start + adev->vm_manager.vram_base_offset; - value &=0x0000FFFFFFFFF000ULL ; - value |=0x1 ;/* valid bit */ +uint64_t value =amdgpu_gmc_pd_addr (adev->gart.bo);WREG32_SOC15 (MMHUB ,0 , mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32,lower_32_bits (value));
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 08/11] drm/amdgpu: add amdgpu_gmc_pd_addr helper
In reply to a message not in the archiveQuoted 96 lines · Christian König
Add a helper to get the root PD address and remove the workarounds from the GMC9 code for that.
Signed-off-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/Makefile | 3 +- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 47 +++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 7 +-- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 -- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 7 +-- 9 files changed, 56 insertions(+), 23 deletions(-)create mode 100644
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.cdrivers/gpu/drm/amd/amdgpu/Makefile +2
-1@@ -51,7 +51,8 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ amdgpu_prime.o amdgpu_vm.o amdgpu_ib.o amdgpu_pll.o \ amdgpu_ucode.o amdgpu_bo_list.o amdgpu_ctx.o amdgpu_sync.o \ amdgpu_gtt_mgr.o amdgpu_vram_mgr.o amdgpu_virt.o amdgpu_atomfirmware.o \ - amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o + amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o \ + amdgpu_gmc.o # add asic specific block amdgpu-$(CONFIG_DRM_AMDGPU_CIK)+= cik.o cik_ih.o kv_smc.o kv_dpm.o \drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +1
-4@@ -364,7 +364,6 @@ static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm)struct amdgpu_bo *pd = vm->root.base.bo;struct amdgpu_device *adev =amdgpu_ttm_adev (pd->tbo.bdev);struct amdgpu_vm_parser param; -uint64_t addr, flags =AMDGPU_PTE_VALID ;int ret; param.domain =AMDGPU_GEM_DOMAIN_VRAM ;@@ -383,9 +382,7 @@ static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm)return ret; } - addr =amdgpu_bo_gpu_offset (vm->root.base.bo); -amdgpu_gmc_get_vm_pde (adev,-1 , &addr, &flags); - vm->pd_phys_addr = addr; + vm->pd_phys_addr =amdgpu_gmc_pd_addr (vm->root.base.bo);if (vm->use_cpu_for_update) { ret =amdgpu_bo_kmap (pd,NULL );drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +1
-1@@ -946,7 +946,7 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p)if (r)return r; - p->job->vm_pd_addr =amdgpu_bo_gpu_offset (vm->root.base.bo); + p->job->vm_pd_addr =amdgpu_gmc_pd_addr (vm->root.base.bo);if (amdgpu_vm_debug) {/* Invalidate all BOs to test for userspace bugs */ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c new file +23
-0@@ -0,0 +1,47 @@ +/* +* Copyright 2018 Advanced Micro Devices, Inc. +* All Rights Reserved. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the +* "Software"), to deal in the Software without restriction, including +* without limitation the rights to use, copy, modify, merge, publish, +* distribute, sub license, and/or sell copies of the Software, and to +* permit persons to whom the Software is furnished to do so, subject to +* the following conditions: +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, +* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +* USE OR OTHER DEALINGS IN THE SOFTWARE. +* +* The above copyright notice and this permission notice (including the +* next paragraph) shall be included in all copies or substantial portions +* of the Software.
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c line 33
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c new file +10
-0+* +*/ + +#include "amdgpu.h" + +/** +* amdgpu_gmc_pd_addr - return the address of the root directory +* +*/ +uint64_t amdgpu_gmc_pd_addr (struct amdgpu_bo *bo)
If the func is going to handle all pd address, it's better to be called in gmc6,7,8 as well.
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c line 39
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c new file +6
-0+{ +struct amdgpu_device *adev =amdgpu_ttm_adev (bo->tbo.bdev); +uint64_t pd_addr; + + pd_addr =amdgpu_bo_gpu_offset (bo); +/* TODO: move that into ASIC specific code */
Sounds it could be a func(.gmc_pd_addr) in the group of amdgpu_gmc_funcs?
Regards,
Jerry
Quoted 76 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c new file +8
-0+if (adev->asic_type >=CHIP_VEGA10 ) { +uint64_t flags =AMDGPU_PTE_VALID ; + +amdgpu_gmc_get_vm_pde (adev,-1 , &pd_addr, &flags); + pd_addr |= flags; + } +return pd_addr; +}drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h +2
-0@@ -131,4 +131,6 @@ static inline bool amdgpu_gmc_vram_full_visible(struct amdgpu_gmc *gmc) return (gmc->real_vram_size == gmc->visible_vram_size); } +uint64_t amdgpu_gmc_pd_addr (struct amdgpu_bo *bo); +#endif drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +1
-1@@ -2049,7 +2049,7 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint64_t src_offset,return r;if (vm_needs_flush) { - job->vm_pd_addr =amdgpu_bo_gpu_offset (adev->gart.bo); + job->vm_pd_addr =amdgpu_gmc_pd_addr (adev->gart.bo); job->vm_needs_flush = true; }if (resv) {drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +1
-6@@ -37,12 +37,7 @@ u64 gfxhub_v1_0_get_mc_fb_offset(struct amdgpu_device *adev)static void gfxhub_v1_0_init_gart_pt_regs (struct amdgpu_device *adev) { -uint64_t value =amdgpu_bo_gpu_offset (adev->gart.bo); - -BUG_ON (value & (~0x0000FFFFFFFFF000ULL )); - value -= adev->gmc.vram_start + adev->vm_manager.vram_base_offset; - value &=0x0000FFFFFFFFF000ULL ; - value |=0x1 ;/*valid bit*/ +uint64_t value =amdgpu_gmc_pd_addr (adev->gart.bo);WREG32_SOC15 (GC ,0 , mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32,lower_32_bits (value));drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +0
-4@@ -436,12 +436,8 @@ static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,struct amdgpu_device *adev = ring->adev;struct amdgpu_vmhub *hub = &adev->vmhub[ring->funcs->vmhub];uint32_t req =gmc_v9_0_get_invalidate_req (vmid); -uint64_t flags =AMDGPU_PTE_VALID ;unsigned eng = ring->vm_inv_eng; -amdgpu_gmc_get_vm_pde (adev,-1 , &pd_addr, &flags); - pd_addr |= flags; -amdgpu_ring_emit_wreg (ring, hub->ctx0_ptb_addr_lo32 + (2 * vmid),lower_32_bits (pd_addr));drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +0
-0@@ -47,12 +47,7 @@ u64 mmhub_v1_0_get_fb_location(struct amdgpu_device *adev)static void mmhub_v1_0_init_gart_pt_regs (struct amdgpu_device *adev) {
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c u64 mmhub_v1_0_get_fb_location(struct amdgpu_device *adev) · line 53
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +1
-6-uint64_t value =amdgpu_bo_gpu_offset (adev->gart.bo); - -BUG_ON (value & (~0x0000FFFFFFFFF000ULL )); - value -= adev->gmc.vram_start + adev->vm_manager.vram_base_offset; - value &=0x0000FFFFFFFFF000ULL ; - value |=0x1 ;/* valid bit */ +uint64_t value =amdgpu_gmc_pd_addr (adev->gart.bo);WREG32_SOC15 (MMHUB ,0 , mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32,lower_32_bits (value));
_______________________________________________
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): [email protected]
Re: [PATCH 08/11] drm/amdgpu: add amdgpu_gmc_pd_addr helper
Am 23.08.2018 um 05:07 schrieb Zhang, Jerry (Junwei):
Quoted 122 lines · Christian König
Quoted 110 lines
Add a helper to get the root PD address and remove the workarounds from the GMC9 code for that.
Signed-off-by Christian König <[email protected]>---
drivers/gpu/drm/amd/amdgpu/Makefile | 3 +- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +-drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 47 +++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 7 +-- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 -- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 7 +-- 9 files changed, 56 insertions(+), 23 deletions(-)create mode 100644
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.cdrivers/gpu/drm/amd/amdgpu/Makefile +2
-1@@ -51,7 +51,8 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ amdgpu_prime.o amdgpu_vm.o amdgpu_ib.o amdgpu_pll.o \ amdgpu_ucode.o amdgpu_bo_list.o amdgpu_ctx.o amdgpu_sync.o \ amdgpu_gtt_mgr.o amdgpu_vram_mgr.o amdgpu_virt.o amdgpu_atomfirmware.o \ - amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o + amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o \ + amdgpu_gmc.o # add asic specific block amdgpu-$(CONFIG_DRM_AMDGPU_CIK)+= cik.o cik_ih.o kv_smc.o kv_dpm.o \drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +0
-1@@ -364,7 +364,6 @@ static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm) struct amdgpu_bo *pd = vm->root.base.bo; struct amdgpu_device *adev = amdgpu_ttm_adev(pd->tbo.bdev); struct amdgpu_vm_parser param; - uint64_t addr, flags = AMDGPU_PTE_VALID; int ret;param.domain =
AMDGPU_GEM_DOMAIN_VRAM;drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +1
-3@@ -383,9 +382,7 @@ static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm) return ret; } - addr = amdgpu_bo_gpu_offset(vm->root.base.bo); - amdgpu_gmc_get_vm_pde(adev, -1, &addr, &flags); - vm->pd_phys_addr = addr; + vm->pd_phys_addr = amdgpu_gmc_pd_addr(vm->root.base.bo); if (vm->use_cpu_for_update) {ret =
amdgpu_bo_kmap(pd, NULL);drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +1
-1@@ -946,7 +946,7 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p) if (r) return r; - p->job->vm_pd_addr = amdgpu_bo_gpu_offset(vm->root.base.bo); + p->job->vm_pd_addr = amdgpu_gmc_pd_addr(vm->root.base.bo); if (amdgpu_vm_debug) {/* Invalidate all BOs to test for userspace bugs */
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c new file +5
-0@@ -0,0 +1,47 @@ +/* +* Copyright 2018 Advanced Micro Devices, Inc. +* All Rights Reserved. +* +* Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ */drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c line 33
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c new file +8
-0+ +#include "amdgpu.h" + +/** +* amdgpu_gmc_pd_addr - return the address of the root directory +* +*/ +uint64_t amdgpu_gmc_pd_addr (struct amdgpu_bo *bo)If the func is going to handle all pd address, it's better to be called in gmc6,7,8 as well.
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c line 39
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c new file +6
-0+{ + struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev); + uint64_t pd_addr; + + pd_addr = amdgpu_bo_gpu_offset(bo); + /* TODO: move that into ASIC specific code */Sounds it could be a
func(.gmc_pd_addr)in the group ofamdgpu_gmc_funcs?
GMC6,7 and 8 want an MC address, but GMC9 uses a PDE for the root PD address.
So the idea here is to get all ASIC specific flush functions to accept a PDE, cause that includes all the information you need and not only the MC address.
Regards,
Christian.
Quoted 92 lines
Regards,
JerryQuoted 88 lines
+ if (
adev->asic_type>=CHIP_VEGA10) {
+uint64_tflags =AMDGPU_PTE_VALID;drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c new file +6
-0+ + amdgpu_gmc_get_vm_pde(adev, -1, &pd_addr, &flags); + pd_addr |= flags; + } + return pd_addr; +}drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h +2
-0@@ -131,4 +131,6 @@ static inline bool amdgpu_gmc_vram_full_visible(struct amdgpu_gmc *gmc) return (gmc->real_vram_size == gmc->visible_vram_size); } +uint64_t amdgpu_gmc_pd_addr (struct amdgpu_bo *bo); +#endif
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +1
-1@@ -2049,7 +2049,7 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint64_t src_offset, return r; if (vm_needs_flush) { - job->vm_pd_addr = amdgpu_bo_gpu_offset(adev->gart.bo); + job->vm_pd_addr = amdgpu_gmc_pd_addr(adev->gart.bo); job->vm_needs_flush = true; }if (resv) {
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +1
-6@@ -37,12 +37,7 @@ u64 gfxhub_v1_0_get_mc_fb_offset(struct amdgpu_device *adev) static void gfxhub_v1_0_init_gart_pt_regs(struct amdgpu_device *adev) { - uint64_t value = amdgpu_bo_gpu_offset(adev->gart.bo); - - BUG_ON(value & (~0x0000FFFFFFFFF000ULL)); - value -= adev->gmc.vram_start + adev->vm_manager.vram_base_offset; - value &= 0x0000FFFFFFFFF000ULL; - value |= 0x1; /*valid bit*/ + uint64_t value = amdgpu_gmc_pd_addr(adev->gart.bo); WREG32_SOC15(GC, 0, mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32,
lower_32_bits(value));drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +0
-4@@ -436,12 +436,8 @@ static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring, struct amdgpu_device *adev = ring->adev; struct amdgpu_vmhub *hub = &adev->vmhub[ring->funcs->vmhub]; uint32_t req = gmc_v9_0_get_invalidate_req(vmid); - uint64_t flags = AMDGPU_PTE_VALID; unsigned eng = ring->vm_inv_eng; - amdgpu_gmc_get_vm_pde(adev, -1, &pd_addr, &flags); - pd_addr |= flags; - amdgpu_ring_emit_wreg(ring, hub->ctx0_ptb_addr_lo32 + (2 * vmid), lower_32_bits(pd_addr));drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +1
-6@@ -47,12 +47,7 @@ u64 mmhub_v1_0_get_fb_location(struct amdgpu_device *adev) static void mmhub_v1_0_init_gart_pt_regs(struct amdgpu_device *adev) { - uint64_t value = amdgpu_bo_gpu_offset(adev->gart.bo); - - BUG_ON(value & (~0x0000FFFFFFFFF000ULL)); - value -= adev->gmc.vram_start + adev->vm_manager.vram_base_offset; - value &= 0x0000FFFFFFFFF000ULL; - value |= 0x1; /* valid bit */ + uint64_t value = amdgpu_gmc_pd_addr(adev->gart.bo);
Quoted 3 lines
Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +0
-0WREG32_SOC15(MMHUB, 0, mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32,
lower_32_bits(value));
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Huang Rui
Reviewed-byRe: [PATCH 08/11] drm/amdgpu: add amdgpu_gmc_pd_addr helper
In reply to a message not in the archiveQuoted 4 lines · Christian König
Add a helper to get the root PD address and remove the workarounds from the GMC9 code for that.
Signed-off-by Christian König <[email protected]>
Quoted 200 lines
--- drivers/gpu/drm/amd/amdgpu/Makefile | 3 +- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 47 +++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 7 +-- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 -- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 7 +-- 9 files changed, 56 insertions(+), 23 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.cdrivers/gpu/drm/amd/amdgpu/Makefile +2
-1@@ -51,7 +51,8 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ amdgpu_prime.o amdgpu_vm.o amdgpu_ib.o amdgpu_pll.o \ amdgpu_ucode.o amdgpu_bo_list.o amdgpu_ctx.o amdgpu_sync.o \ amdgpu_gtt_mgr.o amdgpu_vram_mgr.o amdgpu_virt.o amdgpu_atomfirmware.o \ - amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o + amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o \ + amdgpu_gmc.o # add asic specific block amdgpu-$(CONFIG_DRM_AMDGPU_CIK)+= cik.o cik_ih.o kv_smc.o kv_dpm.o \drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +1
-4@@ -364,7 +364,6 @@ static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm)struct amdgpu_bo *pd = vm->root.base.bo;struct amdgpu_device *adev =amdgpu_ttm_adev (pd->tbo.bdev);struct amdgpu_vm_parser param; -uint64_t addr, flags =AMDGPU_PTE_VALID ;int ret; param.domain =AMDGPU_GEM_DOMAIN_VRAM ;@@ -383,9 +382,7 @@ static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm)return ret; } - addr =amdgpu_bo_gpu_offset (vm->root.base.bo); -amdgpu_gmc_get_vm_pde (adev,-1 , &addr, &flags); - vm->pd_phys_addr = addr; + vm->pd_phys_addr =amdgpu_gmc_pd_addr (vm->root.base.bo);if (vm->use_cpu_for_update) { ret =amdgpu_bo_kmap (pd,NULL );drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +1
-1@@ -946,7 +946,7 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p)if (r)return r; - p->job->vm_pd_addr =amdgpu_bo_gpu_offset (vm->root.base.bo); + p->job->vm_pd_addr =amdgpu_gmc_pd_addr (vm->root.base.bo);if (amdgpu_vm_debug) {/* Invalidate all BOs to test for userspace bugs */ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c new file +47
-0@@ -0,0 +1,47 @@ +/* +* Copyright 2018 Advanced Micro Devices, Inc. +* All Rights Reserved. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the +* "Software"), to deal in the Software without restriction, including +* without limitation the rights to use, copy, modify, merge, publish, +* distribute, sub license, and/or sell copies of the Software, and to +* permit persons to whom the Software is furnished to do so, subject to +* the following conditions: +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, +* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +* USE OR OTHER DEALINGS IN THE SOFTWARE. +* +* The above copyright notice and this permission notice (including the +* next paragraph) shall be included in all copies or substantial portions +* of the Software. +* +*/ + +#include "amdgpu.h" + +/** +* amdgpu_gmc_pd_addr - return the address of the root directory +* +*/ +uint64_t amdgpu_gmc_pd_addr (struct amdgpu_bo *bo) +{ +struct amdgpu_device *adev =amdgpu_ttm_adev (bo->tbo.bdev); +uint64_t pd_addr; + + pd_addr =amdgpu_bo_gpu_offset (bo); +/* TODO: move that into ASIC specific code */ +if (adev->asic_type >=CHIP_VEGA10 ) { +uint64_t flags =AMDGPU_PTE_VALID ; + +amdgpu_gmc_get_vm_pde (adev,-1 , &pd_addr, &flags); + pd_addr |= flags; + } +return pd_addr; +}drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h +2
-0@@ -131,4 +131,6 @@ static inline bool amdgpu_gmc_vram_full_visible(struct amdgpu_gmc *gmc) return (gmc->real_vram_size == gmc->visible_vram_size); } +uint64_t amdgpu_gmc_pd_addr (struct amdgpu_bo *bo); +#endif drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +1
-1@@ -2049,7 +2049,7 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint64_t src_offset,return r;if (vm_needs_flush) { - job->vm_pd_addr =amdgpu_bo_gpu_offset (adev->gart.bo); + job->vm_pd_addr =amdgpu_gmc_pd_addr (adev->gart.bo); job->vm_needs_flush = true; }if (resv) {drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +1
-6@@ -37,12 +37,7 @@ u64 gfxhub_v1_0_get_mc_fb_offset(struct amdgpu_device *adev)static void gfxhub_v1_0_init_gart_pt_regs (struct amdgpu_device *adev) { -uint64_t value =amdgpu_bo_gpu_offset (adev->gart.bo); - -BUG_ON (value & (~0x0000FFFFFFFFF000ULL )); - value -= adev->gmc.vram_start + adev->vm_manager.vram_base_offset; - value &=0x0000FFFFFFFFF000ULL ; - value |=0x1 ;/*valid bit*/ +uint64_t value =amdgpu_gmc_pd_addr (adev->gart.bo);WREG32_SOC15 (GC ,0 , mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32,lower_32_bits (value));drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +0
-4@@ -436,12 +436,8 @@ static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,struct amdgpu_device *adev = ring->adev;struct amdgpu_vmhub *hub = &adev->vmhub[ring->funcs->vmhub];uint32_t req =gmc_v9_0_get_invalidate_req (vmid); -uint64_t flags =AMDGPU_PTE_VALID ;unsigned eng = ring->vm_inv_eng; -amdgpu_gmc_get_vm_pde (adev,-1 , &pd_addr, &flags); - pd_addr |= flags; -amdgpu_ring_emit_wreg (ring, hub->ctx0_ptb_addr_lo32 + (2 * vmid),lower_32_bits (pd_addr));drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +1
-6@@ -47,12 +47,7 @@ u64 mmhub_v1_0_get_fb_location(struct amdgpu_device *adev)static void mmhub_v1_0_init_gart_pt_regs (struct amdgpu_device *adev) { -uint64_t value =amdgpu_bo_gpu_offset (adev->gart.bo); - -BUG_ON (value & (~0x0000FFFFFFFFF000ULL )); - value -= adev->gmc.vram_start + adev->vm_manager.vram_base_offset; - value &=0x0000FFFFFFFFF000ULL ; - value |=0x1 ;/* valid bit */ +uint64_t value =amdgpu_gmc_pd_addr (adev->gart.bo);WREG32_SOC15 (MMHUB ,0 , mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32,lower_32_bits (value));Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 9/11 drm/amdgpu: add amdgpu_gmc_get_pde_for_bo helper
In reply to a message not in the archiveHelper to get the PDE for a PD/PT.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 37 +++++++++++++++++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 21 ++++++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +-- 5 files changed, 57 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +35 -2
@@ -26,6 +26,38 @@#include "amdgpu.h" +/** +* amdgpu_gmc_get_pde_for_bo - get the PDE for a BO +* +* @bo: the BO to get the PDE for +* @level: the level in the PD hirarchy +* @addr: resulting addr +* @flags: resulting flags +* +* Get the address and flags to be used for a PDE. +*/ +void amdgpu_gmc_get_pde_for_bo (struct amdgpu_bo *bo,int level, +uint64_t *addr,uint64_t *flags) +{ +struct amdgpu_device *adev =amdgpu_ttm_adev (bo->tbo.bdev); +struct ttm_dma_tt *ttm; + +switch (bo->tbo.mem.mem_type) { +case TTM_PL_TT : + ttm = container_of(bo->tbo.ttm, struct ttm_dma_tt, ttm); + *addr = ttm->dma_address[0 ]; +break ; +case TTM_PL_VRAM : + *addr =amdgpu_bo_gpu_offset (bo); +break ; +default : + *addr =0 ; +break ; + } + *flags =amdgpu_ttm_tt_pde_flags (bo->tbo.ttm, &bo->tbo.mem); +amdgpu_gmc_get_vm_pde (adev, level, addr, flags); +} +/** * amdgpu_gmc_pd_addr - return the address of the root directory *
@@ -35,13 +67,14 @@ uint64_t amdgpu_gmc_pd_addr(struct amdgpu_bo *bo)struct amdgpu_device *adev =amdgpu_ttm_adev (bo->tbo.bdev);uint64_t pd_addr; - pd_addr =amdgpu_bo_gpu_offset (bo);/* TODO: move that into ASIC specific code */ if (adev->asic_type >=CHIP_VEGA10 ) {uint64_t flags =AMDGPU_PTE_VALID ; -amdgpu_gmc_get_vm_pde (adev,-1 , &pd_addr, &flags); +amdgpu_gmc_get_pde_for_bo (bo,-1 , &pd_addr, &flags); pd_addr |= flags; + }else { + pd_addr =amdgpu_bo_gpu_offset (bo); }return pd_addr; }
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h +2 -0
@@ -131,6 +131,8 @@ static inline bool amdgpu_gmc_vram_full_visible(struct amdgpu_gmc *gmc) return (gmc->real_vram_size == gmc->visible_vram_size); } +void amdgpu_gmc_get_pde_for_bo (struct amdgpu_bo *bo,int level, +uint64_t *addr,uint64_t *flags);uint64_t amdgpu_gmc_pd_addr (struct amdgpu_bo *bo);#endif
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +18 -3
@@ -1428,13 +1428,14 @@ bool amdgpu_ttm_tt_is_readonly(struct ttm_tt *ttm) }/** -* amdgpu_ttm_tt_pte_flags - Compute PTE flags for ttm_tt object +* amdgpu_ttm_tt_pde_flags - Compute PDE flags for ttm_tt object * * @ttm: The ttm_tt object to compute the flags for * @mem: The memory registry backing this ttm_tt object +* +* Figure out the flags to use for a VM PDE. */ -uint64_t amdgpu_ttm_tt_pte_flags (struct amdgpu_device *adev,struct ttm_tt *ttm, -struct ttm_mem_reg *mem) +uint64_t amdgpu_ttm_tt_pde_flags (struct ttm_tt *ttm,struct ttm_mem_reg *mem) {uint64_t flags =0 ;
@@ -1448,6 +1449,20 @@ uint64_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm, flags |=AMDGPU_PTE_SNOOPED ; } +return flags; +} + +/** +* amdgpu_ttm_tt_pte_flags - Compute PTE flags for ttm_tt object +* +* @ttm: The ttm_tt object to compute the flags for +* @mem: The memory registry backing this ttm_tt object +*/ +uint64_t amdgpu_ttm_tt_pte_flags (struct amdgpu_device *adev,struct ttm_tt *ttm, +struct ttm_mem_reg *mem) +{ +uint64_t flags =amdgpu_ttm_tt_pde_flags (ttm, mem); + flags |= adev->gart.gart_pte_flags; flags |=AMDGPU_PTE_READABLE ;
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +1 -0
@@ -116,6 +116,7 @@ bool amdgpu_ttm_tt_userptr_invalidated(struct ttm_tt *ttm, int *last_invalidated);bool amdgpu_ttm_tt_userptr_needs_pages (struct ttm_tt *ttm);bool amdgpu_ttm_tt_is_readonly (struct ttm_tt *ttm); +uint64_t amdgpu_ttm_tt_pde_flags (struct ttm_tt *ttm,struct ttm_mem_reg *mem);uint64_t amdgpu_ttm_tt_pte_flags (struct amdgpu_device *adev,struct ttm_tt *ttm,struct ttm_mem_reg *mem);
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1 -3
@@ -982,9 +982,7 @@ static void amdgpu_vm_update_pde(struct amdgpu_pte_update_params *params, pbo = pbo->parent; level += params->adev->vm_manager.root_level; - pt =amdgpu_bo_gpu_offset (entry->base.bo); - flags =AMDGPU_PTE_VALID ; -amdgpu_gmc_get_vm_pde (params->adev, level, &pt, &flags); +amdgpu_gmc_get_pde_for_bo (entry->base.bo, level, &pt, &flags); pde = (entry - parent->entries) *8 ;if (bo->shadow) params->func (params, bo->shadow, pde, pt,1 ,0 , flags);
Signature · 6 lines
2.17.1 _______________________________________________ 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): 20180822150517.2330-9-christian.koenig-5C7GfCeVMHo@public.gmane.org
Huang Rui
Reviewed-byRe: [PATCH 09/11] drm/amdgpu: add amdgpu_gmc_get_pde_for_bo helper
Quoted 3 lines · Christian König
Helper to get the PDE for a PD/PT.
Signed-off-by Christian König <[email protected]>
Quoted 158 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 37 +++++++++++++++++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 21 ++++++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +-- 5 files changed, 57 insertions(+), 8 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +35
-2@@ -26,6 +26,38 @@#include "amdgpu.h" +/** +* amdgpu_gmc_get_pde_for_bo - get the PDE for a BO +* +* @bo: the BO to get the PDE for +* @level: the level in the PD hirarchy +* @addr: resulting addr +* @flags: resulting flags +* +* Get the address and flags to be used for a PDE. +*/ +void amdgpu_gmc_get_pde_for_bo (struct amdgpu_bo *bo,int level, +uint64_t *addr,uint64_t *flags) +{ +struct amdgpu_device *adev =amdgpu_ttm_adev (bo->tbo.bdev); +struct ttm_dma_tt *ttm; + +switch (bo->tbo.mem.mem_type) { +case TTM_PL_TT : + ttm = container_of(bo->tbo.ttm, struct ttm_dma_tt, ttm); + *addr = ttm->dma_address[0 ]; +break ; +case TTM_PL_VRAM : + *addr =amdgpu_bo_gpu_offset (bo); +break ; +default : + *addr =0 ; +break ; + } + *flags =amdgpu_ttm_tt_pde_flags (bo->tbo.ttm, &bo->tbo.mem); +amdgpu_gmc_get_vm_pde (adev, level, addr, flags); +} +/** * amdgpu_gmc_pd_addr - return the address of the root directory * @@ -35,13 +67,14 @@ uint64_t amdgpu_gmc_pd_addr(struct amdgpu_bo *bo)struct amdgpu_device *adev =amdgpu_ttm_adev (bo->tbo.bdev);uint64_t pd_addr; - pd_addr =amdgpu_bo_gpu_offset (bo);/* TODO: move that into ASIC specific code */ if (adev->asic_type >=CHIP_VEGA10 ) {uint64_t flags =AMDGPU_PTE_VALID ; -amdgpu_gmc_get_vm_pde (adev,-1 , &pd_addr, &flags); +amdgpu_gmc_get_pde_for_bo (bo,-1 , &pd_addr, &flags); pd_addr |= flags; + }else { + pd_addr =amdgpu_bo_gpu_offset (bo); }return pd_addr; }drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h +2
-0@@ -131,6 +131,8 @@ static inline bool amdgpu_gmc_vram_full_visible(struct amdgpu_gmc *gmc) return (gmc->real_vram_size == gmc->visible_vram_size); } +void amdgpu_gmc_get_pde_for_bo (struct amdgpu_bo *bo,int level, +uint64_t *addr,uint64_t *flags);uint64_t amdgpu_gmc_pd_addr (struct amdgpu_bo *bo);#endif drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +18
-3@@ -1428,13 +1428,14 @@ bool amdgpu_ttm_tt_is_readonly(struct ttm_tt *ttm) }/** -* amdgpu_ttm_tt_pte_flags - Compute PTE flags for ttm_tt object +* amdgpu_ttm_tt_pde_flags - Compute PDE flags for ttm_tt object * * @ttm: The ttm_tt object to compute the flags for * @mem: The memory registry backing this ttm_tt object +* +* Figure out the flags to use for a VM PDE. */ -uint64_t amdgpu_ttm_tt_pte_flags (struct amdgpu_device *adev,struct ttm_tt *ttm, -struct ttm_mem_reg *mem) +uint64_t amdgpu_ttm_tt_pde_flags (struct ttm_tt *ttm,struct ttm_mem_reg *mem) {uint64_t flags =0 ;@@ -1448,6 +1449,20 @@ uint64_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm, flags |=AMDGPU_PTE_SNOOPED ; } +return flags; +} + +/** +* amdgpu_ttm_tt_pte_flags - Compute PTE flags for ttm_tt object +* +* @ttm: The ttm_tt object to compute the flags for +* @mem: The memory registry backing this ttm_tt object +*/ +uint64_t amdgpu_ttm_tt_pte_flags (struct amdgpu_device *adev,struct ttm_tt *ttm, +struct ttm_mem_reg *mem) +{ +uint64_t flags =amdgpu_ttm_tt_pde_flags (ttm, mem); + flags |= adev->gart.gart_pte_flags; flags |=AMDGPU_PTE_READABLE ;drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +1
-0@@ -116,6 +116,7 @@ bool amdgpu_ttm_tt_userptr_invalidated(struct ttm_tt *ttm, int *last_invalidated);bool amdgpu_ttm_tt_userptr_needs_pages (struct ttm_tt *ttm);bool amdgpu_ttm_tt_is_readonly (struct ttm_tt *ttm); +uint64_t amdgpu_ttm_tt_pde_flags (struct ttm_tt *ttm,struct ttm_mem_reg *mem);uint64_t amdgpu_ttm_tt_pte_flags (struct amdgpu_device *adev,struct ttm_tt *ttm,struct ttm_mem_reg *mem);drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1
-3@@ -982,9 +982,7 @@ static void amdgpu_vm_update_pde(struct amdgpu_pte_update_params *params, pbo = pbo->parent; level += params->adev->vm_manager.root_level; - pt =amdgpu_bo_gpu_offset (entry->base.bo); - flags =AMDGPU_PTE_VALID ; -amdgpu_gmc_get_vm_pde (params->adev, level, &pt, &flags); +amdgpu_gmc_get_pde_for_bo (entry->base.bo, level, &pt, &flags); pde = (entry - parent->entries) *8 ;if (bo->shadow) params->func (params, bo->shadow, pde, pt,1 ,0 , flags);Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 10/11 drm/amdgpu: add helper for VM PD/PT allocation parameters
In reply to a message not in the archiveAdd a helper function to figure them out only once.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 61 ++++++++++++-------------- 1 file changed, 28 insertions(+), 33 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +28 -33
@@ -446,6 +446,31 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,return r; } +/** +* amdgpu_vm_bo_param - fill in parameters for PD/PT allocation +* +* @adev: amdgpu_device pointer +* @vm: requesting vm +* @bp: resulting BO allocation parameters +*/ +static void amdgpu_vm_bo_param (struct amdgpu_device *adev,struct amdgpu_vm *vm, +int level,struct amdgpu_bo_param *bp) +{ +memset (&bp,0 ,sizeof (bp)); + + bp->size =amdgpu_vm_bo_size (adev, level); + bp->byte_align =AMDGPU_GPU_PAGE_SIZE ; + bp->domain =AMDGPU_GEM_DOMAIN_VRAM ; + bp->flags =AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS ; +if (vm->use_cpu_for_update) + bp->flags |=AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ; +else + bp->flags |=AMDGPU_GEM_CREATE_SHADOW ; + bp->type = ttm_bo_type_kernel; +if (vm->root.base.bo) + bp->resv = vm->root.base.bo->tbo.resv; +} +/** * amdgpu_vm_alloc_levels - allocate the PD/PT levels *
@@ -469,8 +494,8 @@ static int amdgpu_vm_alloc_levels(struct amdgpu_device *adev, unsigned level, bool ats) { unsigned shift = amdgpu_vm_level_shift(adev, level); +struct amdgpu_bo_param bp;unsigned pt_idx, from, to; -u64 flags;int r;if (!parent->entries) {
@@ -494,29 +519,14 @@ static int amdgpu_vm_alloc_levels(struct amdgpu_device *adev, saddr = saddr & ((1 << shift) -1 ); eaddr = eaddr & ((1 << shift) -1 ); - flags =AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS ; -if (vm->use_cpu_for_update) - flags |=AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ; -else - flags |= (AMDGPU_GEM_CREATE_NO_CPU_ACCESS | -AMDGPU_GEM_CREATE_SHADOW ); +amdgpu_vm_bo_param (adev, vm, level, &bp);/* walk over the address space and allocate the page tables */ for (pt_idx = from; pt_idx <= to; ++pt_idx) { -struct reservation_object *resv = vm->root.base.bo->tbo.resv;struct amdgpu_vm_pt *entry = &parent->entries[pt_idx];struct amdgpu_bo *pt;if (!entry->base.bo) { -struct amdgpu_bo_param bp; - -memset (&bp,0 ,sizeof (bp)); - bp.size =amdgpu_vm_bo_size (adev, level); - bp.byte_align =AMDGPU_GPU_PAGE_SIZE ; - bp.domain =AMDGPU_GEM_DOMAIN_VRAM ; - bp.flags = flags; - bp.type = ttm_bo_type_kernel; - bp.resv = resv; r =amdgpu_bo_create (adev, &bp, &pt);if (r)return r;
@@ -2564,8 +2574,6 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, {struct amdgpu_bo_param bp;struct amdgpu_bo *root; -unsigned long size; -uint64_t flags;int r, i; vm->va =RB_ROOT_CACHED ;
@@ -2602,20 +2610,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, "CPU update of VM recommended only for large BAR system\n"); vm->last_update =NULL ; - flags =AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS ; -if (vm->use_cpu_for_update) - flags |=AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ; -else - flags |=AMDGPU_GEM_CREATE_SHADOW ; - - size =amdgpu_vm_bo_size (adev, adev->vm_manager.root_level); -memset (&bp,0 ,sizeof (bp)); - bp.size = size; - bp.byte_align =AMDGPU_GPU_PAGE_SIZE ; - bp.domain =AMDGPU_GEM_DOMAIN_VRAM ; - bp.flags = flags; - bp.type = ttm_bo_type_kernel; - bp.resv =NULL ; +amdgpu_vm_bo_param (adev, vm, adev->vm_manager.root_level, &bp); r =amdgpu_bo_create (adev, &bp, &root);if (r) goto error_free_sched_entity;
Signature · 6 lines
2.17.1 _______________________________________________ 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): 20180822150517.2330-10-christian.koenig-5C7GfCeVMHo@public.gmane.org
Alex Deucher
Reviewed-byRe: [PATCH 10/11] drm/amdgpu: add helper for VM PD/PT allocation parameters
Quoted 4 lines · Christian König
Add a helper function to figure them out only once.
Signed-off-by Christian König <[email protected]>
Quoted 115 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 61 ++++++++++++-------------- 1 file changed, 28 insertions(+), 33 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +28
-34@@ -446,6 +446,31 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,return r; } +/** +* amdgpu_vm_bo_param - fill in parameters for PD/PT allocation +* +* @adev: amdgpu_device pointer +* @vm: requesting vm +* @bp: resulting BO allocation parameters +*/ +static void amdgpu_vm_bo_param (struct amdgpu_device *adev,struct amdgpu_vm *vm, +int level,struct amdgpu_bo_param *bp) +{ +memset (&bp,0 ,sizeof (bp)); + + bp->size =amdgpu_vm_bo_size (adev, level); + bp->byte_align =AMDGPU_GPU_PAGE_SIZE ; + bp->domain =AMDGPU_GEM_DOMAIN_VRAM ; + bp->flags =AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS ; +if (vm->use_cpu_for_update) + bp->flags |=AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ; +else + bp->flags |=AMDGPU_GEM_CREATE_SHADOW ; + bp->type = ttm_bo_type_kernel; +if (vm->root.base.bo) + bp->resv = vm->root.base.bo->tbo.resv; +} +/** * amdgpu_vm_alloc_levels - allocate the PD/PT levels * @@ -469,8 +494,8 @@ static int amdgpu_vm_alloc_levels(struct amdgpu_device *adev, unsigned level, bool ats) { unsigned shift = amdgpu_vm_level_shift(adev, level); +struct amdgpu_bo_param bp;unsigned pt_idx, from, to; -u64 flags;int r;if (!parent->entries) {@@ -494,29 +519,14 @@ static int amdgpu_vm_alloc_levels(struct amdgpu_device *adev, saddr = saddr & ((1 << shift) -1 ); eaddr = eaddr & ((1 << shift) -1 ); - flags =AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS ; -if (vm->use_cpu_for_update) - flags |=AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ; -else - flags |= (AMDGPU_GEM_CREATE_NO_CPU_ACCESS | -AMDGPU_GEM_CREATE_SHADOW ); +amdgpu_vm_bo_param (adev, vm, level, &bp);/* walk over the address space and allocate the page tables */ for (pt_idx = from; pt_idx <= to; ++pt_idx) { -struct reservation_object *resv = vm->root.base.bo->tbo.resv;struct amdgpu_vm_pt *entry = &parent->entries[pt_idx];struct amdgpu_bo *pt;if (!entry->base.bo) { -struct amdgpu_bo_param bp; - -memset (&bp,0 ,sizeof (bp)); - bp.size =amdgpu_vm_bo_size (adev, level); - bp.byte_align =AMDGPU_GPU_PAGE_SIZE ; - bp.domain =AMDGPU_GEM_DOMAIN_VRAM ; - bp.flags = flags; - bp.type = ttm_bo_type_kernel; - bp.resv = resv; r =amdgpu_bo_create (adev, &bp, &pt);if (r)return r;@@ -2564,8 +2574,6 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, {struct amdgpu_bo_param bp;struct amdgpu_bo *root; -unsigned long size; -uint64_t flags;int r, i; vm->va =RB_ROOT_CACHED ;@@ -2602,20 +2610,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, "CPU update of VM recommended only for large BAR system\n"); vm->last_update =NULL ; - flags =AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS ; -if (vm->use_cpu_for_update) - flags |=AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ; -else - flags |=AMDGPU_GEM_CREATE_SHADOW ; - - size =amdgpu_vm_bo_size (adev, adev->vm_manager.root_level); -memset (&bp,0 ,sizeof (bp)); - bp.size = size; - bp.byte_align =AMDGPU_GPU_PAGE_SIZE ; - bp.domain =AMDGPU_GEM_DOMAIN_VRAM ; - bp.flags = flags; - bp.type = ttm_bo_type_kernel; - bp.resv =NULL ; +amdgpu_vm_bo_param (adev, vm, adev->vm_manager.root_level, &bp); r =amdgpu_bo_create (adev, &bp, &root);if (r) goto error_free_sched_entity; --2.17.1
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Zhang, Jerry (Junwei)
Reviewed-by Junwei ZhangRe: [PATCH 10/11] drm/amdgpu: add helper for VM PD/PT allocation parameters
In reply to a message not in the archiveQuoted 3 lines · Christian König
Add a helper function to figure them out only once.
Signed-off-by Christian König <[email protected]>
Quoted 103 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 61 ++++++++++++-------------- 1 file changed, 28 insertions(+), 33 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +27
-27@@ -446,6 +446,31 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,return r; } +/** +* amdgpu_vm_bo_param - fill in parameters for PD/PT allocation +* +* @adev: amdgpu_device pointer +* @vm: requesting vm +* @bp: resulting BO allocation parameters +*/ +static void amdgpu_vm_bo_param (struct amdgpu_device *adev,struct amdgpu_vm *vm, +int level,struct amdgpu_bo_param *bp) +{ +memset (&bp,0 ,sizeof (bp)); + + bp->size =amdgpu_vm_bo_size (adev, level); + bp->byte_align =AMDGPU_GPU_PAGE_SIZE ; + bp->domain =AMDGPU_GEM_DOMAIN_VRAM ; + bp->flags =AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS ; +if (vm->use_cpu_for_update) + bp->flags |=AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ; +else + bp->flags |=AMDGPU_GEM_CREATE_SHADOW ; + bp->type = ttm_bo_type_kernel; +if (vm->root.base.bo) + bp->resv = vm->root.base.bo->tbo.resv; +} +/** * amdgpu_vm_alloc_levels - allocate the PD/PT levels * @@ -469,8 +494,8 @@ static int amdgpu_vm_alloc_levels(struct amdgpu_device *adev, unsigned level, bool ats) { unsigned shift = amdgpu_vm_level_shift(adev, level); +struct amdgpu_bo_param bp;unsigned pt_idx, from, to; -u64 flags;int r;if (!parent->entries) {@@ -494,29 +519,14 @@ static int amdgpu_vm_alloc_levels(struct amdgpu_device *adev, saddr = saddr & ((1 << shift) -1 ); eaddr = eaddr & ((1 << shift) -1 ); - flags =AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS ; -if (vm->use_cpu_for_update) - flags |=AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ; -else - flags |= (AMDGPU_GEM_CREATE_NO_CPU_ACCESS | -AMDGPU_GEM_CREATE_SHADOW ); +amdgpu_vm_bo_param (adev, vm, level, &bp);/* walk over the address space and allocate the page tables */ for (pt_idx = from; pt_idx <= to; ++pt_idx) { -struct reservation_object *resv = vm->root.base.bo->tbo.resv;struct amdgpu_vm_pt *entry = &parent->entries[pt_idx];struct amdgpu_bo *pt;if (!entry->base.bo) { -struct amdgpu_bo_param bp; - -memset (&bp,0 ,sizeof (bp)); - bp.size =amdgpu_vm_bo_size (adev, level); - bp.byte_align =AMDGPU_GPU_PAGE_SIZE ; - bp.domain =AMDGPU_GEM_DOMAIN_VRAM ; - bp.flags = flags; - bp.type = ttm_bo_type_kernel; - bp.resv = resv; r =amdgpu_bo_create (adev, &bp, &pt);if (r)return r;@@ -2564,8 +2574,6 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, {struct amdgpu_bo_param bp;struct amdgpu_bo *root; -unsigned long size; -uint64_t flags;int r, i; vm->va =RB_ROOT_CACHED ;@@ -2602,20 +2610,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, "CPU update of VM recommended only for large BAR system\n"); vm->last_update =NULL ; - flags =AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS ; -if (vm->use_cpu_for_update) - flags |=AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ; -else - flags |=AMDGPU_GEM_CREATE_SHADOW ; - - size =amdgpu_vm_bo_size (adev, adev->vm_manager.root_level); -memset (&bp,0 ,sizeof (bp));
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, · line 2616
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1
-6- bp.size = size; - bp.byte_align =AMDGPU_GPU_PAGE_SIZE ; - bp.domain =AMDGPU_GEM_DOMAIN_VRAM ; - bp.flags = flags; - bp.type = ttm_bo_type_kernel; - bp.resv =NULL ; +amdgpu_vm_bo_param (adev, vm, adev->vm_manager.root_level, &bp); r =amdgpu_bo_create (adev, &bp, &root);if (r) goto error_free_sched_entity;
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Huang Rui
Reviewed-byRe: [PATCH 10/11] drm/amdgpu: add helper for VM PD/PT allocation parameters
In reply to a message not in the archiveQuoted 3 lines · Christian König
Add a helper function to figure them out only once.
Signed-off-by Christian König <[email protected]>
Quoted 119 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 61 ++++++++++++-------------- 1 file changed, 28 insertions(+), 33 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +28
-33@@ -446,6 +446,31 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,return r; } +/** +* amdgpu_vm_bo_param - fill in parameters for PD/PT allocation +* +* @adev: amdgpu_device pointer +* @vm: requesting vm +* @bp: resulting BO allocation parameters +*/ +static void amdgpu_vm_bo_param (struct amdgpu_device *adev,struct amdgpu_vm *vm, +int level,struct amdgpu_bo_param *bp) +{ +memset (&bp,0 ,sizeof (bp)); + + bp->size =amdgpu_vm_bo_size (adev, level); + bp->byte_align =AMDGPU_GPU_PAGE_SIZE ; + bp->domain =AMDGPU_GEM_DOMAIN_VRAM ; + bp->flags =AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS ; +if (vm->use_cpu_for_update) + bp->flags |=AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ; +else + bp->flags |=AMDGPU_GEM_CREATE_SHADOW ; + bp->type = ttm_bo_type_kernel; +if (vm->root.base.bo) + bp->resv = vm->root.base.bo->tbo.resv; +} +/** * amdgpu_vm_alloc_levels - allocate the PD/PT levels * @@ -469,8 +494,8 @@ static int amdgpu_vm_alloc_levels(struct amdgpu_device *adev, unsigned level, bool ats) { unsigned shift = amdgpu_vm_level_shift(adev, level); +struct amdgpu_bo_param bp;unsigned pt_idx, from, to; -u64 flags;int r;if (!parent->entries) {@@ -494,29 +519,14 @@ static int amdgpu_vm_alloc_levels(struct amdgpu_device *adev, saddr = saddr & ((1 << shift) -1 ); eaddr = eaddr & ((1 << shift) -1 ); - flags =AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS ; -if (vm->use_cpu_for_update) - flags |=AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ; -else - flags |= (AMDGPU_GEM_CREATE_NO_CPU_ACCESS | -AMDGPU_GEM_CREATE_SHADOW ); +amdgpu_vm_bo_param (adev, vm, level, &bp);/* walk over the address space and allocate the page tables */ for (pt_idx = from; pt_idx <= to; ++pt_idx) { -struct reservation_object *resv = vm->root.base.bo->tbo.resv;struct amdgpu_vm_pt *entry = &parent->entries[pt_idx];struct amdgpu_bo *pt;if (!entry->base.bo) { -struct amdgpu_bo_param bp; - -memset (&bp,0 ,sizeof (bp)); - bp.size =amdgpu_vm_bo_size (adev, level); - bp.byte_align =AMDGPU_GPU_PAGE_SIZE ; - bp.domain =AMDGPU_GEM_DOMAIN_VRAM ; - bp.flags = flags; - bp.type = ttm_bo_type_kernel; - bp.resv = resv; r =amdgpu_bo_create (adev, &bp, &pt);if (r)return r;@@ -2564,8 +2574,6 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, {struct amdgpu_bo_param bp;struct amdgpu_bo *root; -unsigned long size; -uint64_t flags;int r, i; vm->va =RB_ROOT_CACHED ;@@ -2602,20 +2610,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, "CPU update of VM recommended only for large BAR system\n"); vm->last_update =NULL ; - flags =AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS ; -if (vm->use_cpu_for_update) - flags |=AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ; -else - flags |=AMDGPU_GEM_CREATE_SHADOW ; - - size =amdgpu_vm_bo_size (adev, adev->vm_manager.root_level); -memset (&bp,0 ,sizeof (bp)); - bp.size = size; - bp.byte_align =AMDGPU_GPU_PAGE_SIZE ; - bp.domain =AMDGPU_GEM_DOMAIN_VRAM ; - bp.flags = flags; - bp.type = ttm_bo_type_kernel; - bp.resv =NULL ; +amdgpu_vm_bo_param (adev, vm, adev->vm_manager.root_level, &bp); r =amdgpu_bo_create (adev, &bp, &root);if (r) goto error_free_sched_entity;Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 11/11 drm/amdgpu: enable GTT PD/PT for raven
In reply to a message not in the archiveShould work on Vega10 as well, but with an obvious performance hit.
Older APUs can be enabled as well, but will probably be more work.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +10 -1
@@ -308,6 +308,7 @@ int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm,list_move (&bo_base->vm_status, &vm->moved);spin_unlock (&vm->moved_lock); }else { +amdgpu_ttm_alloc_gart (&bo->tbo);list_move (&bo_base->vm_status, &vm->relocated); } }
@@ -396,6 +397,10 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,if (r) goto error; + r =amdgpu_ttm_alloc_gart (&bo->tbo); +if (r) +return r; + r =amdgpu_job_alloc_with_ib (adev,64 , &job);if (r) goto error;
@@ -461,7 +466,11 @@ static void amdgpu_vm_bo_param(struct amdgpu_device *adev, struct amdgpu_vm *vm, bp->size =amdgpu_vm_bo_size (adev, level); bp->byte_align =AMDGPU_GPU_PAGE_SIZE ; bp->domain =AMDGPU_GEM_DOMAIN_VRAM ; - bp->flags =AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS ; +if (bp->size <=PAGE_SIZE && adev->asic_type ==CHIP_RAVEN ) + bp->domain |=AMDGPU_GEM_DOMAIN_GTT ; + bp->domain =amdgpu_bo_get_preferred_pin_domain (adev, bp->domain); + bp->flags =AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS | +AMDGPU_GEM_CREATE_CPU_GTT_USWC ;if (vm->use_cpu_for_update) bp->flags |=AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ;else
Signature · 6 lines
2.17.1 _______________________________________________ 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): 20180822150517.2330-11-christian.koenig-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 11/11] drm/amdgpu: enable GTT PD/PT for raven
Quoted 14 lines · Christian König
Should work on Vega10 as well, but with an obvious performance hit.
Older APUs can be enabled as well, but will probably be more work.
Signed-off-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0
-0
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm, · line 311
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1
-0@@ -308,6 +308,7 @@ int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm,list_move (&bo_base->vm_status, &vm->moved);spin_unlock (&vm->moved_lock); }else { +amdgpu_ttm_alloc_gart (&bo->tbo);
Looks like you forgot to check for return value here.
Andrey
Quoted 17 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +4
-0list_move (&bo_base->vm_status, &vm->relocated); } }@@ -396,6 +397,10 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,if (r) goto error; + r =amdgpu_ttm_alloc_gart (&bo->tbo); +if (r) +return r; + r =amdgpu_job_alloc_with_ib (adev,64 , &job);if (r) goto error;@@ -461,7 +466,11 @@ static void amdgpu_vm_bo_param(struct amdgpu_device *adev, struct amdgpu_vm *vm, bp->size =amdgpu_vm_bo_size (adev, level); bp->byte_align =AMDGPU_GPU_PAGE_SIZE ;
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c static void amdgpu_vm_bo_param(struct amdgpu_device *adev, struct amdgpu_vm *vm, · line 476
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +5
-1bp->domain =AMDGPU_GEM_DOMAIN_VRAM ; - bp->flags =AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS ; +if (bp->size <=PAGE_SIZE && adev->asic_type ==CHIP_RAVEN ) + bp->domain |=AMDGPU_GEM_DOMAIN_GTT ; + bp->domain =amdgpu_bo_get_preferred_pin_domain (adev, bp->domain); + bp->flags =AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS | +AMDGPU_GEM_CREATE_CPU_GTT_USWC ;if (vm->use_cpu_for_update) bp->flags |=AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ;else
_______________________________________________
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): f5c10bb6-4d93-5102-2c3b-ae0e161b70e1-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 11/11] drm/amdgpu: enable GTT PD/PT for raven
Quoted 6 lines · Andrey Grodzovsky
Quoted 3 lines · Christian König
Should work on Vega10 as well, but with an obvious performance hit.
Older APUs can be enabled as well, but will probably be more work.
Raven's VRAM is actually the system memory. May I know the benefit if we switch the PD/PT BO from vram to gart?
Quoted 6 lines
Quoted 6 lines
Signed-off-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
Quoted 12 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm, · line 311
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1
-0@@ -308,6 +308,7 @@ int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm,list_move (&bo_base->vm_status, &vm->moved);spin_unlock (&vm->moved_lock); }else { +amdgpu_ttm_alloc_gart (&bo->tbo);Looks like you forgot to check for return value here.
Yes, the same comment with me.
Thanks,
Ray
Quoted 25 lines
Andrey
Quoted 23 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +9
-1list_move (&bo_base->vm_status, &vm->relocated); } }@@ -396,6 +397,10 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,if (r) goto error; + r =amdgpu_ttm_alloc_gart (&bo->tbo); +if (r) +return r; + r =amdgpu_job_alloc_with_ib (adev,64 , &job);if (r) goto error;@@ -461,7 +466,11 @@ static void amdgpu_vm_bo_param(struct amdgpu_device *adev, struct amdgpu_vm *vm, bp->size =amdgpu_vm_bo_size (adev, level); bp->byte_align =AMDGPU_GPU_PAGE_SIZE ; bp->domain =AMDGPU_GEM_DOMAIN_VRAM ; - bp->flags =AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS ; +if (bp->size <=PAGE_SIZE && adev->asic_type ==CHIP_RAVEN ) + bp->domain |=AMDGPU_GEM_DOMAIN_GTT ; + bp->domain =amdgpu_bo_get_preferred_pin_domain (adev, bp->domain); + bp->flags =AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS | +AMDGPU_GEM_CREATE_CPU_GTT_USWC ;
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c static void amdgpu_vm_bo_param(struct amdgpu_device *adev, struct amdgpu_vm *vm, · line 476
Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0
-0if (vm->use_cpu_for_update) bp->flags |=AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ;else _______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 11/11] drm/amdgpu: enable GTT PD/PT for raven
Am 23.08.2018 um 14:54 schrieb Huang Rui:
Quoted 8 lines · Andrey Grodzovsky
Quoted 5 lines · Christian König
Quoted 3 lines
Should work on Vega10 as well, but with an obvious performance hit.
Older APUs can be enabled as well, but will probably be more work.
Raven's VRAM is actually the system memory. May I know the benefit if we switch the PD/PT BO from vram to gart?
We want to reduce VRAM usage as much as possible on APUs.
The end goal is that it should work with only 16MB (or was it 32MB?) stolen VRAM.
That is the recommended setting for newer OSes on that hardware.
Christian.
Quoted 17 lines
Quoted 6 lines
Quoted 6 lines
Signed-off-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)Quoted 11 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm, · line 311
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1
-0@@ -308,6 +308,7 @@ int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm,list_move (&bo_base->vm_status, &vm->moved);spin_unlock (&vm->moved_lock); }else { +amdgpu_ttm_alloc_gart (&bo->tbo);Looks like you forgot to check for return value here.
Quoted 37 lines
Yes, the same comment with me.
Thanks,
RayQuoted 32 lines
Andrey
Quoted 16 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +4
-0list_move (&bo_base->vm_status, &vm->relocated); } }@@ -396,6 +397,10 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,if (r) goto error; + r =amdgpu_ttm_alloc_gart (&bo->tbo); +if (r) +return r; + r =amdgpu_job_alloc_with_ib (adev,64 , &job);if (r) goto error;@@ -461,7 +466,11 @@ static void amdgpu_vm_bo_param(struct amdgpu_device *adev, struct amdgpu_vm *vm, bp->size =amdgpu_vm_bo_size (adev, level); bp->byte_align =AMDGPU_GPU_PAGE_SIZE ;drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c static void amdgpu_vm_bo_param(struct amdgpu_device *adev, struct amdgpu_vm *vm, · line 476
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +5
-1bp->domain =AMDGPU_GEM_DOMAIN_VRAM ; - bp->flags =AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS ; +if (bp->size <=PAGE_SIZE && adev->asic_type ==CHIP_RAVEN ) + bp->domain |=AMDGPU_GEM_DOMAIN_GTT ; + bp->domain =amdgpu_bo_get_preferred_pin_domain (adev, bp->domain); + bp->flags =AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS | +AMDGPU_GEM_CREATE_CPU_GTT_USWC ;if (vm->use_cpu_for_update) bp->flags |=AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ;else _______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 11/11] drm/amdgpu: enable GTT PD/PT for raven
In reply to a message not in the archiveQuoted 33 lines · Christian König
Should work on Vega10 as well, but with an obvious performance hit.
Older APUs can be enabled as well, but will probably be more work.
Signed-off-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +5
-0@@ -308,6 +308,7 @@ int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm,list_move (&bo_base->vm_status, &vm->moved);spin_unlock (&vm->moved_lock); }else { +amdgpu_ttm_alloc_gart (&bo->tbo);list_move (&bo_base->vm_status, &vm->relocated); } }@@ -396,6 +397,10 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,if (r) goto error; + r =amdgpu_ttm_alloc_gart (&bo->tbo); +if (r) +return r; + r =amdgpu_job_alloc_with_ib (adev,64 , &job);if (r) goto error;
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c static void amdgpu_vm_bo_param(struct amdgpu_device *adev, struct amdgpu_vm *vm, · line 469
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1
-1@@ -461,7 +466,11 @@ static void amdgpu_vm_bo_param(struct amdgpu_device *adev, struct amdgpu_vm *vm, bp->size =amdgpu_vm_bo_size (adev, level); bp->byte_align =AMDGPU_GPU_PAGE_SIZE ; bp->domain =AMDGPU_GEM_DOMAIN_VRAM ; - bp->flags =AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS ; +if (bp->size <=PAGE_SIZE && adev->asic_type ==CHIP_RAVEN )
Do we need bp->size <= PAGE_SIZE?
Seems it's always less 12 bit for raven?
Regards,
Jerry
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c static void amdgpu_vm_bo_param(struct amdgpu_device *adev, struct amdgpu_vm *vm, · line 476
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +4
-0+ bp->domain |=AMDGPU_GEM_DOMAIN_GTT ; + bp->domain =amdgpu_bo_get_preferred_pin_domain (adev, bp->domain); + bp->flags =AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS | +AMDGPU_GEM_CREATE_CPU_GTT_USWC ;if (vm->use_cpu_for_update) bp->flags |=AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ;else
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 2 lines · Christian König
Just another leftover from radeon.
I can't remember exactly what chip this was for. Are you sure this isn't still required for SI or something like that?
Alex
Quoted 46 lines
Signed-off-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 3 --- 2 files changed, 1 insertion(+), 6 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1
-3@@ -2566,8 +2566,6 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, {struct amdgpu_bo_param bp;struct amdgpu_bo *root; -const unsigned align =min (AMDGPU_VM_PTB_ALIGN_SIZE , -AMDGPU_VM_PTE_COUNT (adev) *8 );unsigned long size;uint64_t flags;int r, i;@@ -2615,7 +2613,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, size =amdgpu_vm_bo_size (adev, adev->vm_manager.root_level);memset (&bp,0 ,sizeof (bp)); bp.size = size; - bp.byte_align = align; + bp.byte_align =AMDGPU_GPU_PAGE_SIZE ; bp.domain =AMDGPU_GEM_DOMAIN_VRAM ; bp.flags = flags; bp.type = ttm_bo_type_kernel;drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +0
-4@@ -48,9 +48,6 @@ struct amdgpu_bo_list_entry;/* number of entries in page table */ #define AMDGPU_VM_PTE_COUNT (adev) (1 << (adev)->vm_manager.block_size) -/* PTBs (Page Table Blocks) need to be aligned to 32K */ -#define AMDGPU_VM_PTB_ALIGN_SIZE 32768 -#define AMDGPU_PTE_VALID (1ULL << 0)#define AMDGPU_PTE_SYSTEM (1ULL << 1)#define AMDGPU_PTE_SNOOPED (1ULL << 2) --2.17.1
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
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): CADnq5_OscxLwhzUnR9pcQ9cRVLPK1YyqEp6kCGOdVWahWPKEUg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Quoted 7 lines · Alex Deucher
Quoted 2 lines · Christian König
Just another leftover from radeon.
I can't remember exactly what chip this was for. Are you sure this isn't still required for SI or something like that?
FYI.
Some projects still use SI with amdgpu.
Regards,
Jerry
Quoted 49 lines
Alex
Quoted 46 lines
Signed-off-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 3 --- 2 files changed, 1 insertion(+), 6 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1
-3@@ -2566,8 +2566,6 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, {struct amdgpu_bo_param bp;struct amdgpu_bo *root; -const unsigned align =min (AMDGPU_VM_PTB_ALIGN_SIZE , -AMDGPU_VM_PTE_COUNT (adev) *8 );unsigned long size;uint64_t flags;int r, i;@@ -2615,7 +2613,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, size =amdgpu_vm_bo_size (adev, adev->vm_manager.root_level);memset (&bp,0 ,sizeof (bp)); bp.size = size; - bp.byte_align = align; + bp.byte_align =AMDGPU_GPU_PAGE_SIZE ; bp.domain =AMDGPU_GEM_DOMAIN_VRAM ; bp.flags = flags; bp.type = ttm_bo_type_kernel;drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +0
-4@@ -48,9 +48,6 @@ struct amdgpu_bo_list_entry;/* number of entries in page table */ #define AMDGPU_VM_PTE_COUNT (adev) (1 << (adev)->vm_manager.block_size) -/* PTBs (Page Table Blocks) need to be aligned to 32K */ -#define AMDGPU_VM_PTB_ALIGN_SIZE 32768 -#define AMDGPU_PTE_VALID (1ULL << 0)#define AMDGPU_PTE_SYSTEM (1ULL << 1)#define AMDGPU_PTE_SNOOPED (1ULL << 2) --2.17.1
Quoted 9 lines
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Am 22.08.2018 um 21:46 schrieb Alex Deucher:
Quoted 5 lines
Quoted 1 line · Christian König
Just another leftover from radeon.
I can't remember exactly what chip this was for. Are you sure this isn't still required for SI or something like that?
Actually as far as I know it is not required at all (even for Radeon).
We just added it as a precaution because the windows driver aligned everything to 32K at that time.
Christian.
Quoted 48 lines
Alex
Quoted 45 lines
Signed-off-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 3 --- 2 files changed, 1 insertion(+), 6 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1
-3@@ -2566,8 +2566,6 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, {struct amdgpu_bo_param bp;struct amdgpu_bo *root; -const unsigned align =min (AMDGPU_VM_PTB_ALIGN_SIZE , -AMDGPU_VM_PTE_COUNT (adev) *8 );unsigned long size;uint64_t flags;int r, i;@@ -2615,7 +2613,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, size =amdgpu_vm_bo_size (adev, adev->vm_manager.root_level);memset (&bp,0 ,sizeof (bp)); bp.size = size; - bp.byte_align = align; + bp.byte_align =AMDGPU_GPU_PAGE_SIZE ; bp.domain =AMDGPU_GEM_DOMAIN_VRAM ; bp.flags = flags; bp.type = ttm_bo_type_kernel;drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +0
-4@@ -48,9 +48,6 @@ struct amdgpu_bo_list_entry;/* number of entries in page table */ #define AMDGPU_VM_PTE_COUNT (adev) (1 << (adev)->vm_manager.block_size) -/* PTBs (Page Table Blocks) need to be aligned to 32K */ -#define AMDGPU_VM_PTB_ALIGN_SIZE 32768 -#define AMDGPU_PTE_VALID (1ULL << 0)#define AMDGPU_PTE_SYSTEM (1ULL << 1)#define AMDGPU_PTE_SNOOPED (1ULL << 2) --2.17.1
Quoted 4 lines
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Huang Rui
Acked-byQuoted 3 lines · Christian König
Just another leftover from radeon.
Signed-off-by Christian König <[email protected]>
Quoted 48 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 3 --- 2 files changed, 1 insertion(+), 6 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1
-3@@ -2566,8 +2566,6 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, {struct amdgpu_bo_param bp;struct amdgpu_bo *root; -const unsigned align =min (AMDGPU_VM_PTB_ALIGN_SIZE , -AMDGPU_VM_PTE_COUNT (adev) *8 );unsigned long size;uint64_t flags;int r, i;@@ -2615,7 +2613,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, size =amdgpu_vm_bo_size (adev, adev->vm_manager.root_level);memset (&bp,0 ,sizeof (bp)); bp.size = size; - bp.byte_align = align; + bp.byte_align =AMDGPU_GPU_PAGE_SIZE ; bp.domain =AMDGPU_GEM_DOMAIN_VRAM ; bp.flags = flags; bp.type = ttm_bo_type_kernel;drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +0
-3@@ -48,9 +48,6 @@ struct amdgpu_bo_list_entry;/* number of entries in page table */ #define AMDGPU_VM_PTE_COUNT (adev) (1 << (adev)->vm_manager.block_size) -/* PTBs (Page Table Blocks) need to be aligned to 32K */ -#define AMDGPU_VM_PTB_ALIGN_SIZE 32768 -#define AMDGPU_PTE_VALID (1ULL << 0)#define AMDGPU_PTE_SYSTEM (1ULL << 1)#define AMDGPU_PTE_SNOOPED (1ULL << 2)Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx