Commit d5939e4d authored by Monk Liu's avatar Monk Liu Committed by Alex Deucher

drm/amdgpu: fix GFX10 missing CSIB set(v3)

still need to init csb even for SRIOV

v2:
drop init_pg() for gfx10 at all since
PG and GFX off feature will be fully controled
by RLC and SMU fw for gfx10

v3:
drop the flush_gpu_tlb lines since we consider
it is only usefull in emulation
Signed-off-by: default avatarMonk Liu <Monk.Liu@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent eb529b8e
...@@ -1765,22 +1765,6 @@ static int gfx_v10_0_init_csb(struct amdgpu_device *adev) ...@@ -1765,22 +1765,6 @@ static int gfx_v10_0_init_csb(struct amdgpu_device *adev)
return 0; return 0;
} }
static int gfx_v10_0_init_pg(struct amdgpu_device *adev)
{
int i;
int r;
r = gfx_v10_0_init_csb(adev);
if (r)
return r;
for (i = 0; i < adev->num_vmhubs; i++)
amdgpu_gmc_flush_gpu_tlb(adev, 0, i, 0);
/* TODO: init power gating */
return 0;
}
void gfx_v10_0_rlc_stop(struct amdgpu_device *adev) void gfx_v10_0_rlc_stop(struct amdgpu_device *adev)
{ {
u32 tmp = RREG32_SOC15(GC, 0, mmRLC_CNTL); u32 tmp = RREG32_SOC15(GC, 0, mmRLC_CNTL);
...@@ -1873,21 +1857,16 @@ static int gfx_v10_0_rlc_resume(struct amdgpu_device *adev) ...@@ -1873,21 +1857,16 @@ static int gfx_v10_0_rlc_resume(struct amdgpu_device *adev)
{ {
int r; int r;
if (amdgpu_sriov_vf(adev))
return 0;
if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) { if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) {
r = gfx_v10_0_wait_for_rlc_autoload_complete(adev);
if (r)
return r;
r = gfx_v10_0_init_pg(adev); r = gfx_v10_0_wait_for_rlc_autoload_complete(adev);
if (r) if (r)
return r; return r;
/* enable RLC SRM */ gfx_v10_0_init_csb(adev);
gfx_v10_0_rlc_enable_srm(adev);
if (!amdgpu_sriov_vf(adev)) /* enable RLC SRM */
gfx_v10_0_rlc_enable_srm(adev);
} else { } else {
adev->gfx.rlc.funcs->stop(adev); adev->gfx.rlc.funcs->stop(adev);
...@@ -1909,9 +1888,7 @@ static int gfx_v10_0_rlc_resume(struct amdgpu_device *adev) ...@@ -1909,9 +1888,7 @@ static int gfx_v10_0_rlc_resume(struct amdgpu_device *adev)
return r; return r;
} }
r = gfx_v10_0_init_pg(adev); gfx_v10_0_init_csb(adev);
if (r)
return r;
adev->gfx.rlc.funcs->start(adev); adev->gfx.rlc.funcs->start(adev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment