Commit 3652f005 authored by Alex Deucher's avatar Alex Deucher

drm/radeon/si: disable cgcg and pg for now

Coarse grain clockgating causes problems with reclocking on
some cards and powergating (verde only) causes problems with
ring initialization.  The proper fix (restructuring the init
sequences) is too invasive for 3.11 so just disable them for
now.
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f86d0269
...@@ -5216,7 +5216,7 @@ static void si_enable_mc_ls(struct radeon_device *rdev, ...@@ -5216,7 +5216,7 @@ static void si_enable_mc_ls(struct radeon_device *rdev,
static void si_init_cg(struct radeon_device *rdev) static void si_init_cg(struct radeon_device *rdev)
{ {
si_enable_mgcg(rdev, true); si_enable_mgcg(rdev, true);
si_enable_cgcg(rdev, true); si_enable_cgcg(rdev, false);
/* disable MC LS on Tahiti */ /* disable MC LS on Tahiti */
if (rdev->family == CHIP_TAHITI) if (rdev->family == CHIP_TAHITI)
si_enable_mc_ls(rdev, false); si_enable_mc_ls(rdev, false);
...@@ -5237,11 +5237,11 @@ static void si_fini_cg(struct radeon_device *rdev) ...@@ -5237,11 +5237,11 @@ static void si_fini_cg(struct radeon_device *rdev)
static void si_init_pg(struct radeon_device *rdev) static void si_init_pg(struct radeon_device *rdev)
{ {
bool has_pg = false; bool has_pg = false;
#if 0
/* only cape verde supports PG */ /* only cape verde supports PG */
if (rdev->family == CHIP_VERDE) if (rdev->family == CHIP_VERDE)
has_pg = true; has_pg = true;
#endif
if (has_pg) { if (has_pg) {
si_init_ao_cu_mask(rdev); si_init_ao_cu_mask(rdev);
si_init_dma_pg(rdev); si_init_dma_pg(rdev);
......
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