iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/radeon: properly handle cg on asics without UVD

Browse Source 
Don't try and enable clockgating if the asic doesn't have
UVD.  Use rdev->has_uvd rather than using local checks.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Alex Deucher 2013-07-27 17:53:25 -04:00
parent 46348dc29b
commit b2d70917e4
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/radeon/si.c
View File

@ -5215,14 +5215,12 @@ 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)
{ {
bool has_uvd = true;
si_enable_mgcg(rdev, true); si_enable_mgcg(rdev, true);
si_enable_cgcg(rdev, true); si_enable_cgcg(rdev, true);
/* 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);
if (has_uvd) { if (rdev->has_uvd) {
si_enable_uvd_mgcg(rdev, true); si_enable_uvd_mgcg(rdev, true);
si_init_uvd_internal_cg(rdev); si_init_uvd_internal_cg(rdev);
} }
@ -5230,9 +5228,7 @@ static void si_init_cg(struct radeon_device *rdev)
static void si_fini_cg(struct radeon_device *rdev) static void si_fini_cg(struct radeon_device *rdev)
{ {
bool has_uvd = true; if (rdev->has_uvd)
if (has_uvd)
si_enable_uvd_mgcg(rdev, false); si_enable_uvd_mgcg(rdev, false);
si_enable_cgcg(rdev, false); si_enable_cgcg(rdev, false);
si_enable_mgcg(rdev, false); si_enable_mgcg(rdev, false);