On Mon, Nov 16, 2020 at 9:51 AM Hawking Zhang <Hawking.Zhang@xxxxxxx> wrote:
>
> Those functions should be invoked through gfxhub.funcs
> pointer.
>
> Signed-off-by: Hawking Zhang <Hawking.Zhang@xxxxxxx>
Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx>
> ---
> drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 17 +++++++++--------
> drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h | 10 +---------
> 2 files changed, 10 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
> index d83577b..6ddd53b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
> @@ -31,13 +31,14 @@
>
> #include "soc15_common.h"
>
> -u64 gfxhub_v1_0_get_mc_fb_offset(struct amdgpu_device *adev)
> +static u64 gfxhub_v1_0_get_mc_fb_offset(struct amdgpu_device *adev)
> {
> return (u64)RREG32_SOC15(GC, 0, mmMC_VM_FB_OFFSET) << 24;
> }
>
> -void gfxhub_v1_0_setup_vm_pt_regs(struct amdgpu_device *adev, uint32_t vmid,
> - uint64_t page_table_base)
> +static void gfxhub_v1_0_setup_vm_pt_regs(struct amdgpu_device *adev,
> + uint32_t vmid,
> + uint64_t page_table_base)
> {
> struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_GFXHUB_0];
>
> @@ -275,7 +276,7 @@ static void gfxhub_v1_0_program_invalidation(struct amdgpu_device *adev)
> }
> }
>
> -int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)
> +static int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)
> {
> if (amdgpu_sriov_vf(adev) && adev->asic_type != CHIP_ARCTURUS) {
> /*
> @@ -305,7 +306,7 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)
> return 0;
> }
>
> -void gfxhub_v1_0_gart_disable(struct amdgpu_device *adev)
> +static void gfxhub_v1_0_gart_disable(struct amdgpu_device *adev)
> {
> struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_GFXHUB_0];
> u32 tmp;
> @@ -336,8 +337,8 @@ void gfxhub_v1_0_gart_disable(struct amdgpu_device *adev)
> * @adev: amdgpu_device pointer
> * @value: true redirects VM faults to the default page
> */
> -void gfxhub_v1_0_set_fault_enable_default(struct amdgpu_device *adev,
> - bool value)
> +static void gfxhub_v1_0_set_fault_enable_default(struct amdgpu_device *adev,
> + bool value)
> {
> u32 tmp;
> tmp = RREG32_SOC15(GC, 0, mmVM_L2_PROTECTION_FAULT_CNTL);
> @@ -374,7 +375,7 @@ void gfxhub_v1_0_set_fault_enable_default(struct amdgpu_device *adev,
> WREG32_SOC15(GC, 0, mmVM_L2_PROTECTION_FAULT_CNTL, tmp);
> }
>
> -void gfxhub_v1_0_init(struct amdgpu_device *adev)
> +static void gfxhub_v1_0_init(struct amdgpu_device *adev)
> {
> struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_GFXHUB_0];
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h
> index 0c46672..3174bc5 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h
> +++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h
> @@ -24,14 +24,6 @@
> #ifndef __GFXHUB_V1_0_H__
> #define __GFXHUB_V1_0_H__
>
> -int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev);
> -void gfxhub_v1_0_gart_disable(struct amdgpu_device *adev);
> -void gfxhub_v1_0_set_fault_enable_default(struct amdgpu_device *adev,
> - bool value);
> -void gfxhub_v1_0_init(struct amdgpu_device *adev);
> -u64 gfxhub_v1_0_get_mc_fb_offset(struct amdgpu_device *adev);
> -void gfxhub_v1_0_setup_vm_pt_regs(struct amdgpu_device *adev, uint32_t vmid,
> - uint64_t page_table_base);
> -
> extern const struct amdgpu_gfxhub_funcs gfxhub_v1_0_funcs;
> +
> #endif
> --
> 2.7.4
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
