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

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

[gregkh]

The patch below does not apply to the 4.13-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 <stable@vger.kernel.org>.

thanks,

greg k-h

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

>From 2db93bea4bba79d35ac4576d4acef2101a62288d Mon Sep 17 00:00:00 2001
From: Jean Delvare <jdelvare@suse.de>
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.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Fixes: 62a37553414a ("drm/amdgpu: add si implementation v10")
Cc: Ken Wang <Qingqing.Wang@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Marek Olšák" <maraeo@gmail.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: Flora Cui <Flora.Cui@amd.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org

diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c
index 812a24dd1204..8284d5dbfc30 100644
--- a/drivers/gpu/drm/amd/amdgpu/si.c
+++ b/drivers/gpu/drm/amd/amdgpu/si.c
@@ -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,

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

[Jean Delvare]

Hi Greg,

On Wed, 20 Sep 2017 11:16:29 +0200, gregkh@linuxfoundation.org wrote:
> The patch below does not apply to the 4.13-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 <stable@vger.kernel.org>.
> 
> thanks,
> 
> greg k-h
> 
> ------------------ original commit in Linus's tree ------------------
> 
> From 2db93bea4bba79d35ac4576d4acef2101a62288d Mon Sep 17 00:00:00 2001
> From: Jean Delvare <jdelvare@suse.de>
> Date: Sun, 30 Jul 2017 10:18:25 +0200
> Subject: [PATCH] drm/amdgpu: Fix undue fallthroughs in golden registers
>  initialization

This fix was already in 4.13 (and is also in 4.9-stable for that
matter.) Somehow this fix appears twice in the git log, once as
5694785cf09b and once as 2db93bea4bba. No idea how this is possible.

Anyway, all is fine here, nothing to backport.

-- 
Jean Delvare
SUSE L3 Support