Commit 90e48970 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-fixes-3.15' of git://people.freedesktop.org/~deathsimple/linux into drm-next 

1. Fixing PLL regressions
2. A couple of memory reclocking and DPM fixes
3. Small cleanups

* 'drm-fixes-3.15' of git://people.freedesktop.org/~deathsimple/linux:
  drm/radeon/ci: make sure mc ucode is loaded before checking the size
  drm/radeon/si: make sure mc ucode is loaded before checking the size
  drm/radeon: improve PLL params if we don't match exactly v2
  drm/radeon: memory leak on bo reservation failure. v2
  drm/radeon: fix VCE fence command
  drm/radeon: re-enable mclk dpm on R7 260X asics
  drm/radeon: add support for newer mc ucode on CI (v2)
  drm/radeon: add support for newer mc ucode on SI (v2)
  drm/radeon: apply more strict limits for PLL params v2
  drm/radeon: update CI DPM powertune settings
  drm/radeon: fix runpm handling on APUs (v4)
  drm/radeon: disable mclk dpm on R7 260X
parents 95c7d351 bcddee29

drivers/gpu/drm/radeon/ci_dpm.c

+21 −12
Original line number Diff line number Diff line
@@ -21,8 +21,10 @@ 
 *

 */



#include <linux/firmware.h>

#include "drmP.h"

#include "radeon.h"

#include "radeon_ucode.h"

#include "cikd.h"

#include "r600_dpm.h"

#include "ci_dpm.h"
@@ -202,24 +204,29 @@ static void ci_initialize_powertune_defaults(struct radeon_device *rdev) 
	struct ci_power_info *pi = ci_get_pi(rdev);



	switch (rdev->pdev->device) {

	case 0x6649:

	case 0x6650:

	case 0x6651:

	case 0x6658:

	case 0x665C:

	case 0x665D:

	default:

		pi->powertune_defaults = &defaults_bonaire_xt;

		break;

	case 0x6651:

	case 0x665D:

		pi->powertune_defaults = &defaults_bonaire_pro;

		break;

	case 0x6640:

		pi->powertune_defaults = &defaults_saturn_xt;

		break;

	case 0x6641:

		pi->powertune_defaults = &defaults_saturn_pro;

	case 0x6646:

	case 0x6647:

		pi->powertune_defaults = &defaults_saturn_xt;

		break;

	case 0x67B8:

	case 0x67B0:

		pi->powertune_defaults = &defaults_hawaii_xt;

		break;

	case 0x67BA:

	case 0x67B1:

		pi->powertune_defaults = &defaults_hawaii_pro;

		break;

	case 0x67A0:

	case 0x67A1:

	case 0x67A2:
@@ -228,11 +235,7 @@ static void ci_initialize_powertune_defaults(struct radeon_device *rdev) 
	case 0x67AA:

	case 0x67B9:

	case 0x67BE:

		pi->powertune_defaults = &defaults_hawaii_xt;

		break;

	case 0x67BA:

	case 0x67B1:

		pi->powertune_defaults = &defaults_hawaii_pro;

		pi->powertune_defaults = &defaults_bonaire_xt;

		break;

	}
@@ -5146,6 +5149,12 @@ int ci_dpm_init(struct radeon_device *rdev) 
	pi->mclk_dpm_key_disabled = 0;

	pi->pcie_dpm_key_disabled = 0;



	/* mclk dpm is unstable on some R7 260X cards with the old mc ucode */

	if ((rdev->pdev->device == 0x6658) &&

	    (rdev->mc_fw->size == (BONAIRE_MC_UCODE_SIZE * 4))) {

		pi->mclk_dpm_key_disabled = 1;

	}



	pi->caps_sclk_ds = true;



	pi->mclk_strobe_mode_threshold = 40000;

drivers/gpu/drm/radeon/cik.c

+19 −9
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ MODULE_FIRMWARE("radeon/BONAIRE_me.bin"); 
MODULE_FIRMWARE("radeon/BONAIRE_ce.bin");

MODULE_FIRMWARE("radeon/BONAIRE_mec.bin");

MODULE_FIRMWARE("radeon/BONAIRE_mc.bin");

MODULE_FIRMWARE("radeon/BONAIRE_mc2.bin");

MODULE_FIRMWARE("radeon/BONAIRE_rlc.bin");

MODULE_FIRMWARE("radeon/BONAIRE_sdma.bin");

MODULE_FIRMWARE("radeon/BONAIRE_smc.bin");
@@ -46,6 +47,7 @@ MODULE_FIRMWARE("radeon/HAWAII_me.bin"); 
MODULE_FIRMWARE("radeon/HAWAII_ce.bin");

MODULE_FIRMWARE("radeon/HAWAII_mec.bin");

MODULE_FIRMWARE("radeon/HAWAII_mc.bin");

MODULE_FIRMWARE("radeon/HAWAII_mc2.bin");

MODULE_FIRMWARE("radeon/HAWAII_rlc.bin");

MODULE_FIRMWARE("radeon/HAWAII_sdma.bin");

