aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0492-drm-amdgpu-gmc-add-proper-CG-flags-for-fiji.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/0492-drm-amdgpu-gmc-add-proper-CG-flags-for-fiji.patch')
-rw-r--r--common/recipes-kernel/linux/files/0492-drm-amdgpu-gmc-add-proper-CG-flags-for-fiji.patch65
1 files changed, 65 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0492-drm-amdgpu-gmc-add-proper-CG-flags-for-fiji.patch b/common/recipes-kernel/linux/files/0492-drm-amdgpu-gmc-add-proper-CG-flags-for-fiji.patch
new file mode 100644
index 00000000..520881d6
--- /dev/null
+++ b/common/recipes-kernel/linux/files/0492-drm-amdgpu-gmc-add-proper-CG-flags-for-fiji.patch
@@ -0,0 +1,65 @@
+From 0d1a14aa1a603979cfa19b8e28822f53b5292133 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Fri, 8 Apr 2016 01:01:18 -0400
+Subject: [PATCH 0492/1110] drm/amdgpu/gmc: add proper CG flags for fiji
+
+We were already enabling these CG features, this uses
+the standard interface for doing so.
+
+Acked-by: Tom St Denis <tom.stdenis@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 8 ++++----
+ drivers/gpu/drm/amd/amdgpu/vi.c | 4 +++-
+ 2 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
+index bb254f1..9fbce45 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
+@@ -1310,11 +1310,11 @@ static int gmc_v8_0_process_interrupt(struct amdgpu_device *adev,
+ }
+
+ static void fiji_update_mc_medium_grain_clock_gating(struct amdgpu_device *adev,
+- bool enable)
++ bool enable)
+ {
+ uint32_t data;
+
+- if (enable) {
++ if (enable && (adev->cg_flags & AMD_CG_SUPPORT_MC_MGCG)) {
+ data = RREG32(mmMC_HUB_MISC_HUB_CG);
+ data |= MC_HUB_MISC_HUB_CG__ENABLE_MASK;
+ WREG32(mmMC_HUB_MISC_HUB_CG, data);
+@@ -1390,11 +1390,11 @@ static void fiji_update_mc_medium_grain_clock_gating(struct amdgpu_device *adev,
+ }
+
+ static void fiji_update_mc_light_sleep(struct amdgpu_device *adev,
+- bool enable)
++ bool enable)
+ {
+ uint32_t data;
+
+- if (enable) {
++ if (enable && (adev->cg_flags & AMD_CG_SUPPORT_MC_LS)) {
+ data = RREG32(mmMC_HUB_MISC_HUB_CG);
+ data |= MC_HUB_MISC_HUB_CG__MEM_LS_ENABLE_MASK;
+ WREG32(mmMC_HUB_MISC_HUB_CG, data);
+diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
+index ea9edf4..16b2a29 100644
+--- a/drivers/gpu/drm/amd/amdgpu/vi.c
++++ b/drivers/gpu/drm/amd/amdgpu/vi.c
+@@ -1089,7 +1089,9 @@ static int vi_common_early_init(void *handle)
+ AMD_CG_SUPPORT_BIF_LS |
+ AMD_CG_SUPPORT_HDP_MGCG |
+ AMD_CG_SUPPORT_HDP_LS |
+- AMD_CG_SUPPORT_ROM_MGCG;
++ AMD_CG_SUPPORT_ROM_MGCG |
++ AMD_CG_SUPPORT_MC_MGCG |
++ AMD_CG_SUPPORT_MC_LS;
+ adev->pg_flags = 0;
+ adev->external_rev_id = adev->rev_id + 0x3c;
+ break;
+--
+2.7.4
+