aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0909-drm-amdgpu-pull-topaz-gmc-bits-into-gmc_v7.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/0909-drm-amdgpu-pull-topaz-gmc-bits-into-gmc_v7.patch')
-rw-r--r--common/recipes-kernel/linux/files/0909-drm-amdgpu-pull-topaz-gmc-bits-into-gmc_v7.patch82
1 files changed, 0 insertions, 82 deletions
diff --git a/common/recipes-kernel/linux/files/0909-drm-amdgpu-pull-topaz-gmc-bits-into-gmc_v7.patch b/common/recipes-kernel/linux/files/0909-drm-amdgpu-pull-topaz-gmc-bits-into-gmc_v7.patch
deleted file mode 100644
index 6543e574..00000000
--- a/common/recipes-kernel/linux/files/0909-drm-amdgpu-pull-topaz-gmc-bits-into-gmc_v7.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 10271b547bf82e659e8dfd36ef226c323c764cf2 Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexander.deucher@amd.com>
-Date: Tue, 2 Feb 2016 10:56:15 -0500
-Subject: [PATCH 0909/1565] drm/amdgpu: pull topaz gmc bits into gmc_v7
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add the topaz golden settings into the gmc7 module.
-
-Reviewed-by: Ken Wang <Qingqing.Wang@amd.com>
-Reviewed-by: Christian König <christian.koenig@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Cc: stable@vger.kernel.org
----
- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 35 +++++++++++++++++++++++++++++++++--
- 1 file changed, 33 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
-index 069abc8..8aa2991 100644
---- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
-+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
-@@ -44,8 +44,37 @@ MODULE_FIRMWARE("radeon/bonaire_mc.bin");
- MODULE_FIRMWARE("radeon/hawaii_mc.bin");
- MODULE_FIRMWARE("amdgpu/topaz_mc.bin");
-
-+static const u32 golden_settings_iceland_a11[] =
-+{
-+ mmVM_PRT_APERTURE0_LOW_ADDR, 0x0fffffff, 0x0fffffff,
-+ mmVM_PRT_APERTURE1_LOW_ADDR, 0x0fffffff, 0x0fffffff,
-+ mmVM_PRT_APERTURE2_LOW_ADDR, 0x0fffffff, 0x0fffffff,
-+ mmVM_PRT_APERTURE3_LOW_ADDR, 0x0fffffff, 0x0fffffff
-+};
-+
-+static const u32 iceland_mgcg_cgcg_init[] =
-+{
-+ mmMC_MEM_POWER_LS, 0xffffffff, 0x00000104
-+};
-+
-+static void gmc_v7_0_init_golden_registers(struct amdgpu_device *adev)
-+{
-+ switch (adev->asic_type) {
-+ case CHIP_TOPAZ:
-+ amdgpu_program_register_sequence(adev,
-+ iceland_mgcg_cgcg_init,
-+ (const u32)ARRAY_SIZE(iceland_mgcg_cgcg_init));
-+ amdgpu_program_register_sequence(adev,
-+ golden_settings_iceland_a11,
-+ (const u32)ARRAY_SIZE(golden_settings_iceland_a11));
-+ break;
-+ default:
-+ break;
-+ }
-+}
-+
- /**
-- * gmc8_mc_wait_for_idle - wait for MC idle callback.
-+ * gmc7_mc_wait_for_idle - wait for MC idle callback.
- *
- * @adev: amdgpu_device pointer
- *
-@@ -142,7 +171,7 @@ static int gmc_v7_0_init_microcode(struct amdgpu_device *adev)
- default: BUG();
- }
-
-- if(adev->asic_type == CHIP_TOPAZ)
-+ if (adev->asic_type == CHIP_TOPAZ)
- snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mc.bin", chip_name);
- else
- snprintf(fw_name, sizeof(fw_name), "radeon/%s_mc.bin", chip_name);
-@@ -992,6 +1021,8 @@ static int gmc_v7_0_hw_init(void *handle)
- int r;
- struct amdgpu_device *adev = (struct amdgpu_device *)handle;
-
-+ gmc_v7_0_init_golden_registers(adev);
-+
- gmc_v7_0_mc_program(adev);
-
- if (!(adev->flags & AMD_IS_APU)) {
---
-1.9.1
-