FAILED: patch "[PATCH] drm/amdgpu: load MEC ucode manually on iceland" failed to apply to 4.4-stable tree

PATCH [email protected] 1 participant 1 message Mar 1, 2016

Subsystems (3)

Stable branch DRM drivers Radeon and amdgpu DRM drivers

lore

Share & tools

lore

[email protected]

author maintainer

2016-03-01 19:26 UTC #0 lore raw

The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 951e09624a9f417f0b64c872f71feb6738905086 Mon Sep 17 00:00:00 2001

From: Alex Deucher <[email protected]>
Date: Tue, 2 Feb 2016 16:22:15 -0500
Subject: [PATCH] drm/amdgpu: load MEC ucode manually on iceland
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The smc doesn't handle it.

Reviewed-by Ken Wang <[email protected]>

Reviewed-by Christian König <[email protected]>

Signed-off-by Alex Deucher <[email protected]>

Cc [email protected]

drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +10 -4

index 87c3332f45e3..8f8ec37ecd88 100644
@@ -3851,10 +3851,16 @@ static int gfx_v8_0_cp_resume(struct amdgpu_device *adev)
 			if (r)
 				return -EINVAL;
 
-			r = adev->smu.smumgr_funcs->check_fw_load_finish(adev,
-							AMDGPU_UCODE_ID_CP_MEC1);
-			if (r)
-				return -EINVAL;
+			if (adev->asic_type == CHIP_TOPAZ) {
+				r = gfx_v8_0_cp_compute_load_microcode(adev);
+				if (r)
+					return r;
+			} else {
+				r = adev->smu.smumgr_funcs->check_fw_load_finish(adev,
+										 AMDGPU_UCODE_ID_CP_MEC1);
+				if (r)
+					return -EINVAL;
+			}
 		}
 	}