Please ignore this patch, will send a new one.
Regards,
Lang
On 06/27/ , Lang Yu wrote:
> Rename psp_update_vcn_sram to psp_execute_ucode_loading
> so that other clients can feel free to use it.
>
> Signed-off-by: Lang Yu <Lang.Yu@xxxxxxx>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 19 ++++++++++---------
> drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 7 +++++--
> drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 7 ++++---
> drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 8 +++++---
> drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 6 ++++--
> drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 6 ++++--
> drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 5 +++--
> 7 files changed, 35 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> index aa69269169a1..33f8b8389979 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> @@ -2931,15 +2931,16 @@ int psp_rlc_autoload_start(struct psp_context *psp)
> return ret;
> }
>
> -int psp_update_vcn_sram(struct amdgpu_device *adev, int inst_idx,
> - uint64_t cmd_gpu_addr, int cmd_size)
> -{
> - struct amdgpu_firmware_info ucode = {0};
> -
> - ucode.ucode_id = inst_idx ? AMDGPU_UCODE_ID_VCN1_RAM :
> - AMDGPU_UCODE_ID_VCN0_RAM;
> - ucode.mc_addr = cmd_gpu_addr;
> - ucode.ucode_size = cmd_size;
> +int psp_execute_ucode_loading(struct amdgpu_device *adev,
> + enum AMDGPU_UCODE_ID ucode_id,
> + uint64_t ucode_gpu_addr,
> + int ucode_size)
> +{
> + struct amdgpu_firmware_info ucode = {
> + .ucode_id = ucode_id,
> + .mc_addr = ucode_gpu_addr,
> + .ucode_size = ucode_size,
> + };
>
> return psp_execute_non_psp_fw_load(&adev->psp, &ucode);
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
> index 2cae0b1a0b8a..93849db18696 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
> @@ -459,8 +459,11 @@ extern int psp_wait_for_spirom_update(struct psp_context *psp, uint32_t reg_inde
> uint32_t field_val, uint32_t mask, uint32_t msec_timeout);
>
> int psp_gpu_reset(struct amdgpu_device *adev);
> -int psp_update_vcn_sram(struct amdgpu_device *adev, int inst_idx,
> - uint64_t cmd_gpu_addr, int cmd_size);
> +
> +int psp_execute_ucode_loading(struct amdgpu_device *adev,
> + enum AMDGPU_UCODE_ID ucode_id,
> + uint64_t ucode_gpu_addr,
> + int ucode_size);
>
> int psp_ta_init_shared_buf(struct psp_context *psp,
> struct ta_mem_context *mem_ctx);
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> index c975aed2f6c7..e89b1e760000 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> @@ -881,9 +881,10 @@ static int vcn_v2_0_start_dpg_mode(struct amdgpu_device *adev, bool indirect)
> UVD_MASTINT_EN__VCPU_EN_MASK, 0, indirect);
>
> if (indirect)
> - psp_update_vcn_sram(adev, 0, adev->vcn.inst->dpg_sram_gpu_addr,
> - (uint32_t)((uintptr_t)adev->vcn.inst->dpg_sram_curr_addr -
> - (uintptr_t)adev->vcn.inst->dpg_sram_cpu_addr));
> + psp_execute_ucode_loading(adev, AMDGPU_UCODE_ID_VCN0_RAM,
> + adev->vcn.inst->dpg_sram_gpu_addr,
> + (uint32_t)((uintptr_t)adev->vcn.inst->dpg_sram_curr_addr -
> + (uintptr_t)adev->vcn.inst->dpg_sram_cpu_addr));
>
> /* force RBC into idle state */
> rb_bufsz = order_base_2(ring->ring_size);
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> index bb1875f926f1..e5df190a79a0 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> @@ -912,9 +912,11 @@ static int vcn_v2_5_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, boo
> UVD_MASTINT_EN__VCPU_EN_MASK, 0, indirect);
>
> if (indirect)
> - psp_update_vcn_sram(adev, inst_idx, adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
> - (uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
> - (uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
> + psp_execute_ucode_loading(adev,
> + inst_idx ? AMDGPU_UCODE_ID_VCN1_RAM : AMDGPU_UCODE_ID_VCN0_RAM,
> + adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
> + (uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
> + (uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
>
> ring = &adev->vcn.inst[inst_idx].ring_dec;
> /* force RBC into idle state */
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
> index c8f63b3c6f69..aa3d7439cd34 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
> @@ -1037,9 +1037,11 @@ static int vcn_v3_0_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, boo
> VCN, inst_idx, mmUVD_VCPU_CNTL), tmp, 0, indirect);
>
> if (indirect)
> - psp_update_vcn_sram(adev, inst_idx, adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
> + psp_execute_ucode_loading(adev,
> + inst_idx ? AMDGPU_UCODE_ID_VCN1_RAM : AMDGPU_UCODE_ID_VCN0_RAM,
> + adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
> (uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
> - (uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
> + (uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
>
> ring = &adev->vcn.inst[inst_idx].ring_dec;
> /* force RBC into idle state */
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
> index 2db73a964031..d0867526e477 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
> @@ -993,9 +993,11 @@ static int vcn_v4_0_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, boo
>
>
> if (indirect)
> - psp_update_vcn_sram(adev, inst_idx, adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
> + psp_execute_ucode_loading(adev,
> + inst_idx ? AMDGPU_UCODE_ID_VCN1_RAM : AMDGPU_UCODE_ID_VCN0_RAM,
> + adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
> (uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
> - (uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
> + (uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
>
> ring = &adev->vcn.inst[inst_idx].ring_enc[0];
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
> index 5d67b8b8a3d6..221a10f0316f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
> @@ -778,9 +778,10 @@ static int vcn_v4_0_3_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, b
> UVD_MASTINT_EN__VCPU_EN_MASK, 0, indirect);
>
> if (indirect)
> - psp_update_vcn_sram(adev, 0, adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
> + psp_execute_ucode_loading(adev, AMDGPU_UCODE_ID_VCN0_RAM,
> + adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
> (uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
> - (uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
> + (uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
>
> ring = &adev->vcn.inst[inst_idx].ring_enc[0];
>
> --
> 2.25.1
>
