[PATCH] drm/amdgpu/amdkfd: clean up mmhub and gfxhub includes

[Alex Deucher]

On Mon, Oct 22, 2018 at 6:25 PM Alex Deucher <alexdeucher at gmail.com> wrote:
>
> Use the appropriate mmhub and gfxhub headers rather than adding
> them to the gmc9 header.
>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

Ping?

Alex

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 3 ++-
>  drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h          | 2 ++
>  drivers/gpu/drm/amd/amdgpu/gmc_v9_0.h             | 6 ------
>  drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h           | 2 ++
>  4 files changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> index 54c369091f6c..02d1d363931b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> @@ -46,7 +46,8 @@
>  #include "v9_structs.h"
>  #include "soc15.h"
>  #include "soc15d.h"
> -#include "gmc_v9_0.h"
> +#include "mmhub_v1_0.h"
> +#include "gfxhub_v1_0.h"
>
>  /* HACK: MMHUB and GC both have VM-related register with the same
>   * names but different offsets. Define the MMHUB register we need here
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h
> index 206e29cad753..92d3a70cd9b1 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h
> +++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h
> @@ -30,5 +30,7 @@ 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);
>
>  #endif
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.h b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.h
> index 1fd178a65e66..b030ca5ea107 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.h
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.h
> @@ -27,10 +27,4 @@
>  extern const struct amd_ip_funcs gmc_v9_0_ip_funcs;
>  extern const struct amdgpu_ip_block_version gmc_v9_0_ip_block;
>
> -/* amdgpu_amdkfd*.c */
> -void gfxhub_v1_0_setup_vm_pt_regs(struct amdgpu_device *adev, uint32_t vmid,
> -                               uint64_t page_table_base);
> -void mmhub_v1_0_setup_vm_pt_regs(struct amdgpu_device *adev, uint32_t vmid,
> -                               uint64_t page_table_base);
> -
>  #endif
> diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h
> index bef3d0c0c117..0de0fdf98c00 100644
> --- a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h
> +++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h
> @@ -34,5 +34,7 @@ int mmhub_v1_0_set_clockgating(struct amdgpu_device *adev,
>  void mmhub_v1_0_get_clockgating(struct amdgpu_device *adev, u32 *flags);
>  void mmhub_v1_0_update_power_gating(struct amdgpu_device *adev,
>                                  bool enable);
> +void mmhub_v1_0_setup_vm_pt_regs(struct amdgpu_device *adev, uint32_t vmid,
> +                               uint64_t page_table_base);
>
>  #endif
> --
> 2.13.6
>