On Tue, Aug 28, 2018 at 6:26 AM Rex Zhu <Rex.Zhu at amd.com> wrote:
>
> change function name gfx_v6/7/8/9_0_gpu_init to
> gfx_v6/7/8/9_0_constants_init.
> this function is just for init gfx constants such
> as max pipes, render backends...
>
> Signed-off-by: Rex Zhu <Rex.Zhu at amd.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 10 +++++-----
> drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 ++--
> 4 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
> index de184a8..95d916f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
> @@ -1552,7 +1552,7 @@ static void gfx_v6_0_config_init(struct amdgpu_device *adev)
> adev->gfx.config.double_offchip_lds_buf = 0;
> }
>
> -static void gfx_v6_0_gpu_init(struct amdgpu_device *adev)
> +static void gfx_v6_0_constants_init(struct amdgpu_device *adev)
> {
> u32 gb_addr_config = 0;
> u32 mc_shared_chmap, mc_arb_ramcfg;
> @@ -3175,7 +3175,7 @@ static int gfx_v6_0_hw_init(void *handle)
> int r;
> struct amdgpu_device *adev = (struct amdgpu_device *)handle;
>
> - gfx_v6_0_gpu_init(adev);
> + gfx_v6_0_constants_init(adev);
>
> r = gfx_v6_0_rlc_resume(adev);
> if (r)
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
> index a15d9c0..43dbfe9 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
> @@ -1886,14 +1886,14 @@ static void gfx_v7_0_config_init(struct amdgpu_device *adev)
> }
>
> /**
> - * gfx_v7_0_gpu_init - setup the 3D engine
> + * gfx_v7_0_constants_init - setup the 3D engine
> *
> * @adev: amdgpu_device pointer
> *
> - * Configures the 3D engine and tiling configuration
> - * registers so that the 3D engine is usable.
> + * init the gfx constants such as the 3D engine, tiling configuration
> + * registers, maximum number of quad pipes, render backends...
> */
> -static void gfx_v7_0_gpu_init(struct amdgpu_device *adev)
> +static void gfx_v7_0_constants_init(struct amdgpu_device *adev)
> {
> u32 sh_mem_cfg, sh_static_mem_cfg, sh_mem_base;
> u32 tmp;
> @@ -4652,7 +4652,7 @@ static int gfx_v7_0_hw_init(void *handle)
> int r;
> struct amdgpu_device *adev = (struct amdgpu_device *)handle;
>
> - gfx_v7_0_gpu_init(adev);
> + gfx_v7_0_constants_init(adev);
>
> /* init rlc */
> r = gfx_v7_0_rlc_resume(adev);
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> index 3882689..ff12ef4 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> @@ -3854,7 +3854,7 @@ static void gfx_v8_0_config_init(struct amdgpu_device *adev)
> }
> }
>
> -static void gfx_v8_0_gpu_init(struct amdgpu_device *adev)
> +static void gfx_v8_0_constants_init(struct amdgpu_device *adev)
> {
> u32 tmp, sh_static_mem_cfg;
> int i;
> @@ -5058,7 +5058,7 @@ static int gfx_v8_0_hw_init(void *handle)
> struct amdgpu_device *adev = (struct amdgpu_device *)handle;
>
> gfx_v8_0_init_golden_registers(adev);
> - gfx_v8_0_gpu_init(adev);
> + gfx_v8_0_constants_init(adev);
>
> r = gfx_v8_0_rlc_resume(adev);
> if (r)
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> index 3594704a..cde8cc3 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> @@ -1817,7 +1817,7 @@ static void gfx_v9_0_init_compute_vmid(struct amdgpu_device *adev)
> mutex_unlock(&adev->srbm_mutex);
> }
>
> -static void gfx_v9_0_gpu_init(struct amdgpu_device *adev)
> +static void gfx_v9_0_constants_init(struct amdgpu_device *adev)
> {
> u32 tmp;
> int i;
> @@ -3205,7 +3205,7 @@ static int gfx_v9_0_hw_init(void *handle)
>
> gfx_v9_0_init_golden_registers(adev);
>
> - gfx_v9_0_gpu_init(adev);
> + gfx_v9_0_constants_init(adev);
>
> r = gfx_v9_0_csb_vram_pin(adev);
> if (r)
> --
> 1.9.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
