Attachment 97208 Details for Bug 75992 – try newer mc ucode

[patch] try newer mc ucode

0001-drm-radeon-add-support-for-updated-bonaire-mc-ucode.patch (text/plain), 2.89 KB, created by Alex Deucher on 2014-04-11 03:02:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2014-04-11 03:02:01 UTC

Size: 2.89 KB

patch

obsolete

>From 50d17fb1f97042aacff7736965681deb3275cc0e Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Thu, 10 Apr 2014 22:59:00 -0400
>Subject: [PATCH] drm/radeon: add support for updated bonaire mc ucode
>
>May help mclk dpm stability.
>
>bug:
>https://bugs.freedesktop.org/show_bug.cgi?id=75992
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>---
> drivers/gpu/drm/radeon/cik.c          | 10 +++++-----
> drivers/gpu/drm/radeon/radeon_ucode.h |  1 +
> 2 files changed, 6 insertions(+), 5 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
>index 0ae991d..d10f1ac 100644
>--- a/drivers/gpu/drm/radeon/cik.c
>+++ b/drivers/gpu/drm/radeon/cik.c
>@@ -1703,7 +1703,7 @@ 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 = rdev->mc_fw->size / 4;
> 
> 	if (!rdev->mc_fw)
> 		return -EINVAL;
>@@ -1711,12 +1711,10 @@ int ci_mc_load_microcode(struct radeon_device *rdev)
> 	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 +1781,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, mc_req_size2 = 0;
> 	char fw_name[30];
> 	int err;
> 
>@@ -1798,6 +1796,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 = CIK_MC_UCODE_SIZE * 4;
>+		mc_req_size2 = CIK_MC_UCODE_SIZE_2 * 4;
> 		sdma_req_size = CIK_SDMA_UCODE_SIZE * 4;
> 		smc_req_size = ALIGN(BONAIRE_SMC_UCODE_SIZE, 4);
> 		break;
>@@ -1908,7 +1907,8 @@ static int cik_init_microcode(struct radeon_device *rdev)
> 		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 != mc_req_size2)){
> 			printk(KERN_ERR
> 			       "cik_mc: Bogus length %zu in firmware \"%s\"\n",
> 			       rdev->mc_fw->size, fw_name);
>diff --git a/drivers/gpu/drm/radeon/radeon_ucode.h b/drivers/gpu/drm/radeon/radeon_ucode.h
>index a77cd27..a817fde 100644
>--- a/drivers/gpu/drm/radeon/radeon_ucode.h
>+++ b/drivers/gpu/drm/radeon/radeon_ucode.h
>@@ -59,6 +59,7 @@
> #define SI_MC_UCODE_SIZE             7769
> #define OLAND_MC_UCODE_SIZE          7863
> #define CIK_MC_UCODE_SIZE            7866
>+#define CIK_MC_UCODE_SIZE_2          7948
> #define HAWAII_MC_UCODE_SIZE         7933
> 
> /* SDMA */
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 75992: 95520 | 95521 | 95523 | 96290 | 96460 | 96532 | 96568 | 97173 | 97175 | 97176 | 97191 | 97194 | 97196 | 97208 | 97219

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.