drm/amdgpu: add workarounds for VCN TMZ issue on CHIP_RAVEN
Subsystems (2)
PATCH v3 1/1 drm/amdgpu: add workarounds for VCN TMZ issue on CHIP_RAVEN
It is a hardware issue that VCN can't handle a GTT backing stored TMZ buffer on CHIP_RAVEN series ASIC.
Move such a TMZ buffer to VRAM domain before command submission as a wrokaround.
v2:
- Use patch_cs_in_place callback.
v3:
- Bail out early if unsecure IBs.
--- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 71 +++++++++++++++++++++++++++ 1 file changed, 71 insertions(+)
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +71 -0
@@ -24,6 +24,7 @@#include <linux/firmware.h> #include "amdgpu.h" +#include "amdgpu_cs.h" #include "amdgpu_vcn.h" #include "amdgpu_pm.h" #include "soc15.h"
@@ -1905,6 +1906,75 @@ static const struct amd_ip_funcs vcn_v1_0_ip_funcs = { .set_powergating_state = vcn_v1_0_set_powergating_state, }; +/* +* It is a hardware issue that VCN can't handle a GTT TMZ buffer on +* CHIP_RAVEN series ASIC. Move such a GTT TMZ buffer to VRAM domain +* before command submission as a workaround. +*/ +static int vcn_v1_0_validate_bo (struct amdgpu_cs_parser *parser, +struct amdgpu_job *job, +uint64_t addr) +{ +struct ttm_operation_ctx ctx = { false, false }; +struct amdgpu_fpriv *fpriv = parser->filp->driver_priv; +struct amdgpu_vm *vm = &fpriv->vm; +struct amdgpu_bo_va_mapping *mapping; +struct amdgpu_bo *bo; +int r; + + addr &=AMDGPU_GMC_HOLE_MASK ; +if (addr &0x7 ) { +DRM_ERROR ("VCN messages must be 8 byte aligned!\n" ); +return -EINVAL ; + } + + mapping =amdgpu_vm_bo_lookup_mapping (vm, addr/AMDGPU_GPU_PAGE_SIZE ); +if (!mapping || !mapping->bo_va || !mapping->bo_va->base.bo) +return -EINVAL ; + + bo = mapping->bo_va->base.bo; +if (!(bo->flags &AMDGPU_GEM_CREATE_ENCRYPTED )) +return 0 ; + +amdgpu_bo_placement_from_domain (bo,AMDGPU_GEM_DOMAIN_VRAM ); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx); +if (r) { +DRM_ERROR ("Failed validating the VCN message BO (%d)!\n" , r); +return r; + } + +return r; +} + +static int vcn_v1_0_ring_patch_cs_in_place (struct amdgpu_cs_parser *p, +struct amdgpu_job *job, +struct amdgpu_ib *ib) +{ +uint32_t msg_lo =0 , msg_hi =0 ; +int i, r; + +if (!(ib->flags &AMDGPU_IB_FLAGS_SECURE )) +return 0 ; + +for (i =0 ; i < ib->length_dw; i +=2 ) { +uint32_t reg =amdgpu_ib_get_value (ib, i); +uint32_t val =amdgpu_ib_get_value (ib, i +1 ); + +if (reg ==PACKET0 (p->adev->vcn.internal.data0,0 )) { + msg_lo = val; + }else if (reg ==PACKET0 (p->adev->vcn.internal.data1,0 )) { + msg_hi = val; + }else if (reg ==PACKET0 (p->adev->vcn.internal.cmd,0 )) { + r =vcn_v1_0_validate_bo (p, job, + ((u64 )msg_hi) <<32 | msg_lo); +if (r) +return r; + } + } + +return 0 ; +} +static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { .type =AMDGPU_RING_TYPE_VCN_DEC , .align_mask =0xf ,
@@ -1914,6 +1984,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { .get_rptr = vcn_v1_0_dec_ring_get_rptr, .get_wptr = vcn_v1_0_dec_ring_get_wptr, .set_wptr = vcn_v1_0_dec_ring_set_wptr, + .patch_cs_in_place = vcn_v1_0_ring_patch_cs_in_place, .emit_frame_size =6 +6 +/* hdp invalidate / flush */ SOC15_FLUSH_GPU_TLB_NUM_WREG * 6 +
Signature · 1 line
2.25.1
Am 14.03.22 um 03:45 schrieb Lang Yu:
Quoted 6 lines
It is a hardware issue that VCN can't handle a GTT backing stored TMZ buffer on
CHIP_RAVENseries ASIC.Move such a TMZ buffer to VRAM domain before command submission as a wrokaround.
Quoted 8 lines
v2:
- Usepatch_cs_in_placecallback.v3:
- Bail out early if unsecure IBs.Suggested-by Christian König <[email protected]>Signed-off-by Lang Yu <[email protected]>
But I would ask Leo to give his ok as well.
Thanks,
Christian.
Quoted 100 lines
--- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 71 +++++++++++++++++++++++++++ 1 file changed, 71 insertions(+)drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +71
-0@@ -24,6 +24,7 @@#include <linux/firmware.h> #include "amdgpu.h" +#include "amdgpu_cs.h" #include "amdgpu_vcn.h" #include "amdgpu_pm.h" #include "soc15.h" @@ -1905,6 +1906,75 @@ static const struct amd_ip_funcs vcn_v1_0_ip_funcs = { .set_powergating_state = vcn_v1_0_set_powergating_state, }; +/* +* It is a hardware issue that VCN can't handle a GTT TMZ buffer on +* CHIP_RAVEN series ASIC. Move such a GTT TMZ buffer to VRAM domain +* before command submission as a workaround. +*/ +static int vcn_v1_0_validate_bo (struct amdgpu_cs_parser *parser, +struct amdgpu_job *job, +uint64_t addr) +{ +struct ttm_operation_ctx ctx = { false, false }; +struct amdgpu_fpriv *fpriv = parser->filp->driver_priv; +struct amdgpu_vm *vm = &fpriv->vm; +struct amdgpu_bo_va_mapping *mapping; +struct amdgpu_bo *bo; +int r; + + addr &=AMDGPU_GMC_HOLE_MASK ; +if (addr &0x7 ) { +DRM_ERROR ("VCN messages must be 8 byte aligned!\n" ); +return -EINVAL ; + } + + mapping =amdgpu_vm_bo_lookup_mapping (vm, addr/AMDGPU_GPU_PAGE_SIZE ); +if (!mapping || !mapping->bo_va || !mapping->bo_va->base.bo) +return -EINVAL ; + + bo = mapping->bo_va->base.bo; +if (!(bo->flags &AMDGPU_GEM_CREATE_ENCRYPTED )) +return 0 ; + +amdgpu_bo_placement_from_domain (bo,AMDGPU_GEM_DOMAIN_VRAM ); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx); +if (r) { +DRM_ERROR ("Failed validating the VCN message BO (%d)!\n" , r); +return r; + } + +return r; +} + +static int vcn_v1_0_ring_patch_cs_in_place (struct amdgpu_cs_parser *p, +struct amdgpu_job *job, +struct amdgpu_ib *ib) +{ +uint32_t msg_lo =0 , msg_hi =0 ; +int i, r; + +if (!(ib->flags &AMDGPU_IB_FLAGS_SECURE )) +return 0 ; + +for (i =0 ; i < ib->length_dw; i +=2 ) { +uint32_t reg =amdgpu_ib_get_value (ib, i); +uint32_t val =amdgpu_ib_get_value (ib, i +1 ); + +if (reg ==PACKET0 (p->adev->vcn.internal.data0,0 )) { + msg_lo = val; + }else if (reg ==PACKET0 (p->adev->vcn.internal.data1,0 )) { + msg_hi = val; + }else if (reg ==PACKET0 (p->adev->vcn.internal.cmd,0 )) { + r =vcn_v1_0_validate_bo (p, job, + ((u64 )msg_hi) <<32 | msg_lo); +if (r) +return r; + } + } + +return 0 ; +} +static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { .type =AMDGPU_RING_TYPE_VCN_DEC , .align_mask =0xf ,@@ -1914,6 +1984,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { .get_rptr = vcn_v1_0_dec_ring_get_rptr, .get_wptr = vcn_v1_0_dec_ring_get_wptr, .set_wptr = vcn_v1_0_dec_ring_set_wptr, + .patch_cs_in_place = vcn_v1_0_ring_patch_cs_in_place, .emit_frame_size =6 +6 +/* hdp invalidate / flush */ SOC15_FLUSH_GPU_TLB_NUM_WREG * 6 +
Quoted 13 lines · Christian König
Am 14.03.22 um 03:45 schrieb Lang Yu:
Quoted 12 lines
It is a hardware issue that VCN can't handle a GTT backing stored TMZ buffer on
CHIP_RAVENseries ASIC.Move such a TMZ buffer to VRAM domain before command submission as a wrokaround.
v2:
- Usepatch_cs_in_placecallback.v3:
- Bail out early if unsecure IBs.
Quoted 6 lines
Quoted 2 lines
Suggested-by Christian König <[email protected]>Signed-off-by Lang Yu <[email protected]>Reviewed-by Christian König <[email protected]>But I would ask Leo to give his ok as well.
Hi Leo,
Do you have any commnets on this? Thanks.
Regards,
Lang
Quoted 102 lines
Thanks,
Christian.Quoted 98 lines
--- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 71 +++++++++++++++++++++++++++ 1 file changed, 71 insertions(+)drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +71
-0@@ -24,6 +24,7 @@#include <linux/firmware.h> #include "amdgpu.h" +#include "amdgpu_cs.h" #include "amdgpu_vcn.h" #include "amdgpu_pm.h" #include "soc15.h" @@ -1905,6 +1906,75 @@ static const struct amd_ip_funcs vcn_v1_0_ip_funcs = { .set_powergating_state = vcn_v1_0_set_powergating_state, }; +/* +* It is a hardware issue that VCN can't handle a GTT TMZ buffer on +* CHIP_RAVEN series ASIC. Move such a GTT TMZ buffer to VRAM domain +* before command submission as a workaround. +*/ +static int vcn_v1_0_validate_bo (struct amdgpu_cs_parser *parser, +struct amdgpu_job *job, +uint64_t addr) +{ +struct ttm_operation_ctx ctx = { false, false }; +struct amdgpu_fpriv *fpriv = parser->filp->driver_priv; +struct amdgpu_vm *vm = &fpriv->vm; +struct amdgpu_bo_va_mapping *mapping; +struct amdgpu_bo *bo; +int r; + + addr &=AMDGPU_GMC_HOLE_MASK ; +if (addr &0x7 ) { +DRM_ERROR ("VCN messages must be 8 byte aligned!\n" ); +return -EINVAL ; + } + + mapping =amdgpu_vm_bo_lookup_mapping (vm, addr/AMDGPU_GPU_PAGE_SIZE ); +if (!mapping || !mapping->bo_va || !mapping->bo_va->base.bo) +return -EINVAL ; + + bo = mapping->bo_va->base.bo; +if (!(bo->flags &AMDGPU_GEM_CREATE_ENCRYPTED )) +return 0 ; + +amdgpu_bo_placement_from_domain (bo,AMDGPU_GEM_DOMAIN_VRAM ); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx); +if (r) { +DRM_ERROR ("Failed validating the VCN message BO (%d)!\n" , r); +return r; + } + +return r; +} + +static int vcn_v1_0_ring_patch_cs_in_place (struct amdgpu_cs_parser *p, +struct amdgpu_job *job, +struct amdgpu_ib *ib) +{ +uint32_t msg_lo =0 , msg_hi =0 ; +int i, r; + +if (!(ib->flags &AMDGPU_IB_FLAGS_SECURE )) +return 0 ; + +for (i =0 ; i < ib->length_dw; i +=2 ) { +uint32_t reg =amdgpu_ib_get_value (ib, i); +uint32_t val =amdgpu_ib_get_value (ib, i +1 ); + +if (reg ==PACKET0 (p->adev->vcn.internal.data0,0 )) { + msg_lo = val; + }else if (reg ==PACKET0 (p->adev->vcn.internal.data1,0 )) { + msg_hi = val; + }else if (reg ==PACKET0 (p->adev->vcn.internal.cmd,0 )) { + r =vcn_v1_0_validate_bo (p, job, + ((u64 )msg_hi) <<32 | msg_lo); +if (r) +return r; + } + } + +return 0 ; +} +static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { .type =AMDGPU_RING_TYPE_VCN_DEC , .align_mask =0xf ,@@ -1914,6 +1984,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { .get_rptr = vcn_v1_0_dec_ring_get_rptr, .get_wptr = vcn_v1_0_dec_ring_get_wptr, .set_wptr = vcn_v1_0_dec_ring_set_wptr, + .patch_cs_in_place = vcn_v1_0_ring_patch_cs_in_place, .emit_frame_size =6 +6 +/* hdp invalidate / flush */ SOC15_FLUSH_GPU_TLB_NUM_WREG * 6 +
Dear Lang,
Am 14.03.22 um 03:45 schrieb Lang Yu:
Thank you for your patch. A shorter commit message summary would be:
Quoted 4 lines
drm/amdgpu: Work around VNC TMZ issue on
CHIP_RAVENIt is a hardware issue that VCN can't handle a GTT backing stored TMZ buffer on
CHIP_RAVENseries ASIC.
Where is that documented, and how can this be reproduced?
Quoted 2 lines
Move such a TMZ buffer to VRAM domain before command submission as a wrokaround.
workaround
Please use a text width of 75 characters per line.
Quoted 52 lines
v2:
- Usepatch_cs_in_placecallback.v3:
- Bail out early if unsecure IBs.Suggested-by Christian König <[email protected]>Signed-off-by Lang Yu <[email protected]>--- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 71 +++++++++++++++++++++++++++ 1 file changed, 71 insertions(+)drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +25
-0@@ -24,6 +24,7 @@#include <linux/firmware.h> #include "amdgpu.h" +#include "amdgpu_cs.h" #include "amdgpu_vcn.h" #include "amdgpu_pm.h" #include "soc15.h" @@ -1905,6 +1906,75 @@ static const struct amd_ip_funcs vcn_v1_0_ip_funcs = { .set_powergating_state = vcn_v1_0_set_powergating_state, }; +/* +* It is a hardware issue that VCN can't handle a GTT TMZ buffer on +* CHIP_RAVEN series ASIC. Move such a GTT TMZ buffer to VRAM domain +* before command submission as a workaround. +*/ +static int vcn_v1_0_validate_bo (struct amdgpu_cs_parser *parser, +struct amdgpu_job *job, +uint64_t addr) +{ +struct ttm_operation_ctx ctx = { false, false }; +struct amdgpu_fpriv *fpriv = parser->filp->driver_priv; +struct amdgpu_vm *vm = &fpriv->vm; +struct amdgpu_bo_va_mapping *mapping; +struct amdgpu_bo *bo; +int r; + + addr &=AMDGPU_GMC_HOLE_MASK ; +if (addr &0x7 ) { +DRM_ERROR ("VCN messages must be 8 byte aligned!\n" ); +return -EINVAL ; + } + + mapping =amdgpu_vm_bo_lookup_mapping (vm, addr/AMDGPU_GPU_PAGE_SIZE ); +if (!mapping || !mapping->bo_va || !mapping->bo_va->base.bo)
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c static const struct amd_ip_funcs vcn_v1_0_ip_funcs = { · line 1942
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +10
-0+return -EINVAL ; + + bo = mapping->bo_va->base.bo; +if (!(bo->flags &AMDGPU_GEM_CREATE_ENCRYPTED )) +return 0 ; + +amdgpu_bo_placement_from_domain (bo,AMDGPU_GEM_DOMAIN_VRAM ); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx); +if (r) { +DRM_ERROR ("Failed validating the VCN message BO (%d)!\n" , r);
to validate
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c static const struct amd_ip_funcs vcn_v1_0_ip_funcs = { · line 1954
Quoted 12 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +12
-0+return r; + } + +return r; +} + +static int vcn_v1_0_ring_patch_cs_in_place (struct amdgpu_cs_parser *p, +struct amdgpu_job *job, +struct amdgpu_ib *ib) +{ +uint32_t msg_lo =0 , msg_hi =0 ; +int i, r;
Use unsigned int for the counter variable?
Quoted 27 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +23
-0+ +if (!(ib->flags &AMDGPU_IB_FLAGS_SECURE )) +return 0 ; + +for (i =0 ; i < ib->length_dw; i +=2 ) { +uint32_t reg =amdgpu_ib_get_value (ib, i); +uint32_t val =amdgpu_ib_get_value (ib, i +1 ); + +if (reg ==PACKET0 (p->adev->vcn.internal.data0,0 )) { + msg_lo = val; + }else if (reg ==PACKET0 (p->adev->vcn.internal.data1,0 )) { + msg_hi = val; + }else if (reg ==PACKET0 (p->adev->vcn.internal.cmd,0 )) { + r =vcn_v1_0_validate_bo (p, job, + ((u64 )msg_hi) <<32 | msg_lo); +if (r) +return r; + } + } + +return 0 ; +} +static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { .type =AMDGPU_RING_TYPE_VCN_DEC , .align_mask =0xf ,
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { · line 1990
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +1
-0@@ -1914,6 +1984,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { .get_rptr = vcn_v1_0_dec_ring_get_rptr, .get_wptr = vcn_v1_0_dec_ring_get_wptr, .set_wptr = vcn_v1_0_dec_ring_set_wptr, + .patch_cs_in_place = vcn_v1_0_ring_patch_cs_in_place, .emit_frame_size =6 +6 +/* hdp invalidate / flush */ SOC15_FLUSH_GPU_TLB_NUM_WREG * 6 +
Kind regards,
Paul
Quoted 5 lines · Paul Menzel
Dear Lang,
Am 14.03.22 um 03:45 schrieb Lang Yu:
Quoted 8 lines
Thank you for your patch. A shorter commit message summary would be:
Quoted 4 lines
drm/amdgpu: Work around VNC TMZ issue on
CHIP_RAVENIt is a hardware issue that VCN can't handle a GTT backing stored TMZ buffer on
CHIP_RAVENseries ASIC.Where is that documented, and how can this be reproduced?
It is documented in AMD internal Confluence and JIRA. Secure playback with a low VRAM config(thus TMZ buffer will be allocted in GTT domain) may reproduce this issue.
Quoted 6 lines
Quoted 2 lines
Move such a TMZ buffer to VRAM domain before command submission as a wrokaround.
workaround
Please use a text width of 75 characters per line.
Thanks for your comments. I will take care about this.
Quoted 63 lines
Quoted 50 lines
v2:
- Usepatch_cs_in_placecallback.v3:
- Bail out early if unsecure IBs.Suggested-by Christian König <[email protected]>Signed-off-by Lang Yu <[email protected]>--- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 71 +++++++++++++++++++++++++++ 1 file changed, 71 insertions(+)drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +25
-0@@ -24,6 +24,7 @@#include <linux/firmware.h> #include "amdgpu.h" +#include "amdgpu_cs.h" #include "amdgpu_vcn.h" #include "amdgpu_pm.h" #include "soc15.h" @@ -1905,6 +1906,75 @@ static const struct amd_ip_funcs vcn_v1_0_ip_funcs = { .set_powergating_state = vcn_v1_0_set_powergating_state, }; +/* +* It is a hardware issue that VCN can't handle a GTT TMZ buffer on +* CHIP_RAVEN series ASIC. Move such a GTT TMZ buffer to VRAM domain +* before command submission as a workaround. +*/ +static int vcn_v1_0_validate_bo (struct amdgpu_cs_parser *parser, +struct amdgpu_job *job, +uint64_t addr) +{ +struct ttm_operation_ctx ctx = { false, false }; +struct amdgpu_fpriv *fpriv = parser->filp->driver_priv; +struct amdgpu_vm *vm = &fpriv->vm; +struct amdgpu_bo_va_mapping *mapping; +struct amdgpu_bo *bo; +int r; + + addr &=AMDGPU_GMC_HOLE_MASK ; +if (addr &0x7 ) { +DRM_ERROR ("VCN messages must be 8 byte aligned!\n" ); +return -EINVAL ; + } + + mapping =amdgpu_vm_bo_lookup_mapping (vm, addr/AMDGPU_GPU_PAGE_SIZE ); +if (!mapping || !mapping->bo_va || !mapping->bo_va->base.bo)drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c static const struct amd_ip_funcs vcn_v1_0_ip_funcs = { · line 1941
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +10
-0+return -EINVAL ; + + bo = mapping->bo_va->base.bo; +if (!(bo->flags &AMDGPU_GEM_CREATE_ENCRYPTED )) +return 0 ; + +amdgpu_bo_placement_from_domain (bo,AMDGPU_GEM_DOMAIN_VRAM ); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx); +if (r) { +DRM_ERROR ("Failed validating the VCN message BO (%d)!\n" , r);to validate
Quoted 14 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c static const struct amd_ip_funcs vcn_v1_0_ip_funcs = { · line 1954
Quoted 12 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +12
-0+return r; + } + +return r; +} + +static int vcn_v1_0_ring_patch_cs_in_place (struct amdgpu_cs_parser *p, +struct amdgpu_job *job, +struct amdgpu_ib *ib) +{ +uint32_t msg_lo =0 , msg_hi =0 ; +int i, r;Use unsigned int for the counter variable?
You can see both signed and unsigned are used in kernel. (e.g., mm/page_alloc.c).
For this case, I think it makes no difference.
In a word, we should consider the specific context.
Regards,
Lang
Quoted 39 lines
Quoted 27 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +23
-0+ +if (!(ib->flags &AMDGPU_IB_FLAGS_SECURE )) +return 0 ; + +for (i =0 ; i < ib->length_dw; i +=2 ) { +uint32_t reg =amdgpu_ib_get_value (ib, i); +uint32_t val =amdgpu_ib_get_value (ib, i +1 ); + +if (reg ==PACKET0 (p->adev->vcn.internal.data0,0 )) { + msg_lo = val; + }else if (reg ==PACKET0 (p->adev->vcn.internal.data1,0 )) { + msg_hi = val; + }else if (reg ==PACKET0 (p->adev->vcn.internal.cmd,0 )) { + r =vcn_v1_0_validate_bo (p, job, + ((u64 )msg_hi) <<32 | msg_lo); +if (r) +return r; + } + } + +return 0 ; +} +static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { .type =AMDGPU_RING_TYPE_VCN_DEC , .align_mask =0xf ,drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { · line 1990
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +1
-0@@ -1914,6 +1984,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { .get_rptr = vcn_v1_0_dec_ring_get_rptr, .get_wptr = vcn_v1_0_dec_ring_get_wptr, .set_wptr = vcn_v1_0_dec_ring_set_wptr, + .patch_cs_in_place = vcn_v1_0_ring_patch_cs_in_place, .emit_frame_size =6 +6 +/* hdp invalidate / flush */ SOC15_FLUSH_GPU_TLB_NUM_WREG * 6 +Kind regards,
Paul
Dear Lang,
Am 16.03.22 um 02:27 schrieb Lang Yu:
Quoted 8 lines · Paul Menzel
Quoted 7 lines
Am 14.03.22 um 03:45 schrieb Lang Yu:
Thank you for your patch. A shorter commit message summary would be:
Quoted 1 line
drm/amdgpu: Work around VNC TMZ issue on
CHIP_RAVEN
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
It is a hardware issue that VCN can't handle a GTT backing stored TMZ buffer on
CHIP_RAVENseries ASIC.Where is that documented, and how can this be reproduced?
It is documented in AMD internal Confluence and JIRA. Secure playback with a low VRAM config(thus TMZ buffer will be allocted in GTT domain) may reproduce this issue.
It’d be great if as much of the details from this non-publicly accessible information could be added to the commit message, and a way to reproduce this as there does not seem to be a test for this. (Also I guess a tag with a reference to the internal issue would be acceptable, so in case more question surface in the future.)
Quoted 87 lines
Quoted 6 lines
Quoted 2 lines
Move such a TMZ buffer to VRAM domain before command submission as a wrokaround.
workaround
Please use a text width of 75 characters per line.
Thanks for your comments. I will take care about this.
Quoted 63 lines
Quoted 50 lines
v2:
- Usepatch_cs_in_placecallback.v3:
- Bail out early if unsecure IBs.Suggested-by Christian König <[email protected]>Signed-off-by Lang Yu <[email protected]>--- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 71 +++++++++++++++++++++++++++ 1 file changed, 71 insertions(+)drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +25
-0@@ -24,6 +24,7 @@#include <linux/firmware.h> #include "amdgpu.h" +#include "amdgpu_cs.h" #include "amdgpu_vcn.h" #include "amdgpu_pm.h" #include "soc15.h" @@ -1905,6 +1906,75 @@ static const struct amd_ip_funcs vcn_v1_0_ip_funcs = { .set_powergating_state = vcn_v1_0_set_powergating_state, }; +/* +* It is a hardware issue that VCN can't handle a GTT TMZ buffer on +* CHIP_RAVEN series ASIC. Move such a GTT TMZ buffer to VRAM domain +* before command submission as a workaround. +*/ +static int vcn_v1_0_validate_bo (struct amdgpu_cs_parser *parser, +struct amdgpu_job *job, +uint64_t addr) +{ +struct ttm_operation_ctx ctx = { false, false }; +struct amdgpu_fpriv *fpriv = parser->filp->driver_priv; +struct amdgpu_vm *vm = &fpriv->vm; +struct amdgpu_bo_va_mapping *mapping; +struct amdgpu_bo *bo; +int r; + + addr &=AMDGPU_GMC_HOLE_MASK ; +if (addr &0x7 ) { +DRM_ERROR ("VCN messages must be 8 byte aligned!\n" ); +return -EINVAL ; + } + + mapping =amdgpu_vm_bo_lookup_mapping (vm, addr/AMDGPU_GPU_PAGE_SIZE ); +if (!mapping || !mapping->bo_va || !mapping->bo_va->base.bo)drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c static const struct amd_ip_funcs vcn_v1_0_ip_funcs = { · line 1941
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +10
-0+return -EINVAL ; + + bo = mapping->bo_va->base.bo; +if (!(bo->flags &AMDGPU_GEM_CREATE_ENCRYPTED )) +return 0 ; + +amdgpu_bo_placement_from_domain (bo,AMDGPU_GEM_DOMAIN_VRAM ); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx); +if (r) { +DRM_ERROR ("Failed validating the VCN message BO (%d)!\n" , r);to validate
Quoted 14 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c static const struct amd_ip_funcs vcn_v1_0_ip_funcs = { · line 1954
Quoted 12 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +12
-0+return r; + } + +return r; +} + +static int vcn_v1_0_ring_patch_cs_in_place (struct amdgpu_cs_parser *p, +struct amdgpu_job *job, +struct amdgpu_ib *ib) +{ +uint32_t msg_lo =0 , msg_hi =0 ; +int i, r;Use unsigned int for the counter variable?
Quoted 6 lines
You can see both signed and unsigned are used in kernel. (e.g.,
mm/page_alloc.c).For this case, I think it makes no difference.
In a word, we should consider the specific context.
Although it makes technically no difference, I prefer to use the best matching type to convey the intention of the variable to the reader. But you are right, there is no hard rule for it.
Kind regards,
Paul
Quoted 39 lines
Quoted 39 lines
Quoted 27 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +23
-0+ +if (!(ib->flags &AMDGPU_IB_FLAGS_SECURE )) +return 0 ; + +for (i =0 ; i < ib->length_dw; i +=2 ) { +uint32_t reg =amdgpu_ib_get_value (ib, i); +uint32_t val =amdgpu_ib_get_value (ib, i +1 ); + +if (reg ==PACKET0 (p->adev->vcn.internal.data0,0 )) { + msg_lo = val; + }else if (reg ==PACKET0 (p->adev->vcn.internal.data1,0 )) { + msg_hi = val; + }else if (reg ==PACKET0 (p->adev->vcn.internal.cmd,0 )) { + r =vcn_v1_0_validate_bo (p, job, + ((u64 )msg_hi) <<32 | msg_lo); +if (r) +return r; + } + } + +return 0 ; +} +static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { .type =AMDGPU_RING_TYPE_VCN_DEC , .align_mask =0xf ,drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { · line 1990
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +1
-0@@ -1914,6 +1984,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { .get_rptr = vcn_v1_0_dec_ring_get_rptr, .get_wptr = vcn_v1_0_dec_ring_get_wptr, .set_wptr = vcn_v1_0_dec_ring_set_wptr, + .patch_cs_in_place = vcn_v1_0_ring_patch_cs_in_place, .emit_frame_size =6 +6 +/* hdp invalidate / flush */ SOC15_FLUSH_GPU_TLB_NUM_WREG * 6 +Kind regards,
Paul
Quoted 21 lines · Paul Menzel
Dear Lang,
Am 16.03.22 um 02:27 schrieb Lang Yu:
Quoted 8 lines · Paul Menzel
Quoted 7 lines
Am 14.03.22 um 03:45 schrieb Lang Yu:
Thank you for your patch. A shorter commit message summary would be:
Quoted 1 line
drm/amdgpu: Work around VNC TMZ issue on
CHIP_RAVENQuoted 8 lines
Quoted 4 lines
Quoted 2 lines
It is a hardware issue that VCN can't handle a GTT backing stored TMZ buffer on
CHIP_RAVENseries ASIC.Where is that documented, and how can this be reproduced?
It is documented in AMD internal Confluence and JIRA. Secure playback with a low VRAM config(thus TMZ buffer will be allocted in GTT domain) may reproduce this issue.
Quoted 5 lines
It’d be great if as much of the details from this non-publicly accessible information could be added to the commit message, and a way to reproduce this as there does not seem to be a test for this. (Also I guess a tag with a reference to the internal issue would be acceptable, so in case more question surface in the future.)
Thanks. I will add an internal link.
Regards,
Lang
Quoted 142 lines
Quoted 87 lines
Quoted 6 lines
Quoted 2 lines
Move such a TMZ buffer to VRAM domain before command submission as a wrokaround.
workaround
Please use a text width of 75 characters per line.
Thanks for your comments. I will take care about this.
Quoted 63 lines
Quoted 50 lines
v2:
- Usepatch_cs_in_placecallback.v3:
- Bail out early if unsecure IBs.Suggested-by Christian König <[email protected]>Signed-off-by Lang Yu <[email protected]>--- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 71 +++++++++++++++++++++++++++ 1 file changed, 71 insertions(+)drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +25
-0@@ -24,6 +24,7 @@#include <linux/firmware.h> #include "amdgpu.h" +#include "amdgpu_cs.h" #include "amdgpu_vcn.h" #include "amdgpu_pm.h" #include "soc15.h" @@ -1905,6 +1906,75 @@ static const struct amd_ip_funcs vcn_v1_0_ip_funcs = { .set_powergating_state = vcn_v1_0_set_powergating_state, }; +/* +* It is a hardware issue that VCN can't handle a GTT TMZ buffer on +* CHIP_RAVEN series ASIC. Move such a GTT TMZ buffer to VRAM domain +* before command submission as a workaround. +*/ +static int vcn_v1_0_validate_bo (struct amdgpu_cs_parser *parser, +struct amdgpu_job *job, +uint64_t addr) +{ +struct ttm_operation_ctx ctx = { false, false }; +struct amdgpu_fpriv *fpriv = parser->filp->driver_priv; +struct amdgpu_vm *vm = &fpriv->vm; +struct amdgpu_bo_va_mapping *mapping; +struct amdgpu_bo *bo; +int r; + + addr &=AMDGPU_GMC_HOLE_MASK ; +if (addr &0x7 ) { +DRM_ERROR ("VCN messages must be 8 byte aligned!\n" ); +return -EINVAL ; + } + + mapping =amdgpu_vm_bo_lookup_mapping (vm, addr/AMDGPU_GPU_PAGE_SIZE ); +if (!mapping || !mapping->bo_va || !mapping->bo_va->base.bo)drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c static const struct amd_ip_funcs vcn_v1_0_ip_funcs = { · line 1941
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +10
-0+return -EINVAL ; + + bo = mapping->bo_va->base.bo; +if (!(bo->flags &AMDGPU_GEM_CREATE_ENCRYPTED )) +return 0 ; + +amdgpu_bo_placement_from_domain (bo,AMDGPU_GEM_DOMAIN_VRAM ); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx); +if (r) { +DRM_ERROR ("Failed validating the VCN message BO (%d)!\n" , r);to validate
Quoted 14 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c static const struct amd_ip_funcs vcn_v1_0_ip_funcs = { · line 1954
Quoted 12 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +12
-0+return r; + } + +return r; +} + +static int vcn_v1_0_ring_patch_cs_in_place (struct amdgpu_cs_parser *p, +struct amdgpu_job *job, +struct amdgpu_ib *ib) +{ +uint32_t msg_lo =0 , msg_hi =0 ; +int i, r;Use unsigned int for the counter variable?
Quoted 6 lines
You can see both signed and unsigned are used in kernel. (e.g.,
mm/page_alloc.c).For this case, I think it makes no difference.
In a word, we should consider the specific context.
Although it makes technically no difference, I prefer to use the best matching type to convey the intention of the variable to the reader. But you are right, there is no hard rule for it.
Kind regards,
Paul
Quoted 39 lines
Quoted 39 lines
Quoted 27 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +23
-0+ +if (!(ib->flags &AMDGPU_IB_FLAGS_SECURE )) +return 0 ; + +for (i =0 ; i < ib->length_dw; i +=2 ) { +uint32_t reg =amdgpu_ib_get_value (ib, i); +uint32_t val =amdgpu_ib_get_value (ib, i +1 ); + +if (reg ==PACKET0 (p->adev->vcn.internal.data0,0 )) { + msg_lo = val; + }else if (reg ==PACKET0 (p->adev->vcn.internal.data1,0 )) { + msg_hi = val; + }else if (reg ==PACKET0 (p->adev->vcn.internal.cmd,0 )) { + r =vcn_v1_0_validate_bo (p, job, + ((u64 )msg_hi) <<32 | msg_lo); +if (r) +return r; + } + } + +return 0 ; +} +static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { .type =AMDGPU_RING_TYPE_VCN_DEC , .align_mask =0xf ,drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { · line 1990
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +1
-0@@ -1914,6 +1984,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { .get_rptr = vcn_v1_0_dec_ring_get_rptr, .get_wptr = vcn_v1_0_dec_ring_get_wptr, .set_wptr = vcn_v1_0_dec_ring_set_wptr, + .patch_cs_in_place = vcn_v1_0_ring_patch_cs_in_place, .emit_frame_size =6 +6 +/* hdp invalidate / flush */ SOC15_FLUSH_GPU_TLB_NUM_WREG * 6 +Kind regards,
Paul
Am 16.03.22 um 07:21 schrieb Lang Yu:
Quoted 17 lines · Paul Menzel
Quoted 16 lines
Dear Lang,
Am 16.03.22 um 02:27 schrieb Lang Yu:
Quoted 12 lines · Paul Menzel
Quoted 8 lines
Am 14.03.22 um 03:45 schrieb Lang Yu:
Thank you for your patch. A shorter commit message summary would be:
Quoted 3 lines
drm/amdgpu: Work around VNC TMZ issue on
CHIP_RAVENIt is a hardware issue that VCN can't handle a GTT backing stored TMZ buffer onCHIP_RAVENseries ASIC.Where is that documented, and how can this be reproduced?
It is documented in AMD internal Confluence and JIRA. Secure playback with a low VRAM config(thus TMZ buffer will be allocted in GTT domain) may reproduce this issue.
Quoted 6 lines
Quoted 5 lines
It’d be great if as much of the details from this non-publicly accessible information could be added to the commit message, and a way to reproduce this as there does not seem to be a test for this. (Also I guess a tag with a reference to the internal issue would be acceptable, so in case more question surface in the future.)
Thanks. I will add an internal link.
Lang, please don't!
This isn't an information which is expected to be made public.
Regards,
Christian.
Quoted 139 lines
Regards,
LangQuoted 135 lines
Quoted 82 lines
Quoted 5 lines
Quoted 2 lines
Move such a TMZ buffer to VRAM domain before command submission as a wrokaround.
workaround
Please use a text width of 75 characters per line.
Thanks for your comments. I will take care about this.
Quoted 62 lines
Quoted 50 lines
v2:
- Usepatch_cs_in_placecallback.v3:
- Bail out early if unsecure IBs.Suggested-by Christian König <[email protected]>Signed-off-by Lang Yu <[email protected]>--- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 71 +++++++++++++++++++++++++++ 1 file changed, 71 insertions(+)drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +25
-0@@ -24,6 +24,7 @@#include <linux/firmware.h> #include "amdgpu.h" +#include "amdgpu_cs.h" #include "amdgpu_vcn.h" #include "amdgpu_pm.h" #include "soc15.h" @@ -1905,6 +1906,75 @@ static const struct amd_ip_funcs vcn_v1_0_ip_funcs = { .set_powergating_state = vcn_v1_0_set_powergating_state, }; +/* +* It is a hardware issue that VCN can't handle a GTT TMZ buffer on +* CHIP_RAVEN series ASIC. Move such a GTT TMZ buffer to VRAM domain +* before command submission as a workaround. +*/ +static int vcn_v1_0_validate_bo (struct amdgpu_cs_parser *parser, +struct amdgpu_job *job, +uint64_t addr) +{ +struct ttm_operation_ctx ctx = { false, false }; +struct amdgpu_fpriv *fpriv = parser->filp->driver_priv; +struct amdgpu_vm *vm = &fpriv->vm; +struct amdgpu_bo_va_mapping *mapping; +struct amdgpu_bo *bo; +int r; + + addr &=AMDGPU_GMC_HOLE_MASK ; +if (addr &0x7 ) { +DRM_ERROR ("VCN messages must be 8 byte aligned!\n" ); +return -EINVAL ; + } + + mapping =amdgpu_vm_bo_lookup_mapping (vm, addr/AMDGPU_GPU_PAGE_SIZE ); +if (!mapping || !mapping->bo_va || !mapping->bo_va->base.bo)drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c static const struct amd_ip_funcs vcn_v1_0_ip_funcs = { · line 1941
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +10
-0+return -EINVAL ; + + bo = mapping->bo_va->base.bo; +if (!(bo->flags &AMDGPU_GEM_CREATE_ENCRYPTED )) +return 0 ; + +amdgpu_bo_placement_from_domain (bo,AMDGPU_GEM_DOMAIN_VRAM ); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx); +if (r) { +DRM_ERROR ("Failed validating the VCN message BO (%d)!\n" , r);to validate
Quoted 13 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c static const struct amd_ip_funcs vcn_v1_0_ip_funcs = { · line 1954
Quoted 12 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +12
-0+return r; + } + +return r; +} + +static int vcn_v1_0_ring_patch_cs_in_place (struct amdgpu_cs_parser *p, +struct amdgpu_job *job, +struct amdgpu_ib *ib) +{ +uint32_t msg_lo =0 , msg_hi =0 ; +int i, r;Use unsigned int for the counter variable?
Quoted 6 lines
You can see both signed and unsigned are used in kernel. (e.g.,
mm/page_alloc.c).For this case, I think it makes no difference.
In a word, we should consider the specific context.
Although it makes technically no difference, I prefer to use the best matching type to convey the intention of the variable to the reader. But you are right, there is no hard rule for it.
Kind regards,
Paul
Quoted 38 lines
Quoted 38 lines
Quoted 27 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +23
-0+ +if (!(ib->flags &AMDGPU_IB_FLAGS_SECURE )) +return 0 ; + +for (i =0 ; i < ib->length_dw; i +=2 ) { +uint32_t reg =amdgpu_ib_get_value (ib, i); +uint32_t val =amdgpu_ib_get_value (ib, i +1 ); + +if (reg ==PACKET0 (p->adev->vcn.internal.data0,0 )) { + msg_lo = val; + }else if (reg ==PACKET0 (p->adev->vcn.internal.data1,0 )) { + msg_hi = val; + }else if (reg ==PACKET0 (p->adev->vcn.internal.cmd,0 )) { + r =vcn_v1_0_validate_bo (p, job, + ((u64 )msg_hi) <<32 | msg_lo); +if (r) +return r; + } + } + +return 0 ; +} +static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { .type =AMDGPU_RING_TYPE_VCN_DEC , .align_mask =0xf ,drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { · line 1990
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +1
-0@@ -1914,6 +1984,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { .get_rptr = vcn_v1_0_dec_ring_get_rptr, .get_wptr = vcn_v1_0_dec_ring_get_wptr, .set_wptr = vcn_v1_0_dec_ring_set_wptr, + .patch_cs_in_place = vcn_v1_0_ring_patch_cs_in_place, .emit_frame_size =6 +6 +/* hdp invalidate / flush */ SOC15_FLUSH_GPU_TLB_NUM_WREG * 6 +Kind regards,
Paul
Quoted 23 lines · Christian König
Am 16.03.22 um 07:21 schrieb Lang Yu:
Quoted 22 lines · Paul Menzel
Quoted 21 lines
Dear Lang,
Am 16.03.22 um 02:27 schrieb Lang Yu:
Quoted 5 lines · Paul Menzel
Quoted 4 lines
Am 14.03.22 um 03:45 schrieb Lang Yu:
Thank you for your patch. A shorter commit message summary would be:
Quoted 7 lines
Quoted 4 lines
Quoted 3 lines
drm/amdgpu: Work around VNC TMZ issue on
CHIP_RAVENIt is a hardware issue that VCN can't handle a GTT backing stored TMZ buffer onCHIP_RAVENseries ASIC.Where is that documented, and how can this be reproduced?
It is documented in AMD internal Confluence and JIRA. Secure playback with a low VRAM config(thus TMZ buffer will be allocted in GTT domain) may reproduce this issue.
It’d be great if as much of the details from this non-publicly accessible information could be added to the commit message, and a way to reproduce this as there does not seem to be a test for this. (Also I guess a tag with a reference to the internal issue would be acceptable, so in case more question surface in the future.)
Quoted 5 lines
Quoted 1 line
Thanks. I will add an internal link.
Lang, please don't!
This isn't an information which is expected to be made public.
Okay, got it.
Regards,
Lang
Quoted 143 lines
Regards,
Christian.Quoted 139 lines
Regards,
LangQuoted 135 lines
Quoted 82 lines
Quoted 5 lines
Quoted 2 lines
Move such a TMZ buffer to VRAM domain before command submission as a wrokaround.
workaround
Please use a text width of 75 characters per line.
Thanks for your comments. I will take care about this.
Quoted 62 lines
Quoted 50 lines
v2:
- Usepatch_cs_in_placecallback.v3:
- Bail out early if unsecure IBs.Suggested-by Christian König <[email protected]>Signed-off-by Lang Yu <[email protected]>--- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 71 +++++++++++++++++++++++++++ 1 file changed, 71 insertions(+)drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +25
-0@@ -24,6 +24,7 @@#include <linux/firmware.h> #include "amdgpu.h" +#include "amdgpu_cs.h" #include "amdgpu_vcn.h" #include "amdgpu_pm.h" #include "soc15.h" @@ -1905,6 +1906,75 @@ static const struct amd_ip_funcs vcn_v1_0_ip_funcs = { .set_powergating_state = vcn_v1_0_set_powergating_state, }; +/* +* It is a hardware issue that VCN can't handle a GTT TMZ buffer on +* CHIP_RAVEN series ASIC. Move such a GTT TMZ buffer to VRAM domain +* before command submission as a workaround. +*/ +static int vcn_v1_0_validate_bo (struct amdgpu_cs_parser *parser, +struct amdgpu_job *job, +uint64_t addr) +{ +struct ttm_operation_ctx ctx = { false, false }; +struct amdgpu_fpriv *fpriv = parser->filp->driver_priv; +struct amdgpu_vm *vm = &fpriv->vm; +struct amdgpu_bo_va_mapping *mapping; +struct amdgpu_bo *bo; +int r; + + addr &=AMDGPU_GMC_HOLE_MASK ; +if (addr &0x7 ) { +DRM_ERROR ("VCN messages must be 8 byte aligned!\n" ); +return -EINVAL ; + } + + mapping =amdgpu_vm_bo_lookup_mapping (vm, addr/AMDGPU_GPU_PAGE_SIZE ); +if (!mapping || !mapping->bo_va || !mapping->bo_va->base.bo)drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c static const struct amd_ip_funcs vcn_v1_0_ip_funcs = { · line 1941
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +10
-0+return -EINVAL ; + + bo = mapping->bo_va->base.bo; +if (!(bo->flags &AMDGPU_GEM_CREATE_ENCRYPTED )) +return 0 ; + +amdgpu_bo_placement_from_domain (bo,AMDGPU_GEM_DOMAIN_VRAM ); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx); +if (r) { +DRM_ERROR ("Failed validating the VCN message BO (%d)!\n" , r);to validate
Quoted 13 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c static const struct amd_ip_funcs vcn_v1_0_ip_funcs = { · line 1954
Quoted 12 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +12
-0+return r; + } + +return r; +} + +static int vcn_v1_0_ring_patch_cs_in_place (struct amdgpu_cs_parser *p, +struct amdgpu_job *job, +struct amdgpu_ib *ib) +{ +uint32_t msg_lo =0 , msg_hi =0 ; +int i, r;Use unsigned int for the counter variable?
Quoted 6 lines
You can see both signed and unsigned are used in kernel. (e.g.,
mm/page_alloc.c).For this case, I think it makes no difference.
In a word, we should consider the specific context.
Although it makes technically no difference, I prefer to use the best matching type to convey the intention of the variable to the reader. But you are right, there is no hard rule for it.
Kind regards,
Paul
Quoted 38 lines
Quoted 38 lines
Quoted 27 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +23
-0+ +if (!(ib->flags &AMDGPU_IB_FLAGS_SECURE )) +return 0 ; + +for (i =0 ; i < ib->length_dw; i +=2 ) { +uint32_t reg =amdgpu_ib_get_value (ib, i); +uint32_t val =amdgpu_ib_get_value (ib, i +1 ); + +if (reg ==PACKET0 (p->adev->vcn.internal.data0,0 )) { + msg_lo = val; + }else if (reg ==PACKET0 (p->adev->vcn.internal.data1,0 )) { + msg_hi = val; + }else if (reg ==PACKET0 (p->adev->vcn.internal.cmd,0 )) { + r =vcn_v1_0_validate_bo (p, job, + ((u64 )msg_hi) <<32 | msg_lo); +if (r) +return r; + } + } + +return 0 ; +} +static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { .type =AMDGPU_RING_TYPE_VCN_DEC , .align_mask =0xf ,drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { · line 1990
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +1
-0@@ -1914,6 +1984,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { .get_rptr = vcn_v1_0_dec_ring_get_rptr, .get_wptr = vcn_v1_0_dec_ring_get_wptr, .set_wptr = vcn_v1_0_dec_ring_set_wptr, + .patch_cs_in_place = vcn_v1_0_ring_patch_cs_in_place, .emit_frame_size =6 +6 +/* hdp invalidate / flush */ SOC15_FLUSH_GPU_TLB_NUM_WREG * 6 +Kind regards,
Paul
Dear Christian,
Am 16.03.22 um 10:41 schrieb Christian König:
Quoted 21 lines
Am 16.03.22 um 07:21 schrieb Lang Yu:
Quoted 20 lines · Paul Menzel
Quoted 19 lines
Am 16.03.22 um 02:27 schrieb Lang Yu:
Quoted 5 lines · Paul Menzel
Quoted 4 lines
Am 14.03.22 um 03:45 schrieb Lang Yu:
Thank you for your patch. A shorter commit message summary would be:
Quoted 7 lines
Quoted 4 lines
Quoted 3 lines
drm/amdgpu: Work around VNC TMZ issue on
CHIP_RAVENIt is a hardware issue that VCN can't handle a GTT backing stored TMZ buffer onCHIP_RAVENseries ASIC.Where is that documented, and how can this be reproduced?
It is documented in AMD internal Confluence and JIRA. Secure playback with a low VRAM config(thus TMZ buffer will be allocted in GTT domain) may reproduce this issue.
It’d be great if as much of the details from this non-publicly accessible information could be added to the commit message, and a way to reproduce this as there does not seem to be a test for this. (Also I guess a tag with a reference to the internal issue would be acceptable, so in case more question surface in the future.)
Quoted 5 lines
Quoted 1 line
Thanks. I will add an internal link.
Lang, please don't!
This isn't an information which is expected to be made public.
Well, how are then even the AMD folks able to link a (upstream) commit to an issue?
If it’s not possible, even more detailed information about the issue including how to reproduce it needs to be part of the commit message.
Kind regards,
Paul
PS: The coreboot project includes references to Google’s internal bug/issue tracker, but also has the requirement that the commit can be reviewed and tested without access to it.
Quoted 140 lines
Quoted 139 lines
Quoted 139 lines
Quoted 85 lines
Quoted 5 lines
Quoted 2 lines
Move such a TMZ buffer to VRAM domain before command submission as a wrokaround.
workaround
Please use a text width of 75 characters per line.
Thanks for your comments. I will take care about this.
Quoted 64 lines
Quoted 52 lines
v2:
- Usepatch_cs_in_placecallback.v3:
- Bail out early if unsecure IBs.Suggested-by Christian König <[email protected]>Signed-off-by Lang Yu <[email protected]>---
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c| 71 +++++++++++++++++++++++++++1 file changed, 71 insertions(+)drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +26
-0@@ -24,6 +24,7 @@ #include <linux/firmware.h> #include "amdgpu.h" +#include "amdgpu_cs.h" #include "amdgpu_vcn.h" #include "amdgpu_pm.h" #include "soc15.h"@@ -1905,6 +1906,75 @@ static const struct amd_ip_funcs vcn_v1_0_ip_funcs = { .set_powergating_state = vcn_v1_0_set_powergating_state, }; +/* +* It is a hardware issue that VCN can't handle a GTT TMZ buffer on +* CHIP_RAVEN series ASIC. Move such a GTT TMZ buffer to VRAM domain +* before command submission as a workaround. +*/ +static int vcn_v1_0_validate_bo (struct amdgpu_cs_parser *parser, + struct amdgpu_job *job, + uint64_t addr) +{ + struct ttm_operation_ctx ctx = { false, false }; + struct amdgpu_fpriv *fpriv = parser->filp->driver_priv; + struct amdgpu_vm *vm = &fpriv->vm; + struct amdgpu_bo_va_mapping *mapping; + struct amdgpu_bo *bo; + int r; + + addr &= AMDGPU_GMC_HOLE_MASK; + if (addr & 0x7) { + DRM_ERROR("VCN messages must be 8 byte aligned!\n"); + return -EINVAL; + } + + mapping = amdgpu_vm_bo_lookup_mapping(vm, addr/AMDGPU_GPU_PAGE_SIZE); + if (!mapping || !mapping->bo_va || !mapping->bo_va->base.bo) + return -EINVAL;drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c static const struct amd_ip_funcs · line 1943
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +9
-0+ + bo = mapping->bo_va->base.bo; + if (!(bo->flags & AMDGPU_GEM_CREATE_ENCRYPTED)) + return 0; + + amdgpu_bo_placement_from_domain(bo, AMDGPU_GEM_DOMAIN_VRAM); + r = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx); + if (r) { + DRM_ERROR("Failed validating the VCN message BO (%d)!\n", r);to validate
Quoted 14 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c static const struct amd_ip_funcs vcn_v1_0_ip_funcs = { · line 1954
Quoted 13 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +12
-0+ return r; + } + + return r; +} + +static int vcn_v1_0_ring_patch_cs_in_place (struct amdgpu_cs_parser *p, + struct amdgpu_job *job, + struct amdgpu_ib *ib) +{ + uint32_t msg_lo = 0, msg_hi = 0; + int i, r;Use unsigned int for the counter variable?
Quoted 6 lines
You can see both signed and unsigned are used in kernel. (e.g.,
mm/page_alloc.c).For this case, I think it makes no difference.
In a word, we should consider the specific context.
Although it makes technically no difference, I prefer to use the best matching type to convey the intention of the variable to the reader. But you are right, there is no hard rule for it.
Kind regards,
Paul
Quoted 39 lines
Quoted 39 lines
Quoted 32 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +23
-0+ + if (!(ib->flags & AMDGPU_IB_FLAGS_SECURE)) + return 0; + + for (i = 0; i < ib->length_dw; i += 2) { + uint32_t reg = amdgpu_ib_get_value(ib, i); + uint32_t val = amdgpu_ib_get_value(ib, i + 1); + + if (reg == PACKET0(p->adev->vcn.internal.data0, 0)) { + msg_lo = val; + } else if (reg == PACKET0(p->adev->vcn.internal.data1, 0)) { + msg_hi = val; + } else if (reg == PACKET0(p->adev->vcn.internal.cmd, 0)) { + r = vcn_v1_0_validate_bo(p, job, + ((u64)msg_hi) << 32 | msg_lo); + if (r) + return r; + } + } + + return 0; +} + static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = {.type =
AMDGPU_RING_TYPE_VCN_DEC,
.align_mask =0xf,drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +1
-0@@ -1914,6 +1984,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { .get_rptr = vcn_v1_0_dec_ring_get_rptr, .get_wptr = vcn_v1_0_dec_ring_get_wptr, .set_wptr = vcn_v1_0_dec_ring_set_wptr, + .patch_cs_in_place = vcn_v1_0_ring_patch_cs_in_place,Quoted 3 lines
.emit_frame_size =
6 + 6 + /* hdp invalidate / flush */SOC15_FLUSH_GPU_TLB_NUM_WREG* 6 +Kind regards,
Paul
Am 16.03.22 um 10:57 schrieb Paul Menzel:
Quoted 25 lines
Dear Christian,
Am 16.03.22 um 10:41 schrieb Christian König:
Quoted 21 lines
Am 16.03.22 um 07:21 schrieb Lang Yu:
Quoted 20 lines · Paul Menzel
Quoted 19 lines
Am 16.03.22 um 02:27 schrieb Lang Yu:
Quoted 5 lines · Paul Menzel
Quoted 4 lines
Am 14.03.22 um 03:45 schrieb Lang Yu:
Thank you for your patch. A shorter commit message summary would be:
Quoted 7 lines
Quoted 4 lines
Quoted 3 lines
drm/amdgpu: Work around VNC TMZ issue on
CHIP_RAVENIt is a hardware issue that VCN can't handle a GTT backing stored TMZ buffer onCHIP_RAVENseries ASIC.Where is that documented, and how can this be reproduced?
It is documented in AMD internal Confluence and JIRA. Secure playback with a low VRAM config(thus TMZ buffer will be allocted in GTT domain) may reproduce this issue.
It’d be great if as much of the details from this non-publicly accessible information could be added to the commit message, and a way to reproduce this as there does not seem to be a test for this. (Also I guess a tag with a reference to the internal issue would be acceptable, so in case more question surface in the future.)
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
Thanks. I will add an internal link.
Lang, please don't!
This isn't an information which is expected to be made public.
Well, how are then even the AMD folks able to link a (upstream) commit to an issue?
Well quite simply: We don't do that since it isn't necessary.
Quoted 2 lines
If it’s not possible, even more detailed information about the issue including how to reproduce it needs to be part of the commit message.
No, why should we do that? It's an AMD internal hardware problem which we add a software workaround for here. The hardware details why and what are completely irrelevant to the public.
All that we need to document is that VCN can't handle GTT on Raven, and that's exactly what the commit message is doing. That's perfectly enough to write a test case.
Regards,
Christian.
Quoted 8 lines
Kind regards,
Paul
PS: The coreboot project includes references to Google’s internal bug/issue tracker, but also has the requirement that the commit can be reviewed and tested without access to it.
Dear Christian,
Am 16.03.22 um 11:08 schrieb Christian König:
Quoted 26 lines
Am 16.03.22 um 10:57 schrieb Paul Menzel:
Quoted 24 lines
Am 16.03.22 um 10:41 schrieb Christian König:
Quoted 23 lines
Am 16.03.22 um 07:21 schrieb Lang Yu:
Quoted 21 lines · Paul Menzel
Quoted 11 lines
Am 16.03.22 um 02:27 schrieb Lang Yu:
Quoted 9 lines · Paul Menzel
Quoted 8 lines
Am 14.03.22 um 03:45 schrieb Lang Yu:
Thank you for your patch. A shorter commit message summary would be:
Quoted 3 lines
drm/amdgpu: Work around VNC TMZ issue on
CHIP_RAVENIt is a hardware issue that VCN can't handle a GTT backing stored TMZ buffer onCHIP_RAVENseries ASIC.Where is that documented, and how can this be reproduced?
Quoted 8 lines
Quoted 3 lines
It is documented in AMD internal Confluence and JIRA. Secure playback with a low VRAM config(thus TMZ buffer will be allocted in GTT domain) may reproduce this issue.
It’d be great if as much of the details from this non-publicly accessible information could be added to the commit message, and a way to reproduce this as there does not seem to be a test for this. (Also I guess a tag with a reference to the internal issue would be acceptable, so in case more question surface in the future.)
Thanks. I will add an internal link.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Lang, please don't!
This isn't an information which is expected to be made public.
Well, how are then even the AMD folks able to link a (upstream) commit to an issue?
Well quite simply: We don't do that since it isn't necessary.
What other ways do you (or future AMD developers) have then? (I would also use *helpful* or *useful*.)
(In two years, when maybe nobody of the current AMD developers work at AMD anymore, and a user bisects a problems to this patch I could imagine it would help the future AMD developers to have this connection.)
Quoted 5 lines
Quoted 1 line
If it’s not possible, even more detailed information about the issue including how to reproduce it needs to be part of the commit message.
No, why should we do that? It's an AMD internal hardware problem which we add a software workaround for here. The hardware details why and what are completely irrelevant to the public.
All that we need to document is that VCN can't handle GTT on Raven, and that's exactly what the commit message is doing. That's perfectly enough to write a test case.
Thank you for clarifying, but I am not interested in the hardware details, but how to reproduce and test the issue. And according to Lang this information is present in the issue. Seeing how complex the graphics driver are, a lot of documentation is not publicly available, a recipe to manually reproduce and test the issue is most helpful.
Kind regards,
Paul