drm/amdgpu/vcn: Add MMSCH v4_0_3 support for sriov
Subsystems (2)
PATCH 1/7 drm/amdgpu/vcn: Add MMSCH v4_0_3 support for sriov
The structures are the same as v4_0 except for the init header
--- drivers/gpu/drm/amd/amdgpu/mmsch_v4_0_3.h | 37 +++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 drivers/gpu/drm/amd/amdgpu/mmsch_v4_0_3.h
drivers/gpu/drm/amd/amdgpu/mmsch_v4_0_3.h new file +37 -0
@@ -0,0 +1,37 @@ +/* +* Copyright 2023 Advanced Micro Devices, Inc. +* +* 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, sublicense, +* 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 above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* 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 NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) 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. +* +*/ + +#ifndef __MMSCH_V4_0_3_H__ +#define __MMSCH_V4_0_3_H__ + +#include "amdgpu_vcn.h" +#include "mmsch_v4_0.h" + +struct mmsch_v4_0_3_init_header { +uint32_t version; +uint32_t total_size; +struct mmsch_v4_0_table_info vcn0; +struct mmsch_v4_0_table_info mjpegdec0[4 ]; +struct mmsch_v4_0_table_info mjpegdec1[4 ]; +}; +#endif
Signature · 1 line
2.34.1
PATCH 2/7 drm/amdgpu/vcn : Skip vcn power-gating change for sriov
--- drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +9 -0
@@ -1317,6 +1317,15 @@ static int vcn_v4_0_3_set_powergating_state(void *handle,struct amdgpu_device *adev = (struct amdgpu_device *)handle;int ret; +/* for SRIOV, guest should not control VCN Power-gating +* MMSCH FW should control Power-gating and clock-gating +* guest should avoid touching CGC and PG +*/ +if (amdgpu_sriov_vf (adev)) { + adev->vcn.cur_state =AMD_PG_STATE_UNGATE ; +return 0 ; + } +if (state == adev->vcn.cur_state)return 0 ;
Signature · 1 line
2.34.1
PATCH 3/7 drm/amdgpu/vcn: sriov support for vcn_v4_0_3
In reply to Samir Dhumeinitialization table handshake with mmsch
--- drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 264 +++++++++++++++++++++--- 1 file changed, 240 insertions(+), 24 deletions(-)
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +240 -24
@@ -31,6 +31,7 @@#include "soc15d.h" #include "soc15_hw_ip.h" #include "vcn_v2_0.h" +#include "mmsch_v4_0_3.h" #include "vcn/vcn_4_0_3_offset.h" #include "vcn/vcn_4_0_3_sh_mask.h"
@@ -44,6 +45,7 @@#define VCN_VID_SOC_ADDRESS_2_0 0x1fb00#define VCN1_VID_SOC_ADDRESS_3_0 0x48300 +static int vcn_v4_0_3_start_sriov (struct amdgpu_device *adev);static void vcn_v4_0_3_set_unified_ring_funcs (struct amdgpu_device *adev);static void vcn_v4_0_3_set_irq_funcs (struct amdgpu_device *adev); static int vcn_v4_0_3_set_powergating_state(void *handle,
@@ -130,6 +132,12 @@ static int vcn_v4_0_3_sw_init(void *handle)amdgpu_vcn_fwlog_init (&adev->vcn.inst[i]); } +if (amdgpu_sriov_vf (adev)) { + r =amdgpu_virt_alloc_mm_table (adev); +if (r) +return r; + } +if (adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG ) adev->vcn.pause_dpg_mode = vcn_v4_0_3_pause_dpg_mode;
@@ -167,6 +175,9 @@ static int vcn_v4_0_3_sw_fini(void *handle)drm_dev_exit (idx); } +if (amdgpu_sriov_vf (adev)) +amdgpu_virt_free_mm_table (adev); + r =amdgpu_vcn_suspend (adev);if (r)return r;
@@ -189,33 +200,50 @@ static int vcn_v4_0_3_hw_init(void *handle)struct amdgpu_ring *ring;int i, r, vcn_inst; -for (i =0 ; i < adev->vcn.num_vcn_inst; ++i) { - vcn_inst =GET_INST (VCN , i); - ring = &adev->vcn.inst[i].ring_enc[0 ]; +if (amdgpu_sriov_vf (adev)) { + r =vcn_v4_0_3_start_sriov (adev); +if (r) + goto done; -if (ring->use_doorbell) { - adev->nbio.funcs->vcn_doorbell_range ( - adev, ring->use_doorbell, - (adev->doorbell_index.vcn.vcn_ring0_1 <<1 ) + -9 * vcn_inst, - adev->vcn.inst[i].aid_id); - -WREG32_SOC15 ( -VCN ,GET_INST (VCN , ring->me), - regVCN_RB1_DB_CTRL, - ring->doorbell_index - <<VCN_RB1_DB_CTRL__OFFSET__SHIFT | -VCN_RB1_DB_CTRL__EN_MASK ); - -/* Read DB_CTRL to flush the write DB_CTRL command. */ -RREG32_SOC15 ( -VCN ,GET_INST (VCN , ring->me), - regVCN_RB1_DB_CTRL); +for (i =0 ; i < adev->vcn.num_vcn_inst; ++i) { +if (adev->vcn.harvest_config & (1 << i)) +continue ; + + ring = &adev->vcn.inst[i].ring_enc[0 ]; + ring->wptr =0 ; + ring->wptr_old =0 ; +vcn_v4_0_3_unified_ring_set_wptr (ring); + ring->sched.ready = true; } + }else { +for (i =0 ; i < adev->vcn.num_vcn_inst; ++i) { + vcn_inst =GET_INST (VCN , i); + ring = &adev->vcn.inst[i].ring_enc[0 ]; + +if (ring->use_doorbell) { + adev->nbio.funcs->vcn_doorbell_range ( + adev, ring->use_doorbell, + (adev->doorbell_index.vcn.vcn_ring0_1 <<1 ) + +9 * vcn_inst, + adev->vcn.inst[i].aid_id); + +WREG32_SOC15 ( +VCN ,GET_INST (VCN , ring->me), + regVCN_RB1_DB_CTRL, + ring->doorbell_index + <<VCN_RB1_DB_CTRL__OFFSET__SHIFT | +VCN_RB1_DB_CTRL__EN_MASK ); + +/* Read DB_CTRL to flush the write DB_CTRL command. */ +RREG32_SOC15 ( +VCN ,GET_INST (VCN , ring->me), + regVCN_RB1_DB_CTRL); + } - r =amdgpu_ring_test_helper (ring); -if (r) - goto done; + r =amdgpu_ring_test_helper (ring); +if (r) + goto done; + } } done:
@@ -813,6 +841,194 @@ static int vcn_v4_0_3_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, breturn 0 ; } +static int vcn_v4_0_3_start_sriov (struct amdgpu_device *adev) +{ +int i; +struct amdgpu_ring *ring_enc; +uint64_t cache_addr; +uint64_t rb_enc_addr; +uint64_t ctx_addr; +uint32_t param, resp, expected; +uint32_t offset, cache_size; +uint32_t tmp, timeout; + +struct amdgpu_mm_table *table = &adev->virt.mm_table; +uint32_t *table_loc; +uint32_t table_size; +uint32_t size, size_dw; +uint32_t init_status; +uint32_t enabled_vcn; + +struct mmsch_v4_0_cmd_direct_write + direct_wt = { {0 } }; +struct mmsch_v4_0_cmd_direct_read_modify_write + direct_rd_mod_wt = { {0 } }; +struct mmsch_v4_0_cmd_end end = { {0 } }; +struct mmsch_v4_0_3_init_header header; + +volatile struct amdgpu_vcn4_fw_shared *fw_shared; +volatile struct amdgpu_fw_shared_rb_setup *rb_setup; + + direct_wt.cmd_header.command_type = +MMSCH_COMMAND__DIRECT_REG_WRITE ; + direct_rd_mod_wt.cmd_header.command_type = +MMSCH_COMMAND__DIRECT_REG_READ_MODIFY_WRITE ; + end.cmd_header.command_type =MMSCH_COMMAND__END ; + +for (i =0 ; i < adev->vcn.num_vcn_inst; i++) { +if (adev->vcn.harvest_config & (1 << i)) +continue ; + +memset (&header,0 ,sizeof (struct mmsch_v4_0_3_init_header )); + header.version =MMSCH_VERSION ; + header.total_size =sizeof (struct mmsch_v4_0_3_init_header ) >>2 ; + + table_loc = (uint32_t *)table->cpu_addr; + table_loc += header.total_size; + + table_size =0 ; + +MMSCH_V4_0_INSERT_DIRECT_RD_MOD_WT (SOC15_REG_OFFSET (VCN ,0 , regUVD_STATUS), + ~UVD_STATUS__UVD_BUSY ,UVD_STATUS__UVD_BUSY ); + + cache_size =AMDGPU_GPU_PAGE_ALIGN (adev->vcn.fw->size +4 ); + +if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) { +MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW), + adev->firmware.ucode[AMDGPU_UCODE_ID_VCN + i].tmr_mc_addr_lo); + +MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH), + adev->firmware.ucode[AMDGPU_UCODE_ID_VCN + i].tmr_mc_addr_hi); + + offset =0 ; +MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_VCPU_CACHE_OFFSET0),0 ); + }else { +MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW), +lower_32_bits (adev->vcn.inst[i].gpu_addr)); +MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH), +upper_32_bits (adev->vcn.inst[i].gpu_addr)); + offset = cache_size; +MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_VCPU_CACHE_OFFSET0), +AMDGPU_UVD_FIRMWARE_OFFSET >>3 ); + } + +MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_VCPU_CACHE_SIZE0), + cache_size); + + cache_addr = adev->vcn.inst[i].gpu_addr + offset; +MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_LMI_VCPU_CACHE1_64BIT_BAR_LOW),lower_32_bits (cache_addr)); +MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_LMI_VCPU_CACHE1_64BIT_BAR_HIGH),upper_32_bits (cache_addr)); +MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_VCPU_CACHE_OFFSET1),0 ); +MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_VCPU_CACHE_SIZE1),AMDGPU_VCN_STACK_SIZE ); + + cache_addr = adev->vcn.inst[i].gpu_addr + offset + +AMDGPU_VCN_STACK_SIZE ; + +MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_LMI_VCPU_CACHE2_64BIT_BAR_LOW),lower_32_bits (cache_addr)); + +MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_LMI_VCPU_CACHE2_64BIT_BAR_HIGH),upper_32_bits (cache_addr)); + +MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_VCPU_CACHE_OFFSET2),0 ); + +MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_VCPU_CACHE_SIZE2),AMDGPU_VCN_CONTEXT_SIZE ); + + fw_shared = adev->vcn.inst[i].fw_shared.cpu_addr; + rb_setup = &fw_shared->rb_setup; + + ring_enc = &adev->vcn.inst[i].ring_enc[0 ]; + ring_enc->wptr =0 ; + rb_enc_addr = ring_enc->gpu_addr; + + rb_setup->is_rb_enabled_flags |=RB_ENABLED ; + rb_setup->rb_addr_lo =lower_32_bits (rb_enc_addr); + rb_setup->rb_addr_hi =upper_32_bits (rb_enc_addr); + rb_setup->rb_size = ring_enc->ring_size /4 ; + fw_shared->present_flag_0 |=cpu_to_le32 (AMDGPU_VCN_VF_RB_SETUP_FLAG ); + +MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_LMI_VCPU_NC0_64BIT_BAR_LOW), +lower_32_bits (adev->vcn.inst[i].fw_shared.gpu_addr)); +MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_LMI_VCPU_NC0_64BIT_BAR_HIGH), +upper_32_bits (adev->vcn.inst[i].fw_shared.gpu_addr)); +MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_VCPU_NONCACHE_SIZE0), +AMDGPU_GPU_PAGE_ALIGN (sizeof (struct amdgpu_vcn4_fw_shared ))); +MMSCH_V4_0_INSERT_END (); + + header.vcn0.init_status =0 ; + header.vcn0.table_offset = header.total_size; + header.vcn0.table_size = table_size; + header.total_size += table_size; + +/* Send init table to mmsch */ + size =sizeof (struct mmsch_v4_0_3_init_header ); + table_loc = (uint32_t *)table->cpu_addr; +memcpy ((void *)table_loc, &header, size); + + ctx_addr = table->gpu_addr; +WREG32_SOC15 (VCN , i, regMMSCH_VF_CTX_ADDR_LO,lower_32_bits (ctx_addr)); +WREG32_SOC15 (VCN , i, regMMSCH_VF_CTX_ADDR_HI,upper_32_bits (ctx_addr)); + + tmp =RREG32_SOC15 (VCN , i, regMMSCH_VF_VMID); + tmp &= ~MMSCH_VF_VMID__VF_CTX_VMID_MASK ; + tmp |= (0 <<MMSCH_VF_VMID__VF_CTX_VMID__SHIFT ); +WREG32_SOC15 (VCN , i, regMMSCH_VF_VMID, tmp); + + size = header.total_size; +WREG32_SOC15 (VCN , i, regMMSCH_VF_CTX_SIZE, size); + +WREG32_SOC15 (VCN , i, regMMSCH_VF_MAILBOX_RESP,0 ); + + param =0x00000001 ; +WREG32_SOC15 (VCN , i, regMMSCH_VF_MAILBOX_HOST, param); + tmp =0 ; + timeout =1000 ; + resp =0 ; + expected =MMSCH_VF_MAILBOX_RESP__OK ; +while (resp != expected) { + resp =RREG32_SOC15 (VCN , i, regMMSCH_VF_MAILBOX_RESP); +if (resp !=0 ) +break ; + +udelay (10 ); + tmp = tmp +10 ; +if (tmp >= timeout) { +DRM_ERROR ("failed to init MMSCH. TIME-OUT after %d usec" \ +" waiting for regMMSCH_VF_MAILBOX_RESP " \ +"(expected=0x%08x, readback=0x%08x)\n" , + tmp, expected, resp); +return -EBUSY ; + } + } + + enabled_vcn =amdgpu_vcn_is_disabled_vcn (adev,VCN_DECODE_RING ,0 ) ?1 :0 ; + init_status = ((struct mmsch_v4_0_3_init_header *)(table_loc))->vcn0.init_status; +if (resp != expected && resp !=MMSCH_VF_MAILBOX_RESP__INCOMPLETE + && init_status !=MMSCH_VF_ENGINE_STATUS__PASS ) { +DRM_ERROR ("MMSCH init status is incorrect! readback=0x%08x, header init " \ +"status for VCN%x: 0x%x\n" , resp, enabled_vcn, init_status); + } + } + +return 0 ; +} +/** * vcn_v4_0_3_start - VCN start *
Signature · 1 line
2.34.1
RE: [PATCH 3/7] drm/amdgpu/vcn: sriov support for vcn_v4_0_3
[Public]
Quoted 41 lines
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Samir Dhume
Sent: Monday, July 17, 2023 11:59 PM
To: [email protected]
Cc: Dhume, Samir <[email protected]>
Subject: [PATCH 3/7] drm/amdgpu/vcn: sriov support forvcn_v4_0_3initialization table handshake with mmsch
Signed-off-by Samir Dhume <[email protected]>--- drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 264 +++++++++++++++++++++--- 1 file changed, 240 insertions(+), 24 deletions(-)drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +2
-0@@ -31,6 +31,7 @@#include "soc15d.h" #include "soc15_hw_ip.h" #include "vcn_v2_0.h" +#include "mmsch_v4_0_3.h" #include "vcn/vcn_4_0_3_offset.h" #include "vcn/vcn_4_0_3_sh_mask.h" @@ -44,6 +45,7 @@#define VCN_VID_SOC_ADDRESS_2_0 0x1fb00#define VCN1_VID_SOC_ADDRESS_3_0 0x48300 +static int vcn_v4_0_3_start_sriov (struct amdgpu_device *adev);static void vcn_v4_0_3_set_unified_ring_funcs (struct amdgpu_device *adev);static void
vcn_v4_0_3_set_irq_funcs(struct amdgpu_device *adev); static int vcn_v4_0_3_set_powergating_state(void *handle, @@ -130,6 +132,12 @@ static intvcn_v4_0_3_sw_init(void *handle)amdgpu_vcn_fwlog_init(&adev->vcn.inst[i]); }
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c static int vcn_v4_0_3_sw_init(void *handle) · line 136
Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +2
-0+if (amdgpu_sriov_vf (adev)) { + r =amdgpu_virt_alloc_mm_table (adev);
amdgpu_virt_alloc_mm_table has an early check of amdgpu_sriov_vf(adev), so from coding style's perspective, I think you can drop this superfluous check here and directly call amdgpu_virt_alloc_mm_table.
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +4
-0+if (r) +return r; + } +if (adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG ) adev->vcn.pause_dpg_mode =
vcn_v4_0_3_pause_dpg_mode;
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c static int vcn_v4_0_3_sw_fini(void *handle) · line 179
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +2
-0@@ -167,6 +175,9 @@ static int vcn_v4_0_3_sw_fini(void *handle)drm_dev_exit (idx); } +if (amdgpu_sriov_vf (adev)) +amdgpu_virt_free_mm_table (adev);
Same as above.
Regards,
Guchun
Quoted 335 lines
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +5
-15r =amdgpu_vcn_suspend (adev);if (r)return r;@@ -189,33 +200,50 @@ static int vcn_v4_0_3_hw_init(void *handle)struct amdgpu_ring *ring;int i, r, vcn_inst; -for (i =0 ; i < adev->vcn.num_vcn_inst; ++i) { - vcn_inst =GET_INST (VCN , i); - ring = &adev->vcn.inst[i].ring_enc[0 ]; +if (amdgpu_sriov_vf (adev)) { + r =vcn_v4_0_3_start_sriov (adev); +if (r) + goto done; -if (ring->use_doorbell) { - adev->nbio.funcs->vcn_doorbell_range ( - adev, ring->use_doorbell, - (adev->doorbell_index.vcn.vcn_ring0_1 <<1 ) + - 9 * vcn_inst, - adev->vcn.inst[i].aid_id); - - WREG32_SOC15( - VCN, GET_INST(VCN, ring->me), - regVCN_RB1_DB_CTRL, - ring->doorbell_index - <<
VCN_RB1_DB_CTRL__OFFSET__SHIFT|drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +0
-3- VCN_RB1_DB_CTRL__EN_MASK); - -/* Read DB_CTRL to flush the write DB_CTRL command. */
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +18
-3-RREG32_SOC15 ( -VCN ,GET_INST (VCN , ring->me), - regVCN_RB1_DB_CTRL); +for (i =0 ; i < adev->vcn.num_vcn_inst; ++i) { +if (adev->vcn.harvest_config & (1 << i)) +continue ; + + ring = &adev->vcn.inst[i].ring_enc[0 ]; + ring->wptr =0 ; + ring->wptr_old =0 ; +vcn_v4_0_3_unified_ring_set_wptr (ring); + ring->sched.ready = true; } + }else { +for (i =0 ; i < adev->vcn.num_vcn_inst; ++i) { + vcn_inst =GET_INST (VCN , i); + ring = &adev->vcn.inst[i].ring_enc[0 ]; + +if (ring->use_doorbell) { + adev->nbio.funcs->vcn_doorbell_range( + adev, ring->use_doorbell, + (adev-Quoted 1 line
doorbell_index.vcn.vcn_ring0_1 << 1) +
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +8
-0+9 * vcn_inst, + adev->vcn.inst[i].aid_id); + + WREG32_SOC15( + VCN, GET_INST(VCN, ring->me), + regVCN_RB1_DB_CTRL, + ring->doorbell_index + <<
VCN_RB1_DB_CTRL__OFFSET__SHIFT|drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +3
-0+ VCN_RB1_DB_CTRL__EN_MASK); + +/* Read DB_CTRL to flush the write DB_CTRL command. */
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +8
-3+RREG32_SOC15 ( +VCN ,GET_INST (VCN , ring->me), + regVCN_RB1_DB_CTRL); + } - r =amdgpu_ring_test_helper (ring); -if (r) - goto done; + r =amdgpu_ring_test_helper (ring); +if (r) + goto done; + } } done:@@ -813,6 +841,194 @@ static int vcn_v4_0_3_start_dpg_mode(struct
amdgpu_device*adev, intinst_idx, breturn 0;}
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +38
-0+static int vcn_v4_0_3_start_sriov (struct amdgpu_device *adev) { +int i; +struct amdgpu_ring *ring_enc; +uint64_t cache_addr; +uint64_t rb_enc_addr; +uint64_t ctx_addr; +uint32_t param, resp, expected; +uint32_t offset, cache_size; +uint32_t tmp, timeout; + +struct amdgpu_mm_table *table = &adev->virt.mm_table; +uint32_t *table_loc; +uint32_t table_size; +uint32_t size, size_dw; +uint32_t init_status; +uint32_t enabled_vcn; + +struct mmsch_v4_0_cmd_direct_write + direct_wt = { {0 } }; +struct mmsch_v4_0_cmd_direct_read_modify_write + direct_rd_mod_wt = { {0 } }; +struct mmsch_v4_0_cmd_end end = { {0 } }; +struct mmsch_v4_0_3_init_header header; + +volatile struct amdgpu_vcn4_fw_shared *fw_shared; +volatile struct amdgpu_fw_shared_rb_setup *rb_setup; + + direct_wt.cmd_header.command_type = +MMSCH_COMMAND__DIRECT_REG_WRITE ; + direct_rd_mod_wt.cmd_header.command_type = +MMSCH_COMMAND__DIRECT_REG_READ_MODIFY_WRITE ; + end.cmd_header.command_type =MMSCH_COMMAND__END ; + +for (i =0 ; i < adev->vcn.num_vcn_inst; i++) { +if (adev->vcn.harvest_config & (1 << i)) +continue ; + + memset(&header, 0, sizeof(struct
mmsch_v4_0_3_init_header));drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +2
-0+ header.version =MMSCH_VERSION ; + header.total_size = sizeof(struct
mmsch_v4_0_3_init_header) >> 2;drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +7
-0+ + table_loc = (uint32_t *)table->cpu_addr; + table_loc += header.total_size; + + table_size =0 ; + + MMSCH_V4_0_INSERT_DIRECT_RD_MOD_WT(SOC15_REG_OFFSET(VCN, 0,
regUVD_STATUS),
+ ~UVD_STATUS__UVD_BUSY,UVD_STATUS__UVD_BUSY);drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +8
-0+ + cache_size =AMDGPU_GPU_PAGE_ALIGN (adev->vcn.fw->size + 4); + +if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) { + MMSCH_V4_0_INSERT_DIRECT_WT(SOC15_REG_OFFSET(VCN, 0, + regUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW), + adev-Quoted 1 line
firmware.ucode[AMDGPU_UCODE_ID_VCN + i].tmr_mc_addr_lo);
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +4
-0+ + MMSCH_V4_0_INSERT_DIRECT_WT(SOC15_REG_OFFSET(VCN, 0, + regUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH), + adev-Quoted 1 line
firmware.ucode[AMDGPU_UCODE_ID_VCN + i].tmr_mc_addr_hi);
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +24
-0+ + offset =0 ; +MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_VCPU_CACHE_OFFSET0),0 ); + }else { +MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW), +lower_32_bits (adev->vcn.inst[i].gpu_addr)); +MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH), +upper_32_bits (adev->vcn.inst[i].gpu_addr)); + offset = cache_size; +MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_VCPU_CACHE_OFFSET0), +AMDGPU_UVD_FIRMWARE_OFFSET >>3 ); + } + +MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_VCPU_CACHE_SIZE0), + cache_size); + + cache_addr = adev->vcn.inst[i].gpu_addr + offset; + MMSCH_V4_0_INSERT_DIRECT_WT(SOC15_REG_OFFSET(VCN, 0, + regUVD_LMI_VCPU_CACHE1_64BIT_BAR_LOW),
lower_32_bits(cache_addr));drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +2
-0+ MMSCH_V4_0_INSERT_DIRECT_WT(SOC15_REG_OFFSET(VCN, 0, + regUVD_LMI_VCPU_CACHE1_64BIT_BAR_HIGH),
upper_32_bits(cache_addr));drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +4
-0+MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_VCPU_CACHE_OFFSET1),0 ); + MMSCH_V4_0_INSERT_DIRECT_WT(SOC15_REG_OFFSET(VCN, 0, + regUVD_VCPU_CACHE_SIZE1),
AMDGPU_VCN_STACK_SIZE);drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +6
-0+ + cache_addr = adev->vcn.inst[i].gpu_addr + offset + +AMDGPU_VCN_STACK_SIZE ; + + MMSCH_V4_0_INSERT_DIRECT_WT(SOC15_REG_OFFSET(VCN, 0, + regUVD_LMI_VCPU_CACHE2_64BIT_BAR_LOW),
lower_32_bits(cache_addr));drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +3
-0+ + MMSCH_V4_0_INSERT_DIRECT_WT(SOC15_REG_OFFSET(VCN, 0, + regUVD_LMI_VCPU_CACHE2_64BIT_BAR_HIGH),
upper_32_bits(cache_addr));drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +6
-0+ +MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_VCPU_CACHE_OFFSET2),0 ); + + MMSCH_V4_0_INSERT_DIRECT_WT(SOC15_REG_OFFSET(VCN, 0, + regUVD_VCPU_CACHE_SIZE2),
AMDGPU_VCN_CONTEXT_SIZE);drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +18
-0+ + fw_shared = adev->vcn.inst[i].fw_shared.cpu_addr; + rb_setup = &fw_shared->rb_setup; + + ring_enc = &adev->vcn.inst[i].ring_enc[0 ]; + ring_enc->wptr =0 ; + rb_enc_addr = ring_enc->gpu_addr; + + rb_setup->is_rb_enabled_flags |=RB_ENABLED ; + rb_setup->rb_addr_lo =lower_32_bits (rb_enc_addr); + rb_setup->rb_addr_hi =upper_32_bits (rb_enc_addr); + rb_setup->rb_size = ring_enc->ring_size /4 ; + fw_shared->present_flag_0 |= +cpu_to_le32 (AMDGPU_VCN_VF_RB_SETUP_FLAG ); + + MMSCH_V4_0_INSERT_DIRECT_WT(SOC15_REG_OFFSET(VCN, 0, + regUVD_LMI_VCPU_NC0_64BIT_BAR_LOW), + lower_32_bits(adev-Quoted 1 line
vcn.inst[i].fw_shared.gpu_addr));
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +3
-0+ MMSCH_V4_0_INSERT_DIRECT_WT(SOC15_REG_OFFSET(VCN, 0, + regUVD_LMI_VCPU_NC0_64BIT_BAR_HIGH), + upper_32_bits(adev-Quoted 1 line
vcn.inst[i].fw_shared.gpu_addr));
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +3
-0+ MMSCH_V4_0_INSERT_DIRECT_WT(SOC15_REG_OFFSET(VCN, 0, + regUVD_VCPU_NONCACHE_SIZE0), + AMDGPU_GPU_PAGE_ALIGN(sizeof(struct
amdgpu_vcn4_fw_shared)));drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +14
-0+MMSCH_V4_0_INSERT_END (); + + header.vcn0.init_status =0 ; + header.vcn0.table_offset = header.total_size; + header.vcn0.table_size = table_size; + header.total_size += table_size; + +/* Send init table to mmsch */ + size =sizeof (struct mmsch_v4_0_3_init_header ); + table_loc = (uint32_t *)table->cpu_addr; +memcpy ((void *)table_loc, &header, size); + + ctx_addr = table->gpu_addr; + WREG32_SOC15(VCN, i, regMMSCH_VF_CTX_ADDR_LO,
lower_32_bits(ctx_addr));drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +15
-0+WREG32_SOC15 (VCN , i, regMMSCH_VF_CTX_ADDR_HI, +upper_32_bits (ctx_addr)); + + tmp =RREG32_SOC15 (VCN , i, regMMSCH_VF_VMID); + tmp &= ~MMSCH_VF_VMID__VF_CTX_VMID_MASK ; + tmp |= (0 <<MMSCH_VF_VMID__VF_CTX_VMID__SHIFT ); +WREG32_SOC15 (VCN , i, regMMSCH_VF_VMID, tmp); + + size = header.total_size; +WREG32_SOC15 (VCN , i, regMMSCH_VF_CTX_SIZE, size); + +WREG32_SOC15 (VCN , i, regMMSCH_VF_MAILBOX_RESP,0 ); + + param =0x00000001 ; + WREG32_SOC15(VCN, i, regMMSCH_VF_MAILBOX_HOST,param);
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +6
-0+ tmp =0 ; + timeout =1000 ; + resp =0 ; + expected =MMSCH_VF_MAILBOX_RESP__OK ; +while (resp != expected) { + resp = RREG32_SOC15(VCN, i,
regMMSCH_VF_MAILBOX_RESP);drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +7
-0+if (resp !=0 ) +break ; + +udelay (10 ); + tmp = tmp +10 ; +if (tmp >= timeout) { + DRM_ERROR("failed to init MMSCH. TIME-OUT after %d usec"\
+ " waiting forregMMSCH_VF_MAILBOX_RESP"\
+ "(expected=0x%08x,
readback=0x%08x)\n",drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +6
-0+ tmp, expected, resp); +return -EBUSY ; + } + } + + enabled_vcn = amdgpu_vcn_is_disabled_vcn(adev,
VCN_DECODE_RING, 0) ? 1 : 0;
+init_status= ((structmmsch_v4_0_3_init_header
*)(table_loc))->vcn0.init_status;
+ if (resp != expected && resp !=MMSCH_VF_MAILBOX_RESP__INCOMPLETE
+ &&init_status!=MMSCH_VF_ENGINE_STATUS__PASS) {
+ DRM_ERROR("MMSCH init status is incorrect!
readback=0x%08x, header init "\
+ "status for VCN%x: 0x%x\n", resp,enabled_vcn,init_status);drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +6
-1+ } + } + +return 0 ; +} +/** * vcn_v4_0_3_start - VCN start * -- 2.34.1
RE: [PATCH 3/7] drm/amdgpu/vcn: sriov support for vcn_v4_0_3
[Public]
Fair point. I'll follow up with another patch.
Thanks,
Samir
-----Original Message-----
From: Chen, Guchun <[email protected]>
Sent: Tuesday, July 18, 2023 1:54 AM
To: Dhume, Samir <[email protected]>; [email protected]
Cc: Dhume, Samir <[email protected]>
Subject: RE: [PATCH 3/7] drm/amdgpu/vcn: sriov support for vcn_v4_0_3
[Public]
Quoted 33 lines
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Samir Dhume
Sent: Monday, July 17, 2023 11:59 PM
To: [email protected]
Cc: Dhume, Samir <[email protected]>
Subject: [PATCH 3/7] drm/amdgpu/vcn: sriov support forvcn_v4_0_3initialization table handshake with mmsch
Signed-off-by Samir Dhume <[email protected]>--- drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 264 +++++++++++++++++++++--- 1 file changed, 240 insertions(+), 24 deletions(-)drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +1
-0@@ -31,6 +31,7 @@#include "soc15d.h" #include "soc15_hw_ip.h" #include "vcn_v2_0.h" +#include "mmsch_v4_0_3.h" #include "vcn/vcn_4_0_3_offset.h" #include "vcn/vcn_4_0_3_sh_mask.h" @@ -44,6 +45,7 @@#define VCN_VID_SOC_ADDRESS_2_0 0x1fb00#define VCN1_VID_SOC_ADDRESS_3_0 0x48300
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +3
-1+static int vcn_v4_0_3_start_sriov (struct amdgpu_device *adev);static void vcn_v4_0_3_set_unified_ring_funcs (struct amdgpu_device *adev);static void vcn_v4_0_3_set_irq_funcs (struct amdgpu_device *adev); static int vcn_v4_0_3_set_powergating_state(void *handle, @@ -130,6 +132,12 @@ static int vcn_v4_0_3_sw_init(void *handle) amdgpu_vcn_fwlog_init(&adev->vcn.inst[i]); } +if (amdgpu_sriov_vf (adev)) { + r =amdgpu_virt_alloc_mm_table (adev);
amdgpu_virt_alloc_mm_table has an early check of amdgpu_sriov_vf(adev), so from coding style's perspective, I think you can drop this superfluous check here and directly call amdgpu_virt_alloc_mm_table.
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c static int vcn_v4_0_3_sw_fini(void *handle) · line 179
Quoted 13 lines
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +6
-0+if (r) +return r; + } +if (adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG ) adev->vcn.pause_dpg_mode = vcn_v4_0_3_pause_dpg_mode;@@ -167,6 +175,9 @@ static int vcn_v4_0_3_sw_fini(void *handle)drm_dev_exit (idx); } +if (amdgpu_sriov_vf (adev)) +amdgpu_virt_free_mm_table (adev);
Same as above.
Regards,
Guchun
Quoted 337 lines
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +5
-15r =amdgpu_vcn_suspend (adev);if (r)return r;@@ -189,33 +200,50 @@ static int vcn_v4_0_3_hw_init(void *handle)struct amdgpu_ring *ring;int i, r, vcn_inst; -for (i =0 ; i < adev->vcn.num_vcn_inst; ++i) { - vcn_inst =GET_INST (VCN , i); - ring = &adev->vcn.inst[i].ring_enc[0 ]; +if (amdgpu_sriov_vf (adev)) { + r =vcn_v4_0_3_start_sriov (adev); +if (r) + goto done; -if (ring->use_doorbell) { - adev->nbio.funcs->vcn_doorbell_range ( - adev, ring->use_doorbell, - (adev->doorbell_index.vcn.vcn_ring0_1 <<1 ) + - 9 * vcn_inst, - adev->vcn.inst[i].aid_id); - - WREG32_SOC15( - VCN, GET_INST(VCN, ring->me), - regVCN_RB1_DB_CTRL, - ring->doorbell_index - <<
VCN_RB1_DB_CTRL__OFFSET__SHIFT|drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +0
-3- VCN_RB1_DB_CTRL__EN_MASK); - -/* Read DB_CTRL to flush the write DB_CTRL command. */
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +18
-3-RREG32_SOC15 ( -VCN ,GET_INST (VCN , ring->me), - regVCN_RB1_DB_CTRL); +for (i =0 ; i < adev->vcn.num_vcn_inst; ++i) { +if (adev->vcn.harvest_config & (1 << i)) +continue ; + + ring = &adev->vcn.inst[i].ring_enc[0 ]; + ring->wptr =0 ; + ring->wptr_old =0 ; +vcn_v4_0_3_unified_ring_set_wptr (ring); + ring->sched.ready = true; } + }else { +for (i =0 ; i < adev->vcn.num_vcn_inst; ++i) { + vcn_inst =GET_INST (VCN , i); + ring = &adev->vcn.inst[i].ring_enc[0 ]; + +if (ring->use_doorbell) { + adev->nbio.funcs->vcn_doorbell_range( + adev, ring->use_doorbell, + (adev-Quoted 1 line
doorbell_index.vcn.vcn_ring0_1 << 1) +
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +8
-0+9 * vcn_inst, + adev->vcn.inst[i].aid_id); + + WREG32_SOC15( + VCN, GET_INST(VCN, ring->me), + regVCN_RB1_DB_CTRL, + ring->doorbell_index + <<
VCN_RB1_DB_CTRL__OFFSET__SHIFT|drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +4
-0+ VCN_RB1_DB_CTRL__EN_MASK); + +/* Read DB_CTRL to flush the write +DB_CTRL command. */
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +8
-3+RREG32_SOC15 ( +VCN ,GET_INST (VCN , ring->me), + regVCN_RB1_DB_CTRL); + } - r =amdgpu_ring_test_helper (ring); -if (r) - goto done; + r =amdgpu_ring_test_helper (ring); +if (r) + goto done; + } } done:@@ -813,6 +841,194 @@ static int vcn_v4_0_3_start_dpg_mode(struct
amdgpu_device*adev, intinst_idx, breturn 0;}
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +38
-0+static int vcn_v4_0_3_start_sriov (struct amdgpu_device *adev) { +int i; +struct amdgpu_ring *ring_enc; +uint64_t cache_addr; +uint64_t rb_enc_addr; +uint64_t ctx_addr; +uint32_t param, resp, expected; +uint32_t offset, cache_size; +uint32_t tmp, timeout; + +struct amdgpu_mm_table *table = &adev->virt.mm_table; +uint32_t *table_loc; +uint32_t table_size; +uint32_t size, size_dw; +uint32_t init_status; +uint32_t enabled_vcn; + +struct mmsch_v4_0_cmd_direct_write + direct_wt = { {0 } }; +struct mmsch_v4_0_cmd_direct_read_modify_write + direct_rd_mod_wt = { {0 } }; +struct mmsch_v4_0_cmd_end end = { {0 } }; +struct mmsch_v4_0_3_init_header header; + +volatile struct amdgpu_vcn4_fw_shared *fw_shared; +volatile struct amdgpu_fw_shared_rb_setup *rb_setup; + + direct_wt.cmd_header.command_type = +MMSCH_COMMAND__DIRECT_REG_WRITE ; + direct_rd_mod_wt.cmd_header.command_type = +MMSCH_COMMAND__DIRECT_REG_READ_MODIFY_WRITE ; + end.cmd_header.command_type =MMSCH_COMMAND__END ; + +for (i =0 ; i < adev->vcn.num_vcn_inst; i++) { +if (adev->vcn.harvest_config & (1 << i)) +continue ; + + memset(&header, 0, sizeof(struct
mmsch_v4_0_3_init_header));drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +2
-0+ header.version =MMSCH_VERSION ; + header.total_size = sizeof(struct
mmsch_v4_0_3_init_header) >> 2;drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +7
-0+ + table_loc = (uint32_t *)table->cpu_addr; + table_loc += header.total_size; + + table_size =0 ; + + MMSCH_V4_0_INSERT_DIRECT_RD_MOD_WT(SOC15_REG_OFFSET(VCN, 0,
regUVD_STATUS),
+ ~UVD_STATUS__UVD_BUSY,UVD_STATUS__UVD_BUSY);drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +8
-0+ + cache_size =AMDGPU_GPU_PAGE_ALIGN (adev->vcn.fw->size + 4); + +if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) { + MMSCH_V4_0_INSERT_DIRECT_WT(SOC15_REG_OFFSET(VCN, 0, + regUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW), + adev-Quoted 1 line
firmware.ucode[AMDGPU_UCODE_ID_VCN + i].tmr_mc_addr_lo);
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +4
-0+ + MMSCH_V4_0_INSERT_DIRECT_WT(SOC15_REG_OFFSET(VCN, 0, + regUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH), + adev-Quoted 1 line
firmware.ucode[AMDGPU_UCODE_ID_VCN + i].tmr_mc_addr_hi);
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +25
-0+ + offset =0 ; +MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_VCPU_CACHE_OFFSET0),0 ); + }else { +MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW), + +lower_32_bits (adev->vcn.inst[i].gpu_addr)); +MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH), +upper_32_bits (adev->vcn.inst[i].gpu_addr)); + offset = cache_size; +MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_VCPU_CACHE_OFFSET0), +AMDGPU_UVD_FIRMWARE_OFFSET >>3 ); + } + +MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_VCPU_CACHE_SIZE0), + cache_size); + + cache_addr = adev->vcn.inst[i].gpu_addr + offset; + MMSCH_V4_0_INSERT_DIRECT_WT(SOC15_REG_OFFSET(VCN, 0, + regUVD_LMI_VCPU_CACHE1_64BIT_BAR_LOW),
lower_32_bits(cache_addr));drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +2
-0+ MMSCH_V4_0_INSERT_DIRECT_WT(SOC15_REG_OFFSET(VCN, 0, + regUVD_LMI_VCPU_CACHE1_64BIT_BAR_HIGH),
upper_32_bits(cache_addr));drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +4
-0+MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_VCPU_CACHE_OFFSET1),0 ); + MMSCH_V4_0_INSERT_DIRECT_WT(SOC15_REG_OFFSET(VCN, 0, + regUVD_VCPU_CACHE_SIZE1),
AMDGPU_VCN_STACK_SIZE);drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +6
-0+ + cache_addr = adev->vcn.inst[i].gpu_addr + offset + +AMDGPU_VCN_STACK_SIZE ; + + MMSCH_V4_0_INSERT_DIRECT_WT(SOC15_REG_OFFSET(VCN, 0, + regUVD_LMI_VCPU_CACHE2_64BIT_BAR_LOW),
lower_32_bits(cache_addr));drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +3
-0+ + MMSCH_V4_0_INSERT_DIRECT_WT(SOC15_REG_OFFSET(VCN, 0, + regUVD_LMI_VCPU_CACHE2_64BIT_BAR_HIGH),
upper_32_bits(cache_addr));drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +6
-0+ +MMSCH_V4_0_INSERT_DIRECT_WT (SOC15_REG_OFFSET (VCN ,0 , + regUVD_VCPU_CACHE_OFFSET2),0 ); + + MMSCH_V4_0_INSERT_DIRECT_WT(SOC15_REG_OFFSET(VCN, 0, + regUVD_VCPU_CACHE_SIZE2),
AMDGPU_VCN_CONTEXT_SIZE);drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +18
-0+ + fw_shared = adev->vcn.inst[i].fw_shared.cpu_addr; + rb_setup = &fw_shared->rb_setup; + + ring_enc = &adev->vcn.inst[i].ring_enc[0 ]; + ring_enc->wptr =0 ; + rb_enc_addr = ring_enc->gpu_addr; + + rb_setup->is_rb_enabled_flags |=RB_ENABLED ; + rb_setup->rb_addr_lo =lower_32_bits (rb_enc_addr); + rb_setup->rb_addr_hi =upper_32_bits (rb_enc_addr); + rb_setup->rb_size = ring_enc->ring_size /4 ; + fw_shared->present_flag_0 |= +cpu_to_le32 (AMDGPU_VCN_VF_RB_SETUP_FLAG ); + + MMSCH_V4_0_INSERT_DIRECT_WT(SOC15_REG_OFFSET(VCN, 0, + regUVD_LMI_VCPU_NC0_64BIT_BAR_LOW), + lower_32_bits(adev-Quoted 1 line
vcn.inst[i].fw_shared.gpu_addr));
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +3
-0+ MMSCH_V4_0_INSERT_DIRECT_WT(SOC15_REG_OFFSET(VCN, 0, + regUVD_LMI_VCPU_NC0_64BIT_BAR_HIGH), + upper_32_bits(adev-Quoted 1 line
vcn.inst[i].fw_shared.gpu_addr));
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +3
-0+ MMSCH_V4_0_INSERT_DIRECT_WT(SOC15_REG_OFFSET(VCN, 0, + regUVD_VCPU_NONCACHE_SIZE0), + AMDGPU_GPU_PAGE_ALIGN(sizeof(struct
amdgpu_vcn4_fw_shared)));drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +14
-0+MMSCH_V4_0_INSERT_END (); + + header.vcn0.init_status =0 ; + header.vcn0.table_offset = header.total_size; + header.vcn0.table_size = table_size; + header.total_size += table_size; + +/* Send init table to mmsch */ + size =sizeof (struct mmsch_v4_0_3_init_header ); + table_loc = (uint32_t *)table->cpu_addr; +memcpy ((void *)table_loc, &header, size); + + ctx_addr = table->gpu_addr; + WREG32_SOC15(VCN, i, regMMSCH_VF_CTX_ADDR_LO,
lower_32_bits(ctx_addr));drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +15
-0+WREG32_SOC15 (VCN , i, regMMSCH_VF_CTX_ADDR_HI, +upper_32_bits (ctx_addr)); + + tmp =RREG32_SOC15 (VCN , i, regMMSCH_VF_VMID); + tmp &= ~MMSCH_VF_VMID__VF_CTX_VMID_MASK ; + tmp |= (0 <<MMSCH_VF_VMID__VF_CTX_VMID__SHIFT ); +WREG32_SOC15 (VCN , i, regMMSCH_VF_VMID, tmp); + + size = header.total_size; +WREG32_SOC15 (VCN , i, regMMSCH_VF_CTX_SIZE, size); + +WREG32_SOC15 (VCN , i, regMMSCH_VF_MAILBOX_RESP,0 ); + + param =0x00000001 ; + WREG32_SOC15(VCN, i, regMMSCH_VF_MAILBOX_HOST,param);
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +6
-0+ tmp =0 ; + timeout =1000 ; + resp =0 ; + expected =MMSCH_VF_MAILBOX_RESP__OK ; +while (resp != expected) { + resp = RREG32_SOC15(VCN, i,
regMMSCH_VF_MAILBOX_RESP);drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +7
-0+if (resp !=0 ) +break ; + +udelay (10 ); + tmp = tmp +10 ; +if (tmp >= timeout) { + DRM_ERROR("failed to init MMSCH. TIME-OUT after %d usec"\
+ " waiting forregMMSCH_VF_MAILBOX_RESP"\
+ "(expected=0x%08x,
readback=0x%08x)\n",drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +6
-0+ tmp, expected, resp); +return -EBUSY ; + } + } + + enabled_vcn = amdgpu_vcn_is_disabled_vcn(adev,
VCN_DECODE_RING, 0) ? 1 : 0;
+init_status= ((structmmsch_v4_0_3_init_header
*)(table_loc))->vcn0.init_status;
+ if (resp != expected && resp !=MMSCH_VF_MAILBOX_RESP__INCOMPLETE
+ &&init_status!=MMSCH_VF_ENGINE_STATUS__PASS) {
+ DRM_ERROR("MMSCH init status is incorrect!
readback=0x%08x, header init "\
+ "status for VCN%x: 0x%x\n", resp,enabled_vcn,init_status);drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +6
-1+ } + } + +return 0 ; +} +/** * vcn_v4_0_3_start - VCN start * -- 2.34.1
PATCH 4/7 drm/amdgpu/vcn: mmsch_v3_0_4 requires doorbell on 32 byte boundary
In reply to Samir Dhume--- drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +10 -3
@@ -113,9 +113,16 @@ static int vcn_v4_0_3_sw_init(void *handle) ring = &adev->vcn.inst[i].ring_enc[0 ]; ring->use_doorbell = true; - ring->doorbell_index = - (adev->doorbell_index.vcn.vcn_ring0_1 <<1 ) + -9 * vcn_inst; + +if (!amdgpu_sriov_vf (adev)) + ring->doorbell_index = + (adev->doorbell_index.vcn.vcn_ring0_1 <<1 ) + +9 * vcn_inst; +else + ring->doorbell_index = + (adev->doorbell_index.vcn.vcn_ring0_1 <<1 ) + +32 * vcn_inst; + ring->vm_hub =AMDGPU_MMHUB0 (adev->vcn.inst[i].aid_id);sprintf (ring->name,"vcn_unified_%d" , adev->vcn.inst[i].aid_id); r = amdgpu_ring_init(adev, ring, 512, &adev->vcn.inst->irq, 0,
Signature · 1 line
2.34.1
PATCH 5/7 drm/amdgpu/jpeg: sriov support for jpeg_v4_0_3
In reply to Samir Dhumeinitialization table handshake with mmsch
--- drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 171 ++++++++++++++++++++--- 1 file changed, 150 insertions(+), 21 deletions(-)
drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c +150 -21
@@ -26,6 +26,7 @@#include "soc15.h" #include "soc15d.h" #include "jpeg_v4_0_3.h" +#include "mmsch_v4_0_3.h" #include "vcn/vcn_4_0_3_offset.h" #include "vcn/vcn_4_0_3_sh_mask.h"
@@ -41,6 +42,7 @@ static void jpeg_v4_0_3_set_irq_funcs(struct amdgpu_device *adev);static int jpeg_v4_0_3_set_powergating_state (void *handle,enum amd_powergating_state state);static void jpeg_v4_0_3_set_ras_funcs (struct amdgpu_device *adev); +static void jpeg_v4_0_3_dec_ring_set_wptr (struct amdgpu_ring *ring);static int amdgpu_ih_srcid_jpeg[] = {VCN_4_0__SRCID__JPEG_DECODE ,
@@ -160,6 +162,117 @@ static int jpeg_v4_0_3_sw_fini(void *handle)return r; } +static int jpeg_v4_0_3_start_sriov (struct amdgpu_device *adev) +{ +struct amdgpu_ring *ring; +uint64_t ctx_addr; +uint32_t param, resp, expected; +uint32_t tmp, timeout; + +struct amdgpu_mm_table *table = &adev->virt.mm_table; +uint32_t *table_loc; +uint32_t table_size; +uint32_t size, size_dw, item_offset; +uint32_t init_status; +int i, j; + +struct mmsch_v4_0_cmd_direct_write + direct_wt = { {0 } }; +struct mmsch_v4_0_cmd_end end = { {0 } }; +struct mmsch_v4_0_3_init_header header; + + direct_wt.cmd_header.command_type = +MMSCH_COMMAND__DIRECT_REG_WRITE ; + end.cmd_header.command_type = +MMSCH_COMMAND__END ; + +for (i =0 ; i < adev->jpeg.num_jpeg_inst; i++) { +memset (&header,0 ,sizeof (struct mmsch_v4_0_3_init_header )); + header.version =MMSCH_VERSION ; + header.total_size =sizeof (struct mmsch_v4_0_3_init_header ) >>2 ; + + table_loc = (uint32_t *)table->cpu_addr; + table_loc += header.total_size; + + item_offset = header.total_size; + +for (j =0 ; j < adev->jpeg.num_jpeg_rings; j++) { + ring = &adev->jpeg.inst[i].ring_dec[j]; + table_size =0 ; + + tmp =SOC15_REG_OFFSET (JPEG ,0 , regUVD_JMI0_UVD_LMI_JRBC_RB_64BIT_BAR_LOW); +MMSCH_V4_0_INSERT_DIRECT_WT (tmp,lower_32_bits (ring->gpu_addr)); + tmp =SOC15_REG_OFFSET (JPEG ,0 , regUVD_JMI0_UVD_LMI_JRBC_RB_64BIT_BAR_HIGH); +MMSCH_V4_0_INSERT_DIRECT_WT (tmp,upper_32_bits (ring->gpu_addr)); + tmp =SOC15_REG_OFFSET (JPEG ,0 , regUVD_JRBC0_UVD_JRBC_RB_SIZE); +MMSCH_V4_0_INSERT_DIRECT_WT (tmp, ring->ring_size /4 ); + +if (j <=3 ) { + header.mjpegdec0[j].table_offset = item_offset; + header.mjpegdec0[j].init_status =0 ; + header.mjpegdec0[j].table_size = table_size; + }else { + header.mjpegdec1[j-4 ].table_offset = item_offset; + header.mjpegdec1[j-4 ].init_status =0 ; + header.mjpegdec1[j-4 ].table_size = table_size; + } + header.total_size += table_size; + item_offset+= table_size; + } + +MMSCH_V4_0_INSERT_END (); + +/* send init table to MMSCH */ + size =sizeof (struct mmsch_v4_0_3_init_header ); + table_loc = (uint32_t *)table->cpu_addr; +memcpy ((void *)table_loc, &header, size); + + ctx_addr = table->gpu_addr; +WREG32_SOC15 (VCN , i, regMMSCH_VF_CTX_ADDR_LO,lower_32_bits (ctx_addr)); +WREG32_SOC15 (VCN , i, regMMSCH_VF_CTX_ADDR_HI,upper_32_bits (ctx_addr)); + + tmp =RREG32_SOC15 (VCN , i, regMMSCH_VF_VMID); + tmp &= ~MMSCH_VF_VMID__VF_CTX_VMID_MASK ; + tmp |= (0 <<MMSCH_VF_VMID__VF_CTX_VMID__SHIFT ); +WREG32_SOC15 (VCN , i, regMMSCH_VF_VMID, tmp); + + size = header.total_size; +WREG32_SOC15 (VCN , i, regMMSCH_VF_CTX_SIZE, size); + +WREG32_SOC15 (VCN , i, regMMSCH_VF_MAILBOX_RESP,0 ); + + param =0x00000001 ; +WREG32_SOC15 (VCN , i, regMMSCH_VF_MAILBOX_HOST, param); + tmp =0 ; + timeout =1000 ; + resp =0 ; + expected =MMSCH_VF_MAILBOX_RESP__OK ; + init_status = ((struct mmsch_v4_0_3_init_header *)(table_loc))->mjpegdec0[i].init_status; +while (resp != expected) { + resp =RREG32_SOC15 (VCN , i, regMMSCH_VF_MAILBOX_RESP); + +if (resp !=0 ) +break ; +udelay (10 ); + tmp = tmp +10 ; +if (tmp >= timeout) { +DRM_ERROR ("failed to init MMSCH. TIME-OUT after %d usec" \ +" waiting for regMMSCH_VF_MAILBOX_RESP " \ +"(expected=0x%08x, readback=0x%08x)\n" , + tmp, expected, resp); +return -EBUSY ; + } + } +if (resp != expected && resp !=MMSCH_VF_MAILBOX_RESP__INCOMPLETE && init_status !=MMSCH_VF_ENGINE_STATUS__PASS ) { +DRM_ERROR ("MMSCH init status is incorrect! readback=0x%08x, header init status for jpeg: %x\n" , resp, init_status); + } + + + } +return 0 ; +} + +/** * jpeg_v4_0_3_hw_init - start and test JPEG block *
@@ -172,31 +285,47 @@ static int jpeg_v4_0_3_hw_init(void *handle)struct amdgpu_ring *ring;int i, j, r, jpeg_inst; -for (i =0 ; i < adev->jpeg.num_jpeg_inst; ++i) { - jpeg_inst =GET_INST (JPEG , i); +if (amdgpu_sriov_vf (adev)) { + r =jpeg_v4_0_3_start_sriov (adev); +if (r) +return r; - ring = adev->jpeg.inst[i].ring_dec; +for (i =0 ; i < adev->vcn.num_vcn_inst; ++i) { +for (j =0 ; j < adev->jpeg.num_jpeg_rings; ++j) { + ring = &adev->jpeg.inst[i].ring_dec[j]; + ring->wptr =0 ; + ring->wptr_old =0 ; +jpeg_v4_0_3_dec_ring_set_wptr (ring); + ring->sched.ready = true; + } + } + }else { +for (i =0 ; i < adev->jpeg.num_jpeg_inst; ++i) { + jpeg_inst =GET_INST (JPEG , i); -if (ring->use_doorbell) - adev->nbio.funcs->vcn_doorbell_range ( - adev, ring->use_doorbell, - (adev->doorbell_index.vcn.vcn_ring0_1 <<1 ) + -9 * jpeg_inst, - adev->jpeg.inst[i].aid_id); + ring = adev->jpeg.inst[i].ring_dec; -for (j =0 ; j < adev->jpeg.num_jpeg_rings; ++j) { - ring = &adev->jpeg.inst[i].ring_dec[j];if (ring->use_doorbell) -WREG32_SOC15_OFFSET ( -VCN ,GET_INST (VCN , i), - regVCN_JPEG_DB_CTRL, - (ring->pipe ? (ring->pipe -0x15 ) :0 ), - ring->doorbell_index - <<VCN_JPEG_DB_CTRL__OFFSET__SHIFT | -VCN_JPEG_DB_CTRL__EN_MASK ); - r =amdgpu_ring_test_helper (ring); -if (r) -return r; + adev->nbio.funcs->vcn_doorbell_range ( + adev, ring->use_doorbell, + (adev->doorbell_index.vcn.vcn_ring0_1 <<1 ) + +9 * jpeg_inst, + adev->jpeg.inst[i].aid_id); + +for (j =0 ; j < adev->jpeg.num_jpeg_rings; ++j) { + ring = &adev->jpeg.inst[i].ring_dec[j]; +if (ring->use_doorbell) +WREG32_SOC15_OFFSET ( +VCN ,GET_INST (VCN , i), + regVCN_JPEG_DB_CTRL, + (ring->pipe ? (ring->pipe -0x15 ) :0 ), + ring->doorbell_index + <<VCN_JPEG_DB_CTRL__OFFSET__SHIFT | +VCN_JPEG_DB_CTRL__EN_MASK ); + r =amdgpu_ring_test_helper (ring); +if (r) +return r; + } } }DRM_DEV_INFO (adev->dev,"JPEG decode initialized successfully.\n" );
Signature · 1 line
2.34.1
PATCH 6/7 drm/amdgpu/jpeg: mmsch_v3_0_4 requires doorbell on 32 byte boundary
In reply to Samir Dhume--- drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c +14 -3
@@ -111,9 +111,20 @@ static int jpeg_v4_0_3_sw_init(void *handle) ring = &adev->jpeg.inst[i].ring_dec[j]; ring->use_doorbell = true; ring->vm_hub =AMDGPU_MMHUB0 (adev->jpeg.inst[i].aid_id); - ring->doorbell_index = - (adev->doorbell_index.vcn.vcn_ring0_1 <<1 ) + -1 + j +9 * jpeg_inst; +if (!amdgpu_sriov_vf (adev)) { + ring->doorbell_index = + (adev->doorbell_index.vcn.vcn_ring0_1 <<1 ) + +1 + j +9 * jpeg_inst; + }else { +if (j <4 ) + ring->doorbell_index = + (adev->doorbell_index.vcn.vcn_ring0_1 <<1 ) + +4 + j +32 * jpeg_inst; +else + ring->doorbell_index = + (adev->doorbell_index.vcn.vcn_ring0_1 <<1 ) + +8 + j +32 * jpeg_inst; + }sprintf (ring->name,"jpeg_dec_%d.%d" , adev->jpeg.inst[i].aid_id, j); r =amdgpu_ring_init (adev, ring,512 , &adev->jpeg.inst->irq,0 ,AMDGPU_RING_PRIO_DEFAULT ,NULL );
Signature · 1 line
2.34.1
PATCH 7/7 drm/amdgpu/vcn: change end doorbell index for vcn_v4_0_3
In reply to Samir DhumeFor sriov, doorbell index for vcn0 for AID needs to be on 32 byte boundary so we need to move the vcn end doorbell
--- drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h +3 -3
@@ -330,14 +330,14 @@ typedef enum _AMDGPU_DOORBELL_ASSIGNMENT_LAYOUT1 { AMDGPU_DOORBELL_LAYOUT1_sDMA_ENGINE_END =0x19F ,/* IH: 0x1A0 ~ 0x1AF */ AMDGPU_DOORBELL_LAYOUT1_IH =0x1A0 , -/* VCN: 0x1B0 ~ 0x1D4 */ +/* VCN: 0x1B0 ~ 0x1E8 */ AMDGPU_DOORBELL_LAYOUT1_VCN_START =0x1B0 , -AMDGPU_DOORBELL_LAYOUT1_VCN_END =0x1D4 , +AMDGPU_DOORBELL_LAYOUT1_VCN_END =0x1E8 ,AMDGPU_DOORBELL_LAYOUT1_FIRST_NON_CP = AMDGPU_DOORBELL_LAYOUT1_sDMA_ENGINE_START,AMDGPU_DOORBELL_LAYOUT1_LAST_NON_CP =AMDGPU_DOORBELL_LAYOUT1_VCN_END , -AMDGPU_DOORBELL_LAYOUT1_MAX_ASSIGNMENT =0x1D4 , +AMDGPU_DOORBELL_LAYOUT1_MAX_ASSIGNMENT =0x1E8 , AMDGPU_DOORBELL_LAYOUT1_INVALID = 0xFFFF }AMDGPU_DOORBELL_ASSIGNMENT_LAYOUT1 ;
Signature · 1 line
2.34.1