From 86b02bc9a171be29dfbe577f0f19317aca9b7a6c Mon Sep 17 00:00:00 2001 From: Sanjay R Mehta Date: Tue, 17 Apr 2018 17:27:37 +0530 Subject: [PATCH 1362/4131] Revert "drm/amd/amdgpu: enable GFX PG for carrizo and" This reverts commit d64583439fd6db78eec8b8b12e76dd50201c8bc5. --- drivers/gpu/drm/amd/amdgpu/vi.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c index f5ec5f8..e131eb3 100644 --- a/drivers/gpu/drm/amd/amdgpu/vi.c +++ b/drivers/gpu/drm/amd/amdgpu/vi.c @@ -1066,11 +1066,7 @@ static int vi_common_early_init(void *handle) AMD_CG_SUPPORT_GFX_CP_LS | AMD_CG_SUPPORT_GFX_CGTS | AMD_CG_SUPPORT_GFX_CGTS_LS | - /* Enabling CGCG on 4.9 kernel results in - * IOMMU errors and filesystem corruption - * Disable CGCG until the issue is fixed properly - */ - //AMD_CG_SUPPORT_GFX_CGCG | + AMD_CG_SUPPORT_GFX_CGCG | AMD_CG_SUPPORT_GFX_CGLS | AMD_CG_SUPPORT_BIF_LS | AMD_CG_SUPPORT_HDP_MGCG | @@ -1081,8 +1077,7 @@ static int vi_common_early_init(void *handle) /* rev0 hardware requires workarounds to support PG */ adev->pg_flags = 0; if (adev->rev_id != 0x00 || CZ_REV_BRISTOL(adev->pdev->revision)) { - adev->pg_flags |= AMD_PG_SUPPORT_GFX_PG | - AMD_PG_SUPPORT_GFX_SMG | + adev->pg_flags |= AMD_PG_SUPPORT_GFX_SMG | AMD_PG_SUPPORT_GFX_PIPELINE | AMD_PG_SUPPORT_CP | AMD_PG_SUPPORT_UVD | -- 2.7.4