1 files changed, 40 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3871-drm-amdgpu-gmc9-fix-vega12-s-athub-mmhub-golden-sett.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3871-drm-amdgpu-gmc9-fix-vega12-s-athub-mmhub-golden-sett.patch
new file mode 100644
index 00000000..0a7d8f16
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3871-drm-amdgpu-gmc9-fix-vega12-s-athub-mmhub-golden-sett.patch
@@ -0,0 +1,40 @@
+From 9d7de6b61bb9e9fcea653f26551d380cae67bc8a Mon Sep 17 00:00:00 2001
+From: Feifei Xu <Feifei.Xu@amd.com>
+Date: Tue, 6 Mar 2018 22:49:12 -0500
+Subject: [PATCH 3871/4131] drm/amdgpu/gmc9: fix vega12's athub&mmhub golden
+ setting.
+
+The athub&mmhub's golden setting is for vega10 only now.
+Remove this from vega12, which is introduced by branch merge.
+
+Signed-off-by: Feifei Xu <Feifei.Xu@amd.com>
+Reviewed-by: Ken Wang <ken.wang@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+index aab0bfa..9db0a0a 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+@@ -959,7 +959,6 @@ static void gmc_v9_0_init_golden_registers(struct amdgpu_device *adev)
+ 
+ 	switch (adev->asic_type) {
+ 	case CHIP_VEGA10:
+-	case CHIP_VEGA12:
+ 		soc15_program_register_sequence(adev,
+ 						golden_settings_mmhub_1_0_0,
+ 						ARRAY_SIZE(golden_settings_mmhub_1_0_0));
+@@ -967,6 +966,8 @@ static void gmc_v9_0_init_golden_registers(struct amdgpu_device *adev)
+ 						golden_settings_athub_1_0_0,
+ 						ARRAY_SIZE(golden_settings_athub_1_0_0));
+ 		break;
++	case CHIP_VEGA12:
++		break;
+ 	case CHIP_RAVEN:
+ 		soc15_program_register_sequence(adev,
+ 						golden_settings_athub_1_0_0,
+-- 
+2.7.4
+