MODULE_FIRMWARE("radeon/HAWAII_smc.bin");
@@ -1703,20 +1705,20 @@ int ci_mc_load_microcode(struct radeon_device *rdev) 
	const __be32 *fw_data;

	u32 running, blackout = 0;

	u32 *io_mc_regs;

	int i, ucode_size, regs_size;

	int i, regs_size, ucode_size;



	if (!rdev->mc_fw)

		return -EINVAL;



	ucode_size = rdev->mc_fw->size / 4;



	switch (rdev->family) {

	case CHIP_BONAIRE:

		io_mc_regs = (u32 *)&bonaire_io_mc_regs;

		ucode_size = CIK_MC_UCODE_SIZE;

		regs_size = BONAIRE_IO_MC_REGS_SIZE;

		break;

	case CHIP_HAWAII:

		io_mc_regs = (u32 *)&hawaii_io_mc_regs;

		ucode_size = HAWAII_MC_UCODE_SIZE;

		regs_size = HAWAII_IO_MC_REGS_SIZE;

		break;

	default:
@@ -1783,7 +1785,7 @@ static int cik_init_microcode(struct radeon_device *rdev) 
	const char *chip_name;

	size_t pfp_req_size, me_req_size, ce_req_size,

		mec_req_size, rlc_req_size, mc_req_size = 0,

		sdma_req_size, smc_req_size = 0;

		sdma_req_size, smc_req_size = 0, mc2_req_size = 0;

	char fw_name[30];

	int err;
@@ -1797,7 +1799,8 @@ static int cik_init_microcode(struct radeon_device *rdev) 
		ce_req_size = CIK_CE_UCODE_SIZE * 4;

		mec_req_size = CIK_MEC_UCODE_SIZE * 4;

		rlc_req_size = BONAIRE_RLC_UCODE_SIZE * 4;

		mc_req_size = CIK_MC_UCODE_SIZE * 4;

		mc_req_size = BONAIRE_MC_UCODE_SIZE * 4;

		mc2_req_size = BONAIRE_MC2_UCODE_SIZE * 4;

		sdma_req_size = CIK_SDMA_UCODE_SIZE * 4;

		smc_req_size = ALIGN(BONAIRE_SMC_UCODE_SIZE, 4);

		break;
@@ -1809,6 +1812,7 @@ static int cik_init_microcode(struct radeon_device *rdev) 
		mec_req_size = CIK_MEC_UCODE_SIZE * 4;

		rlc_req_size = BONAIRE_RLC_UCODE_SIZE * 4;

		mc_req_size = HAWAII_MC_UCODE_SIZE * 4;

		mc2_req_size = HAWAII_MC2_UCODE_SIZE * 4;

		sdma_req_size = CIK_SDMA_UCODE_SIZE * 4;

		smc_req_size = ALIGN(HAWAII_SMC_UCODE_SIZE, 4);

		break;
@@ -1904,16 +1908,22 @@ static int cik_init_microcode(struct radeon_device *rdev) 


	/* No SMC, MC ucode on APUs */

	if (!(rdev->flags & RADEON_IS_IGP)) {

		snprintf(fw_name, sizeof(fw_name), "radeon/%s_mc2.bin", chip_name);

		err = request_firmware(&rdev->mc_fw, fw_name, rdev->dev);

		if (err) {

			snprintf(fw_name, sizeof(fw_name), "radeon/%s_mc.bin", chip_name);

			err = request_firmware(&rdev->mc_fw, fw_name, rdev->dev);

			if (err)

				goto out;

		if (rdev->mc_fw->size != mc_req_size) {

		}

		if ((rdev->mc_fw->size != mc_req_size) &&

		    (rdev->mc_fw->size != mc2_req_size)){

			printk(KERN_ERR

			       "cik_mc: Bogus length %zu in firmware \"%s\"\n",

			       rdev->mc_fw->size, fw_name);

			err = -EINVAL;

		}

		DRM_INFO("%s: %zu bytes\n", fw_name, rdev->mc_fw->size);



		snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name);

		err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev);

drivers/gpu/drm/radeon/radeon.h

+1 −0
Original line number Diff line number Diff line
@@ -2321,6 +2321,7 @@ struct radeon_device { 
	bool have_disp_power_ref;

};



bool radeon_is_px(struct drm_device *dev);

int radeon_device_init(struct radeon_device *rdev,

		       struct drm_device *ddev,

		       struct pci_dev *pdev,

drivers/gpu/drm/radeon/radeon_atpx_handler.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ struct atpx_mux { 
	u16 mux;

} __packed;



bool radeon_is_px(void) {

bool radeon_has_atpx(void) {

	return radeon_atpx_priv.atpx_detected;

}

drivers/gpu/drm/radeon/radeon_device.c

+10 −9
Original line number Diff line number Diff line
@@ -102,11 +102,14 @@ static const char radeon_family_name[][16] = { 
	"LAST",

};



#if defined(CONFIG_VGA_SWITCHEROO)

bool radeon_is_px(void);

#else

static inline bool radeon_is_px(void) { return false; }

#endif

bool radeon_is_px(struct drm_device *dev)

{

	struct radeon_device *rdev = dev->dev_private;



	if (rdev->flags & RADEON_IS_PX)

		return true;

	return false;

}



/**

 * radeon_program_register_sequence - program an array of registers.
@@ -1082,7 +1085,7 @@ static void radeon_switcheroo_set_state(struct pci_dev *pdev, enum vga_switchero 
{

	struct drm_device *dev = pci_get_drvdata(pdev);



	if (radeon_is_px() && state == VGA_SWITCHEROO_OFF)

	if (radeon_is_px(dev) && state == VGA_SWITCHEROO_OFF)

		return;



	if (state == VGA_SWITCHEROO_ON) {
@@ -1301,9 +1304,7 @@ int radeon_device_init(struct radeon_device *rdev, 
	 * ignore it */

	vga_client_register(rdev->pdev, rdev, NULL, radeon_vga_set_decode);



	if (radeon_runtime_pm == 1)

		runtime = true;

	if ((radeon_runtime_pm == -1) && radeon_is_px())

	if (rdev->flags & RADEON_IS_PX)

		runtime = true;

	vga_switcheroo_register_client(rdev->pdev, &radeon_switcheroo_ops, runtime);

	if (runtime)

CRA Git | Maintained and supported by SUSTech CRA and CCSE