[PATCH v2 2/5] drm/amdgpu: update the handle ptr in late_init
Christian König
ckoenig.leichtzumerken at gmail.com
Mon Sep 30 10:28:36 UTC 2024
Am 27.09.24 um 17:00 schrieb Sunil Khatri:
> Update the ptr handle to amdgpu_ip_block ptr in all
> the functions of late_init function ptr.
>
> Signed-off-by: Sunil Khatri <sunil.khatri at amd.com>
Apart from a few minor comments on patch #1 the whole series is
Reviewed-by: Christian König <christian.koenig at amd.com>
Regards,
Christian.
> ---
> drivers/gpu/drm/amd/amdgpu/aldebaran.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 10 +++++-----
> drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/nv.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/soc15.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/soc21.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/soc24.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/vi.c | 4 ++--
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++--
> drivers/gpu/drm/amd/include/amd_shared.h | 2 +-
> drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c | 4 ++--
> drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 4 ++--
> drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 4 ++--
> drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 6 +++---
> 34 files changed, 67 insertions(+), 67 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/aldebaran.c b/drivers/gpu/drm/amd/amdgpu/aldebaran.c
> index 98fb0ba4f9cb..574aeca993e8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/aldebaran.c
> +++ b/drivers/gpu/drm/amd/amdgpu/aldebaran.c
> @@ -304,7 +304,7 @@ static int aldebaran_mode2_restore_ip(struct amdgpu_device *adev)
>
> if (adev->ip_blocks[i].version->funcs->late_init) {
> r = adev->ip_blocks[i].version->funcs->late_init(
> - (void *)adev);
> + &adev->ip_blocks[i]);
> if (r) {
> dev_err(adev->dev,
> "late_init of IP block <%s> failed %d after reset\n",
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 5aeea2aed323..e6e98b189072 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -3196,7 +3196,7 @@ static int amdgpu_device_ip_late_init(struct amdgpu_device *adev)
> if (!adev->ip_blocks[i].status.hw)
> continue;
> if (adev->ip_blocks[i].version->funcs->late_init) {
> - r = adev->ip_blocks[i].version->funcs->late_init((void *)adev);
> + r = adev->ip_blocks[i].version->funcs->late_init(&adev->ip_blocks[i]);
> if (r) {
> DRM_ERROR("late_init of IP block <%s> failed %d\n",
> adev->ip_blocks[i].version->funcs->name, r);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c
> index d7e377341367..74b1ec10be2c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c
> @@ -784,9 +784,9 @@ static int umsch_mm_early_init(struct amdgpu_ip_block *ip_block)
> return 0;
> }
>
> -static int umsch_mm_late_init(void *handle)
> +static int umsch_mm_late_init(struct amdgpu_ip_block *ip_block)
> {
> - struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> + struct amdgpu_device *adev = ip_block->adev;
>
> if (amdgpu_in_reset(adev) || adev->in_s0ix || adev->in_suspend)
> return 0;
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> index 3d0969a7ba69..8008dbd24967 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> @@ -7722,9 +7722,9 @@ static int gfx_v10_0_early_init(struct amdgpu_ip_block *ip_block)
> return gfx_v10_0_init_microcode(adev);
> }
>
> -static int gfx_v10_0_late_init(void *handle)
> +static int gfx_v10_0_late_init(struct amdgpu_ip_block *ip_block)
> {
> - struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> + struct amdgpu_device *adev = ip_block->adev;
> int r;
>
> r = amdgpu_irq_get(adev, &adev->gfx.priv_reg_irq, 0);
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
> index 690cd7b173f7..a1718c52ed18 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
> @@ -5020,9 +5020,9 @@ static int gfx_v11_0_early_init(struct amdgpu_ip_block *ip_block)
> return gfx_v11_0_init_microcode(adev);
> }
>
> -static int gfx_v11_0_late_init(void *handle)
> +static int gfx_v11_0_late_init(struct amdgpu_ip_block *ip_block)
> {
> - struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> + struct amdgpu_device *adev = ip_block->adev;
> int r;
>
> r = amdgpu_irq_get(adev, &adev->gfx.priv_reg_irq, 0);
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
> index 6423b20e9156..e3951a548726 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
> @@ -3717,9 +3717,9 @@ static int gfx_v12_0_early_init(struct amdgpu_ip_block *ip_block)
> return gfx_v12_0_init_microcode(adev);
> }
>
> -static int gfx_v12_0_late_init(void *handle)
> +static int gfx_v12_0_late_init(struct amdgpu_ip_block *ip_block)
> {
> - struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> + struct amdgpu_device *adev = ip_block->adev;
> int r;
>
> r = amdgpu_irq_get(adev, &adev->gfx.priv_reg_irq, 0);
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
> index 3babf5b5a9dd..73404f24667f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
> @@ -4151,9 +4151,9 @@ static int gfx_v7_0_early_init(struct amdgpu_ip_block *ip_block)
> return 0;
> }
>
> -static int gfx_v7_0_late_init(void *handle)
> +static int gfx_v7_0_late_init(struct amdgpu_ip_block *ip_block)
> {
> - struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> + struct amdgpu_device *adev = ip_block->adev;
> int r;
>
> r = amdgpu_irq_get(adev, &adev->gfx.priv_reg_irq, 0);
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> index e80e071f193c..9778b89c7125 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> @@ -5271,9 +5271,9 @@ static int gfx_v8_0_early_init(struct amdgpu_ip_block *ip_block)
> return 0;
> }
>
> -static int gfx_v8_0_late_init(void *handle)
> +static int gfx_v8_0_late_init(struct amdgpu_ip_block *ip_block)
> {
> - struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> + struct amdgpu_device *adev = ip_block->adev;
> int r;
>
> r = amdgpu_irq_get(adev, &adev->gfx.priv_reg_irq, 0);
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> index 8c98511144b2..5ae2b63c375c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> @@ -4792,9 +4792,9 @@ static int gfx_v9_0_early_init(struct amdgpu_ip_block *ip_block)
> return gfx_v9_0_init_microcode(adev);
> }
>
> -static int gfx_v9_0_ecc_late_init(void *handle)
> +static int gfx_v9_0_ecc_late_init(struct amdgpu_ip_block *ip_block)
> {
> - struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> + struct amdgpu_device *adev = ip_block->adev;
> int r;
>
> /*
> @@ -4826,9 +4826,9 @@ static int gfx_v9_0_ecc_late_init(void *handle)
> return 0;
> }
>
> -static int gfx_v9_0_late_init(void *handle)
> +static int gfx_v9_0_late_init(struct amdgpu_ip_block *ip_block)
> {
> - struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> + struct amdgpu_device *adev = ip_block->adev;
> int r;
>
> r = amdgpu_irq_get(adev, &adev->gfx.priv_reg_irq, 0);
> @@ -4843,7 +4843,7 @@ static int gfx_v9_0_late_init(void *handle)
> if (r)
> return r;
>
> - r = gfx_v9_0_ecc_late_init(handle);
> + r = gfx_v9_0_ecc_late_init(ip_block);
> if (r)
> return r;
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
> index 0dee2102d759..511bfa7a8bab 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
> @@ -2529,9 +2529,9 @@ static int gfx_v9_4_3_early_init(struct amdgpu_ip_block *ip_block)
> return gfx_v9_4_3_init_microcode(adev);
> }
>
> -static int gfx_v9_4_3_late_init(void *handle)
> +static int gfx_v9_4_3_late_init(struct amdgpu_ip_block *ip_block)
> {
> - struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> + struct amdgpu_device *adev = ip_block->adev;
> int r;
>
> r = amdgpu_irq_get(adev, &adev->gfx.priv_reg_irq, 0);
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> index f54f9bb89bca..ceb870d2ef13 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> @@ -651,9 +651,9 @@ static int gmc_v10_0_early_init(struct amdgpu_ip_block *ip_block)
> return 0;
> }
>
> -static int gmc_v10_0_late_init(void *handle)
> +static int gmc_v10_0_late_init(struct amdgpu_ip_block *ip_block)
> {
> - struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> + struct amdgpu_device *adev = ip_block->adev;
> int r;
>
> r = amdgpu_gmc_allocate_vm_inv_eng(adev);
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c
> index 32dec30722ac..653b2e70b983 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c
> @@ -622,9 +622,9 @@ static int gmc_v11_0_early_init(struct amdgpu_ip_block *ip_block)
> return 0;
> }
>
> -static int gmc_v11_0_late_init(void *handle)
> +static int gmc_v11_0_late_init(struct amdgpu_ip_block *ip_block)
> {
> - struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> + struct amdgpu_device *adev = ip_block->adev;
> int r;
>
> r = amdgpu_gmc_allocate_vm_inv_eng(adev);
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c
> index e0d3d865a59a..3e126ebe7a8d 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c
> @@ -624,9 +624,9 @@ static int gmc_v12_0_early_init(struct amdgpu_ip_block *ip_block)
> return 0;
> }
>
> -static int gmc_v12_0_late_init(void *handle)
> +static int gmc_v12_0_late_init(struct amdgpu_ip_block *ip_block)
> {
> - struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> + struct amdgpu_device *adev = ip_block->adev;
> int r;
>
> r = amdgpu_gmc_allocate_vm_inv_eng(adev);
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> index 3a524319f31e..321d3828cb11 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> @@ -772,9 +772,9 @@ static int gmc_v6_0_early_init(struct amdgpu_ip_block *ip_block)
> return 0;
> }
>
> -static int gmc_v6_0_late_init(void *handle)
> +static int gmc_v6_0_late_init(struct amdgpu_ip_block *ip_block)
> {
> - struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> + struct amdgpu_device *adev = ip_block->adev;
>
> if (amdgpu_vm_fault_stop != AMDGPU_VM_FAULT_STOP_ALWAYS)
> return amdgpu_irq_get(adev, &adev->gmc.vm_fault, 0);
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
> index 489b3c2ab660..993e2db4eb13 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
> @@ -940,9 +940,9 @@ static int gmc_v7_0_early_init(struct amdgpu_ip_block *ip_block)
> return 0;
> }
>
> -static int gmc_v7_0_late_init(void *handle)
> +static int gmc_v7_0_late_init(struct amdgpu_ip_block *ip_block)
> {
> - struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> + struct amdgpu_device *adev = ip_block->adev;
>
> if (amdgpu_vm_fault_stop != AMDGPU_VM_FAULT_STOP_ALWAYS)
> return amdgpu_irq_get(adev, &adev->gmc.vm_fault, 0);
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
> index d564b1d8c828..784289ca27e0 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
> @@ -1046,9 +1046,9 @@ static int gmc_v8_0_early_init(struct amdgpu_ip_block *ip_block)
> return 0;
> }
>
> -static int gmc_v8_0_late_init(void *handle)
> +static int gmc_v8_0_late_init(struct amdgpu_ip_block *ip_block)
> {
> - struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> + struct amdgpu_device *adev = ip_block->adev;
>
> if (amdgpu_vm_fault_stop != AMDGPU_VM_FAULT_STOP_ALWAYS)
> return amdgpu_irq_get(adev, &adev->gmc.vm_fault, 0);
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> index f274acdc49bc..73b6bf1b1432 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> @@ -1601,9 +1601,9 @@ static int gmc_v9_0_early_init(struct amdgpu_ip_block *ip_block)
> return 0;
> }
>
> -static int gmc_v9_0_late_init(void *handle)
> +static int gmc_v9_0_late_init(struct amdgpu_ip_block *ip_block)
> {
> - struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> + struct amdgpu_device *adev = ip_block->adev;
> int r;
>
> r = amdgpu_gmc_allocate_vm_inv_eng(adev);
> diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
> index d476cf771bbe..62da96fd7e8a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
> @@ -1669,9 +1669,9 @@ static int mes_v11_0_early_init(struct amdgpu_ip_block *ip_block)
> return 0;
> }
>
> -static int mes_v11_0_late_init(void *handle)
> +static int mes_v11_0_late_init(struct amdgpu_ip_block *ip_block)
> {
> - struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> + struct amdgpu_device *adev = ip_block->adev;
>
> /* it's only intended for use in mes_self_test case, not for s0ix and reset */
> if (!amdgpu_in_reset(adev) && !adev->in_s0ix && !adev->in_suspend &&
> diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c b/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c
> index a490d0e2c2cb..ae6afe3cfc9f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c
> @@ -1631,9 +1631,9 @@ static int mes_v12_0_early_init(struct amdgpu_ip_block *ip_block)
> return 0;
> }
>
> -static int mes_v12_0_late_init(void *handle)
> +static int mes_v12_0_late_init(struct amdgpu_ip_block *ip_block)
> {
> - struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> + struct amdgpu_device *adev = ip_block->adev;
>
> /* it's only intended for use in mes_self_test case, not for s0ix and reset */
> if (!amdgpu_in_reset(adev) && !adev->in_s0ix && !adev->in_suspend)
> diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
> index 63a3c725ceb9..f102063dc83c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/nv.c
> +++ b/drivers/gpu/drm/amd/amdgpu/nv.c
> @@ -944,9 +944,9 @@ static int nv_common_early_init(struct amdgpu_ip_block *ip_block)
> return 0;
> }
>
> -static int nv_common_late_init(void *handle)
> +static int nv_common_late_init(struct amdgpu_ip_block *ip_block)
> {
> - struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> + struct amdgpu_device *adev = ip_block->adev;
>
> if (amdgpu_sriov_vf(adev)) {
> xgpu_nv_mailbox_get_irq(adev);
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> index cb5f84104717..acf00311547d 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> @@ -1780,9 +1780,9 @@ static int sdma_v4_0_process_ras_data_cb(struct amdgpu_device *adev,
> void *err_data,
> struct amdgpu_iv_entry *entry);
>
> -static int sdma_v4_0_late_init(void *handle)
> +static int sdma_v4_0_late_init(struct amdgpu_ip_block *ip_block)
> {
> - struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> + struct amdgpu_device *adev = ip_block->adev;
>
> sdma_v4_0_setup_ulv(adev);
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
> index c7c4456586cc..45a1fa0c2c94 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
> @@ -1318,9 +1318,9 @@ static int sdma_v4_4_2_process_ras_data_cb(struct amdgpu_device *adev,
> struct amdgpu_iv_entry *entry);
> #endif
>
> -static int sdma_v4_4_2_late_init(void *handle)
> +static int sdma_v4_4_2_late_init(struct amdgpu_ip_block *ip_block)
> {
> - struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> + struct amdgpu_device *adev = ip_block->adev;
> #if 0
> struct ras_ih_if ih_info = {
> .cb = sdma_v4_4_2_process_ras_data_cb,
> diff --git a/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c b/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c
> index 481217c32d85..bda786d6caca 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c
> @@ -213,7 +213,7 @@ static int sienna_cichlid_mode2_restore_ip(struct amdgpu_device *adev)
>
> if (adev->ip_blocks[i].version->funcs->late_init) {
> r = adev->ip_blocks[i].version->funcs->late_init(
> - (void *)adev);
> + &adev->ip_blocks[i]);
> if (r) {
> dev_err(adev->dev,
> "late_init of IP block <%s> failed %d after reset\n",
> diff --git a/drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c b/drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c
> index 0af648931df5..e0c051818b5b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c
> +++ b/drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c
> @@ -208,7 +208,7 @@ static int smu_v13_0_10_mode2_restore_ip(struct amdgpu_device *adev)
>
> if (adev->ip_blocks[i].version->funcs->late_init) {
> r = adev->ip_blocks[i].version->funcs->late_init(
> - (void *)adev);
> + &adev->ip_blocks[i]);
> if (r) {
> dev_err(adev->dev,
> "late_init of IP block <%s> failed %d after reset\n",
> diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
> index e1161027ec3b..1a24634a100c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/soc15.c
> +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
> @@ -1202,9 +1202,9 @@ static int soc15_common_early_init(struct amdgpu_ip_block *ip_block)
> return 0;
> }
>
> -static int soc15_common_late_init(void *handle)
> +static int soc15_common_late_init(struct amdgpu_ip_block *ip_block)
> {
> - struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> + struct amdgpu_device *adev = ip_block->adev;
>
> if (amdgpu_sriov_vf(adev))
> xgpu_ai_mailbox_get_irq(adev);
> diff --git a/drivers/gpu/drm/amd/amdgpu/soc21.c b/drivers/gpu/drm/amd/amdgpu/soc21.c
> index c9e88cd4349a..bc420ff85174 100644
> --- a/drivers/gpu/drm/amd/amdgpu/soc21.c
> +++ b/drivers/gpu/drm/amd/amdgpu/soc21.c
> @@ -794,9 +794,9 @@ static int soc21_common_early_init(struct amdgpu_ip_block *ip_block)
> return 0;
> }
>
> -static int soc21_common_late_init(void *handle)
> +static int soc21_common_late_init(struct amdgpu_ip_block *ip_block)
> {
> - struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> + struct amdgpu_device *adev = ip_block->adev;
>
> if (amdgpu_sriov_vf(adev)) {
> xgpu_nv_mailbox_get_irq(adev);
> diff --git a/drivers/gpu/drm/amd/amdgpu/soc24.c b/drivers/gpu/drm/amd/amdgpu/soc24.c
> index 3dcb3d953509..12ed243a2df8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/soc24.c
> +++ b/drivers/gpu/drm/amd/amdgpu/soc24.c
> @@ -440,9 +440,9 @@ static int soc24_common_early_init(struct amdgpu_ip_block *ip_block)
> return 0;
> }
>
> -static int soc24_common_late_init(void *handle)
> +static int soc24_common_late_init(struct amdgpu_ip_block *ip_block)
> {
> - struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> + struct amdgpu_device *adev = ip_block->adev;
>
> if (amdgpu_sriov_vf(adev))
> xgpu_nv_mailbox_get_irq(adev);
> diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
> index c9ee4491ba64..ababcb7bc834 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vi.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vi.c
> @@ -1679,9 +1679,9 @@ static int vi_common_early_init(struct amdgpu_ip_block *ip_block)
> return 0;
> }
>
> -static int vi_common_late_init(void *handle)
> +static int vi_common_late_init(struct amdgpu_ip_block *ip_block)
> {
> - struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> + struct amdgpu_device *adev = ip_block->adev;
>
> if (amdgpu_sriov_vf(adev))
> xgpu_vi_mailbox_get_irq(adev);
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index 6972a8e2e0f2..f3b11f600670 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -2591,9 +2591,9 @@ static int detect_mst_link_for_all_connectors(struct drm_device *dev)
> return ret;
> }
>
> -static int dm_late_init(void *handle)
> +static int dm_late_init(struct amdgpu_ip_block *ip_block)
> {
> - struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> + struct amdgpu_device *adev = ip_block->adev;
>
> struct dmcu_iram_parameters params;
> unsigned int linear_lut[16];
> diff --git a/drivers/gpu/drm/amd/include/amd_shared.h b/drivers/gpu/drm/amd/include/amd_shared.h
> index 67d75ac339bf..8d486b018441 100644
> --- a/drivers/gpu/drm/amd/include/amd_shared.h
> +++ b/drivers/gpu/drm/amd/include/amd_shared.h
> @@ -380,7 +380,7 @@ struct amdgpu_ip_block;
> struct amd_ip_funcs {
> char *name;
> int (*early_init)(struct amdgpu_ip_block *ip_block);
> - int (*late_init)(void *handle);
> + int (*late_init)(struct amdgpu_ip_block *ip_block);
> int (*sw_init)(void *handle);
> int (*sw_fini)(void *handle);
> int (*early_fini)(void *handle);
> diff --git a/drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c b/drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c
> index ff71af96eb1a..adb44b5a9e42 100644
> --- a/drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c
> +++ b/drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c
> @@ -2965,10 +2965,10 @@ static int kv_dpm_early_init(struct amdgpu_ip_block *ip_block)
> return 0;
> }
>
> -static int kv_dpm_late_init(void *handle)
> +static int kv_dpm_late_init(struct amdgpu_ip_block *ip_block)
> {
> /* powerdown unused blocks for now */
> - struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> + struct amdgpu_device *adev = ip_block->adev;
>
> if (!adev->pm.dpm_enabled)
> return 0;
> diff --git a/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c b/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c
> index 5aa4eca21708..51cdaf040020 100644
> --- a/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c
> +++ b/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c
> @@ -7621,10 +7621,10 @@ static int si_dpm_process_interrupt(struct amdgpu_device *adev,
> return 0;
> }
>
> -static int si_dpm_late_init(void *handle)
> +static int si_dpm_late_init(struct amdgpu_ip_block *ip_block)
> {
> int ret;
> - struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> + struct amdgpu_device *adev = ip_block->adev;
>
> if (!adev->pm.dpm_enabled)
> return 0;
> diff --git a/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c
> index 2af325b9fc19..903c19b4af20 100644
> --- a/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c
> +++ b/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c
> @@ -216,9 +216,9 @@ static void pp_reserve_vram_for_smu(struct amdgpu_device *adev)
> }
> }
>
> -static int pp_late_init(void *handle)
> +static int pp_late_init(struct amdgpu_ip_block *ip_block)
> {
> - struct amdgpu_device *adev = handle;
> + struct amdgpu_device *adev = ip_block->adev;
> struct pp_hwmgr *hwmgr = adev->powerplay.pp_handle;
>
> if (hwmgr && hwmgr->pm_en)
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> index ba09dde79499..a1cd8c90a1ec 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> @@ -826,9 +826,9 @@ static int smu_apply_default_config_table_settings(struct smu_context *smu)
> return smu_set_config_table(smu, &adev->pm.config_table);
> }
>
> -static int smu_late_init(void *handle)
> +static int smu_late_init(struct amdgpu_ip_block *ip_block)
> {
> - struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> + struct amdgpu_device *adev = ip_block->adev;
> struct smu_context *smu = adev->powerplay.pp_handle;
> int ret = 0;
>
> @@ -2063,7 +2063,7 @@ static int smu_reset(struct smu_context *smu)
> if (ret)
> return ret;
>
> - ret = smu_late_init(adev);
> + ret = smu_late_init(&adev->ip_blocks[AMD_IP_BLOCK_TYPE_SMC]);
> if (ret)
> return ret;
>
More information about the amd-gfx
mailing list