android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/radeon: re-enable mclk dpm on R7 260X asics

Browse Source 
If the new mc ucode is available.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
This commit is contained in:
Alex Deucher 2014-04-11 11:21:51 -04:00 committed by Christian König
parent 277babc374
commit 7e1858f9af
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,8 +21,10 @@
* *
*/ */
#include <linux/firmware.h>
#include "drmP.h" #include "drmP.h"
#include "radeon.h" #include "radeon.h"
#include "radeon_ucode.h"
#include "cikd.h" #include "cikd.h"
#include "r600_dpm.h" #include "r600_dpm.h"
#include "ci_dpm.h" #include "ci_dpm.h"
@ -5147,9 +5149,11 @@ int ci_dpm_init(struct radeon_device *rdev)
pi->mclk_dpm_key_disabled = 0; pi->mclk_dpm_key_disabled = 0;
pi->pcie_dpm_key_disabled = 0; pi->pcie_dpm_key_disabled = 0;
/* mclk dpm is unstable on some R7 260X cards */ /* mclk dpm is unstable on some R7 260X cards with the old mc ucode */
if (rdev->pdev->device == 0x6658) if ((rdev->pdev->device == 0x6658) &&
(rdev->mc_fw->size == (BONAIRE_MC_UCODE_SIZE * 4))) {
pi->mclk_dpm_key_disabled = 1; pi->mclk_dpm_key_disabled = 1;
}
pi->caps_sclk_ds = true; pi->caps_sclk_ds = true;