]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/amdgpu: Remove redundant code in gfx_v8_0.c
authorRex Zhu <Rex.Zhu@amd.com>
Thu, 20 Sep 2018 09:06:22 +0000 (17:06 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 27 Sep 2018 02:09:19 +0000 (21:09 -0500)
the CG related registers have been programed in golden setting
PG register default value is 0.

Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Hang Zhou <hang.zhou@amd.com>
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c

index 93d7fe5c94dc9630d8356f12437b856be16066c4..463d07e186d40e52afa9b00916e60cd6855ecce5 100644 (file)
@@ -4208,31 +4208,11 @@ static int gfx_v8_0_rlc_load_microcode(struct amdgpu_device *adev)
 static int gfx_v8_0_rlc_resume(struct amdgpu_device *adev)
 {
        int r;
-       u32 tmp;
 
        gfx_v8_0_rlc_stop(adev);
-
-       /* disable CG */
-       tmp = RREG32(mmRLC_CGCG_CGLS_CTRL);
-       tmp &= ~(RLC_CGCG_CGLS_CTRL__CGCG_EN_MASK |
-                RLC_CGCG_CGLS_CTRL__CGLS_EN_MASK);
-       WREG32(mmRLC_CGCG_CGLS_CTRL, tmp);
-       if (adev->asic_type == CHIP_POLARIS11 ||
-           adev->asic_type == CHIP_POLARIS10 ||
-           adev->asic_type == CHIP_POLARIS12 ||
-           adev->asic_type == CHIP_VEGAM) {
-               tmp = RREG32(mmRLC_CGCG_CGLS_CTRL_3D);
-               tmp &= ~0x3;
-               WREG32(mmRLC_CGCG_CGLS_CTRL_3D, tmp);
-       }
-
-       /* disable PG */
-       WREG32(mmRLC_PG_CNTL, 0);
-
        gfx_v8_0_rlc_reset(adev);
        gfx_v8_0_init_pg(adev);
 
-
        if (adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT) {
                /* legacy rlc firmware loading */
                r = gfx_v8_0_rlc_load_microcode(adev);