diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0490-drm-amdgpu-sdma-add-proper-CG-flags-for-fiji.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0490-drm-amdgpu-sdma-add-proper-CG-flags-for-fiji.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0490-drm-amdgpu-sdma-add-proper-CG-flags-for-fiji.patch b/common/recipes-kernel/linux/files/0490-drm-amdgpu-sdma-add-proper-CG-flags-for-fiji.patch new file mode 100644 index 00000000..c3b9abbe --- /dev/null +++ b/common/recipes-kernel/linux/files/0490-drm-amdgpu-sdma-add-proper-CG-flags-for-fiji.patch @@ -0,0 +1,55 @@ +From 051b94ccca43562f0ff3038f049906f3e5667060 Mon Sep 17 00:00:00 2001 +From: Alex Deucher <alexander.deucher@amd.com> +Date: Fri, 8 Apr 2016 00:42:51 -0400 +Subject: [PATCH 0490/1110] drm/amdgpu/sdma: 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/sdma_v3_0.c | 4 ++-- + drivers/gpu/drm/amd/amdgpu/vi.c | 4 +++- + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +index 0122624..8727f4a 100644 +--- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +@@ -1464,7 +1464,7 @@ static void fiji_update_sdma_medium_grain_clock_gating( + { + uint32_t temp, data; + +- if (enable) { ++ if (enable && (adev->cg_flags & AMD_CG_SUPPORT_SDMA_MGCG)) { + temp = data = RREG32(mmSDMA0_CLK_CTRL); + data &= ~(SDMA0_CLK_CTRL__SOFT_OVERRIDE7_MASK | + SDMA0_CLK_CTRL__SOFT_OVERRIDE6_MASK | +@@ -1524,7 +1524,7 @@ static void fiji_update_sdma_medium_grain_light_sleep( + { + uint32_t temp, data; + +- if (enable) { ++ if (enable && (adev->cg_flags & AMD_CG_SUPPORT_SDMA_LS)) { + temp = data = RREG32(mmSDMA0_POWER_CNTL); + data |= SDMA0_POWER_CNTL__MEM_POWER_OVERRIDE_MASK; + +diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c +index 8d9b03f..5759504 100644 +--- a/drivers/gpu/drm/amd/amdgpu/vi.c ++++ b/drivers/gpu/drm/amd/amdgpu/vi.c +@@ -1083,7 +1083,9 @@ static int vi_common_early_init(void *handle) + AMD_CG_SUPPORT_GFX_CGTS | + AMD_CG_SUPPORT_GFX_CGTS_LS | + AMD_CG_SUPPORT_GFX_CGCG | +- AMD_CG_SUPPORT_GFX_CGLS; ++ AMD_CG_SUPPORT_GFX_CGLS | ++ AMD_CG_SUPPORT_SDMA_MGCG | ++ AMD_CG_SUPPORT_SDMA_LS; + adev->pg_flags = 0; + adev->external_rev_id = adev->rev_id + 0x3c; + break; +-- +2.7.4 + |