[PATCH 2/5] drm/amdgpu: Remove amdgpu_ucode_fini_bo

[Alex Deucher]

On Tue, Oct 9, 2018 at 8:44 AM Rex Zhu <Rex.Zhu at amd.com> wrote:
>
> The variable clean is unnecessary.
>
> Signed-off-by: Rex Zhu <Rex.Zhu at amd.com>

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c       |  2 --
>  drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c     | 19 -------------------
>  drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h     |  3 +--
>  drivers/gpu/drm/amd/powerplay/amd_powerplay.c |  3 ---
>  4 files changed, 1 insertion(+), 26 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> index bd397d2..25d2f3e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> @@ -452,8 +452,6 @@ static int psp_hw_fini(void *handle)
>         if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP)
>                 return 0;
>
> -       amdgpu_ucode_fini_bo(adev);
> -
>         psp_ring_destroy(psp, PSP_RING_TYPE__KM);
>
>         amdgpu_bo_free_kernel(&psp->tmr_bo, &psp->tmr_mc_addr, &psp->tmr_buf);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
> index 7b6b2f4c..f2604ac 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
> @@ -489,22 +489,3 @@ int amdgpu_ucode_init_bo(struct amdgpu_device *adev)
>         }
>         return 0;
>  }
> -
> -int amdgpu_ucode_fini_bo(struct amdgpu_device *adev)
> -{
> -       int i;
> -       struct amdgpu_firmware_info *ucode = NULL;
> -
> -       if (!adev->firmware.fw_size)
> -               return 0;
> -
> -       for (i = 0; i < adev->firmware.max_ucodes; i++) {
> -               ucode = &adev->firmware.ucode[i];
> -               if (ucode->fw) {
> -                       ucode->mc_addr = 0;
> -                       ucode->kaddr = NULL;
> -               }
> -       }
> -
> -       return 0;
> -}
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h
> index 4c0e5be..05a2c46 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h
> @@ -276,9 +276,8 @@ struct amdgpu_firmware {
>  int amdgpu_ucode_validate(const struct firmware *fw);
>  bool amdgpu_ucode_hdr_version(union amdgpu_firmware_header *hdr,
>                                 uint16_t hdr_major, uint16_t hdr_minor);
> -int amdgpu_ucode_init_bo(struct amdgpu_device *adev);
> -int amdgpu_ucode_fini_bo(struct amdgpu_device *adev);
>
> +int amdgpu_ucode_init_bo(struct amdgpu_device *adev);
>  void amdgpu_ucode_create_bo(struct amdgpu_device *adev);
>  void amdgpu_ucode_free_bo(struct amdgpu_device *adev);
>
> diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
> index 6bc8e9c..75b56ae 100644
> --- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
> +++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
> @@ -109,9 +109,6 @@ static int pp_sw_fini(void *handle)
>
>         hwmgr_sw_fini(hwmgr);
>
> -       if (adev->firmware.load_type == AMDGPU_FW_LOAD_SMU)
> -               amdgpu_ucode_fini_bo(adev);
> -
>         release_firmware(adev->pm.fw);
>         adev->pm.fw = NULL;
>
> --
> 1.9.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx