aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
index fc39ebbc9d9f..0e72bc09939a 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)
1886} 1886}
1887 1887
1888/** 1888/**
1889 * gfx_v7_0_gpu_init - setup the 3D engine 1889 * gfx_v7_0_constants_init - setup the 3D engine
1890 * 1890 *
1891 * @adev: amdgpu_device pointer 1891 * @adev: amdgpu_device pointer
1892 * 1892 *
1893 * Configures the 3D engine and tiling configuration 1893 * init the gfx constants such as the 3D engine, tiling configuration
1894 * registers so that the 3D engine is usable. 1894 * registers, maximum number of quad pipes, render backends...
1895 */ 1895 */
1896static void gfx_v7_0_gpu_init(struct amdgpu_device *adev) 1896static void gfx_v7_0_constants_init(struct amdgpu_device *adev)
1897{ 1897{
1898 u32 sh_mem_cfg, sh_static_mem_cfg, sh_mem_base; 1898 u32 sh_mem_cfg, sh_static_mem_cfg, sh_mem_base;
1899 u32 tmp; 1899 u32 tmp;
@@ -4516,18 +4516,18 @@ static int gfx_v7_0_sw_init(void *handle)
4516 adev->gfx.mec.num_queue_per_pipe = 8; 4516 adev->gfx.mec.num_queue_per_pipe = 8;
4517 4517
4518 /* EOP Event */ 4518 /* EOP Event */
4519 r = amdgpu_irq_add_id(adev, AMDGPU_IH_CLIENTID_LEGACY, 181, &adev->gfx.eop_irq); 4519 r = amdgpu_irq_add_id(adev, AMDGPU_IRQ_CLIENTID_LEGACY, 181, &adev->gfx.eop_irq);
4520 if (r) 4520 if (r)
4521 return r; 4521 return r;
4522 4522
4523 /* Privileged reg */ 4523 /* Privileged reg */
4524 r = amdgpu_irq_add_id(adev, AMDGPU_IH_CLIENTID_LEGACY, 184, 4524 r = amdgpu_irq_add_id(adev, AMDGPU_IRQ_CLIENTID_LEGACY, 184,
4525 &adev->gfx.priv_reg_irq); 4525 &adev->gfx.priv_reg_irq);
4526 if (r) 4526 if (r)
4527 return r; 4527 return r;
4528 4528
4529 /* Privileged inst */ 4529 /* Privileged inst */
4530 r = amdgpu_irq_add_id(adev, AMDGPU_IH_CLIENTID_LEGACY, 185, 4530 r = amdgpu_irq_add_id(adev, AMDGPU_IRQ_CLIENTID_LEGACY, 185,
4531 &adev->gfx.priv_inst_irq); 4531 &adev->gfx.priv_inst_irq);
4532 if (r) 4532 if (r)
4533 return r; 4533 return r;
@@ -4624,7 +4624,7 @@ static int gfx_v7_0_hw_init(void *handle)
4624 int r; 4624 int r;
4625 struct amdgpu_device *adev = (struct amdgpu_device *)handle; 4625 struct amdgpu_device *adev = (struct amdgpu_device *)handle;
4626 4626
4627 gfx_v7_0_gpu_init(adev); 4627 gfx_v7_0_constants_init(adev);
4628 4628
4629 /* init rlc */ 4629 /* init rlc */
4630 r = gfx_v7_0_rlc_resume(adev); 4630 r = gfx_v7_0_rlc_resume(adev);