Skip to contentSkip to conversation

FAILED: patch "[PATCH] drm/amdgpu: Fix undue fallthroughs in golden registers" failed to apply to 4.9-stable tree

PATCH [email protected] 1 participant 1 message Sep 20, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.9-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 2db93bea4bba79d35ac4576d4acef2101a62288d Mon Sep 17 00:00:00 2001

From: Jean Delvare <[email protected]>
Date: Sun, 30 Jul 2017 10:18:25 +0200
Subject: [PATCH] drm/amdgpu: Fix undue fallthroughs in golden registers
initialization
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As I was staring at the si_init_golden_registers code, I noticed that the Pitcairn initialization silently falls through the Cape Verde initialization, and the Oland initialization falls through the Hainan initialization. However there is no comment stating that this is intentional, and the radeon driver doesn't have any such fallthrough, so I suspect this is not supposed to happen.

Fixes 62a37553414a ("drm/amdgpu: add si implementation v10")
Cc Ken Wang <[email protected]>
Cc Alex Deucher <[email protected]>
Cc "Marek Olšák" <[email protected]>
Cc "Christian König" <[email protected]>
Cc Flora Cui <[email protected]>
drivers/gpu/drm/amd/amdgpu/si.c +2 -0
index 812a24dd1204..8284d5dbfc30 100644
@@ -1413,6 +1413,7 @@ static void si_init_golden_registers(struct amdgpu_device *adev)
 		amdgpu_program_register_sequence(adev,
 						 pitcairn_mgcg_cgcg_init,
 						 (const u32)ARRAY_SIZE(pitcairn_mgcg_cgcg_init));
+		break;
 	case CHIP_VERDE:
 		amdgpu_program_register_sequence(adev,
 						 verde_golden_registers,
@@ -1437,6 +1438,7 @@ static void si_init_golden_registers(struct amdgpu_device *adev)
 		amdgpu_program_register_sequence(adev,
 						 oland_mgcg_cgcg_init,
 						 (const u32)ARRAY_SIZE(oland_mgcg_cgcg_init));
+		break;
 	case CHIP_HAINAN:
 		amdgpu_program_register_sequence(adev,
 						 hainan_golden_registers,