Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e1858f9 authored by Alex Deucher's avatar Alex Deucher Committed by Christian König
Browse files

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



If the new mc ucode is available.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 277babc3

drivers/gpu/drm/radeon/ci_dpm.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -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;