diff options
author | Likun Gao <Likun.Gao@amd.com> | 2018-11-08 00:43:46 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-11-09 16:29:02 -0500 |
commit | 88dfc9a3dd47027c9ffc831635e5cf4e8ed3b781 (patch) | |
tree | af39f500da7c656ab14c92fed89e4a0e5aefa8fb /drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | |
parent | fdb81fd788a732b5efda8638be3fe159550b032d (diff) |
drm/amdgpu: separate amdgpu_rlc into a single file
Separate the function and struct of RLC from the file of GFX.
Abstract the function of amdgpu_gfx_rlc_fini.
Signed-off-by: Likun Gao <Likun.Gao@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c index 7dbcb2ea20fd..81a308bac230 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | |||
@@ -1348,12 +1348,6 @@ static void cz_init_cp_jump_table(struct amdgpu_device *adev) | |||
1348 | } | 1348 | } |
1349 | } | 1349 | } |
1350 | 1350 | ||
1351 | static void gfx_v8_0_rlc_fini(struct amdgpu_device *adev) | ||
1352 | { | ||
1353 | amdgpu_bo_free_kernel(&adev->gfx.rlc.clear_state_obj, NULL, NULL); | ||
1354 | amdgpu_bo_free_kernel(&adev->gfx.rlc.cp_table_obj, NULL, NULL); | ||
1355 | } | ||
1356 | |||
1357 | static int gfx_v8_0_rlc_init(struct amdgpu_device *adev) | 1351 | static int gfx_v8_0_rlc_init(struct amdgpu_device *adev) |
1358 | { | 1352 | { |
1359 | volatile u32 *dst_ptr; | 1353 | volatile u32 *dst_ptr; |
@@ -1376,7 +1370,7 @@ static int gfx_v8_0_rlc_init(struct amdgpu_device *adev) | |||
1376 | (void **)&adev->gfx.rlc.cs_ptr); | 1370 | (void **)&adev->gfx.rlc.cs_ptr); |
1377 | if (r) { | 1371 | if (r) { |
1378 | dev_warn(adev->dev, "(%d) create RLC c bo failed\n", r); | 1372 | dev_warn(adev->dev, "(%d) create RLC c bo failed\n", r); |
1379 | adev->gfx.rlc.funcs->fini(adev); | 1373 | amdgpu_gfx_rlc_fini(adev); |
1380 | return r; | 1374 | return r; |
1381 | } | 1375 | } |
1382 | 1376 | ||
@@ -2166,7 +2160,7 @@ static int gfx_v8_0_sw_fini(void *handle) | |||
2166 | amdgpu_gfx_kiq_fini(adev); | 2160 | amdgpu_gfx_kiq_fini(adev); |
2167 | 2161 | ||
2168 | gfx_v8_0_mec_fini(adev); | 2162 | gfx_v8_0_mec_fini(adev); |
2169 | adev->gfx.rlc.funcs->fini(adev); | 2163 | amdgpu_gfx_rlc_fini(adev); |
2170 | amdgpu_bo_free_kernel(&adev->gfx.rlc.clear_state_obj, | 2164 | amdgpu_bo_free_kernel(&adev->gfx.rlc.clear_state_obj, |
2171 | &adev->gfx.rlc.clear_state_gpu_addr, | 2165 | &adev->gfx.rlc.clear_state_gpu_addr, |
2172 | (void **)&adev->gfx.rlc.cs_ptr); | 2166 | (void **)&adev->gfx.rlc.cs_ptr); |
@@ -5634,7 +5628,6 @@ static const struct amdgpu_rlc_funcs iceland_rlc_funcs = { | |||
5634 | .enter_safe_mode = iceland_enter_rlc_safe_mode, | 5628 | .enter_safe_mode = iceland_enter_rlc_safe_mode, |
5635 | .exit_safe_mode = iceland_exit_rlc_safe_mode, | 5629 | .exit_safe_mode = iceland_exit_rlc_safe_mode, |
5636 | .init = gfx_v8_0_rlc_init, | 5630 | .init = gfx_v8_0_rlc_init, |
5637 | .fini = gfx_v8_0_rlc_fini, | ||
5638 | .resume = gfx_v8_0_rlc_resume, | 5631 | .resume = gfx_v8_0_rlc_resume, |
5639 | .stop = gfx_v8_0_rlc_stop, | 5632 | .stop = gfx_v8_0_rlc_stop, |
5640 | .reset = gfx_v8_0_rlc_reset, | 5633 | .reset = gfx_v8_0_rlc_reset, |