diff options
author | Jack Xiao <Jack.Xiao@amd.com> | 2019-02-13 05:43:03 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2019-06-20 22:35:29 -0400 |
commit | 367adb2ad5bd738b0899edb4825b356f810fd8d8 (patch) | |
tree | 5c19affc3c2046945755fbb3d04f0253822d06b1 | |
parent | 9faa494e2fcc10162f725a3bda98b627b6f50bcb (diff) |
drm/amdgpu/athub2: enable athub2 clock gating
Enable athub2 clock gating and light sleep
Signed-off-by: Jack Xiao <Jack.Xiao@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/Makefile | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/athub_v2_0.c | 101 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/athub_v2_0.h | 30 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/include/amd_shared.h | 2 |
5 files changed, 140 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile b/drivers/gpu/drm/amd/amdgpu/Makefile index e3fde4aac1a2..023899800d2d 100644 --- a/drivers/gpu/drm/amd/amdgpu/Makefile +++ b/drivers/gpu/drm/amd/amdgpu/Makefile | |||
@@ -135,6 +135,10 @@ amdgpu-y += \ | |||
135 | amdgpu_vcn.o \ | 135 | amdgpu_vcn.o \ |
136 | vcn_v1_0.o | 136 | vcn_v1_0.o |
137 | 137 | ||
138 | # add ATHUB block | ||
139 | amdgpu-y += \ | ||
140 | athub_v2_0.o | ||
141 | |||
138 | # add amdkfd interfaces | 142 | # add amdkfd interfaces |
139 | amdgpu-y += amdgpu_amdkfd.o | 143 | amdgpu-y += amdgpu_amdkfd.o |
140 | 144 | ||
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c index e0df2bc4861f..9f4ed75ade2f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | |||
@@ -64,6 +64,9 @@ static const struct cg_flag_name clocks[] = { | |||
64 | {AMD_CG_SUPPORT_DRM_LS, "Digital Right Management Light Sleep"}, | 64 | {AMD_CG_SUPPORT_DRM_LS, "Digital Right Management Light Sleep"}, |
65 | {AMD_CG_SUPPORT_ROM_MGCG, "Rom Medium Grain Clock Gating"}, | 65 | {AMD_CG_SUPPORT_ROM_MGCG, "Rom Medium Grain Clock Gating"}, |
66 | {AMD_CG_SUPPORT_DF_MGCG, "Data Fabric Medium Grain Clock Gating"}, | 66 | {AMD_CG_SUPPORT_DF_MGCG, "Data Fabric Medium Grain Clock Gating"}, |
67 | |||
68 | {AMD_CG_SUPPORT_ATHUB_MGCG, "Address Translation Hub Medium Grain Clock Gating"}, | ||
69 | {AMD_CG_SUPPORT_ATHUB_LS, "Address Translation Hub Light Sleep"}, | ||
67 | {0, NULL}, | 70 | {0, NULL}, |
68 | }; | 71 | }; |
69 | 72 | ||
diff --git a/drivers/gpu/drm/amd/amdgpu/athub_v2_0.c b/drivers/gpu/drm/amd/amdgpu/athub_v2_0.c new file mode 100644 index 000000000000..89b32b6b81c8 --- /dev/null +++ b/drivers/gpu/drm/amd/amdgpu/athub_v2_0.c | |||
@@ -0,0 +1,101 @@ | |||
1 | /* | ||
2 | * Copyright 2019 Advanced Micro Devices, Inc. | ||
3 | * | ||
4 | * Permission is hereby granted, free of charge, to any person obtaining a | ||
5 | * copy of this software and associated documentation files (the "Software"), | ||
6 | * to deal in the Software without restriction, including without limitation | ||
7 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
8 | * and/or sell copies of the Software, and to permit persons to whom the | ||
9 | * Software is furnished to do so, subject to the following conditions: | ||
10 | * | ||
11 | * The above copyright notice and this permission notice shall be included in | ||
12 | * all copies or substantial portions of the Software. | ||
13 | * | ||
14 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
15 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
16 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
17 | * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR | ||
18 | * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, | ||
19 | * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
20 | * OTHER DEALINGS IN THE SOFTWARE. | ||
21 | * | ||
22 | */ | ||
23 | |||
24 | #include "amdgpu.h" | ||
25 | #include "athub_v2_0.h" | ||
26 | |||
27 | #include "athub/athub_2_0_0_offset.h" | ||
28 | #include "athub/athub_2_0_0_sh_mask.h" | ||
29 | #include "athub/athub_2_0_0_default.h" | ||
30 | #include "navi10_enum.h" | ||
31 | |||
32 | #include "soc15_common.h" | ||
33 | |||
34 | static void | ||
35 | athub_v2_0_update_medium_grain_clock_gating(struct amdgpu_device *adev, | ||
36 | bool enable) | ||
37 | { | ||
38 | uint32_t def, data; | ||
39 | |||
40 | def = data = RREG32_SOC15(ATHUB, 0, mmATHUB_MISC_CNTL); | ||
41 | |||
42 | if (enable && (adev->cg_flags & AMD_CG_SUPPORT_MC_MGCG)) | ||
43 | data |= ATHUB_MISC_CNTL__CG_ENABLE_MASK; | ||
44 | else | ||
45 | data &= ~ATHUB_MISC_CNTL__CG_ENABLE_MASK; | ||
46 | |||
47 | if (def != data) | ||
48 | WREG32_SOC15(ATHUB, 0, mmATHUB_MISC_CNTL, data); | ||
49 | } | ||
50 | |||
51 | static void | ||
52 | athub_v2_0_update_medium_grain_light_sleep(struct amdgpu_device *adev, | ||
53 | bool enable) | ||
54 | { | ||
55 | uint32_t def, data; | ||
56 | |||
57 | def = data = RREG32_SOC15(ATHUB, 0, mmATHUB_MISC_CNTL); | ||
58 | |||
59 | if (enable && (adev->cg_flags & AMD_CG_SUPPORT_MC_LS) && | ||
60 | (adev->cg_flags & AMD_CG_SUPPORT_HDP_LS)) | ||
61 | data |= ATHUB_MISC_CNTL__CG_MEM_LS_ENABLE_MASK; | ||
62 | else | ||
63 | data &= ~ATHUB_MISC_CNTL__CG_MEM_LS_ENABLE_MASK; | ||
64 | |||
65 | if (def != data) | ||
66 | WREG32_SOC15(ATHUB, 0, mmATHUB_MISC_CNTL, data); | ||
67 | } | ||
68 | |||
69 | int athub_v2_0_set_clockgating(struct amdgpu_device *adev, | ||
70 | enum amd_clockgating_state state) | ||
71 | { | ||
72 | if (amdgpu_sriov_vf(adev)) | ||
73 | return 0; | ||
74 | |||
75 | switch (adev->asic_type) { | ||
76 | case CHIP_NAVI10: | ||
77 | athub_v2_0_update_medium_grain_clock_gating(adev, | ||
78 | state == AMD_CG_STATE_GATE ? true : false); | ||
79 | athub_v2_0_update_medium_grain_light_sleep(adev, | ||
80 | state == AMD_CG_STATE_GATE ? true : false); | ||
81 | break; | ||
82 | default: | ||
83 | break; | ||
84 | } | ||
85 | |||
86 | return 0; | ||
87 | } | ||
88 | |||
89 | void athub_v2_0_get_clockgating(struct amdgpu_device *adev, u32 *flags) | ||
90 | { | ||
91 | int data; | ||
92 | |||
93 | /* AMD_CG_SUPPORT_ATHUB_MGCG */ | ||
94 | data = RREG32_SOC15(ATHUB, 0, mmATHUB_MISC_CNTL); | ||
95 | if (data & ATHUB_MISC_CNTL__CG_ENABLE_MASK) | ||
96 | *flags |= AMD_CG_SUPPORT_ATHUB_MGCG; | ||
97 | |||
98 | /* AMD_CG_SUPPORT_ATHUB_LS */ | ||
99 | if (data & ATHUB_MISC_CNTL__CG_MEM_LS_ENABLE_MASK) | ||
100 | *flags |= AMD_CG_SUPPORT_ATHUB_LS; | ||
101 | } | ||
diff --git a/drivers/gpu/drm/amd/amdgpu/athub_v2_0.h b/drivers/gpu/drm/amd/amdgpu/athub_v2_0.h new file mode 100644 index 000000000000..02932c1c8bab --- /dev/null +++ b/drivers/gpu/drm/amd/amdgpu/athub_v2_0.h | |||
@@ -0,0 +1,30 @@ | |||
1 | /* | ||
2 | * Copyright 2019 Advanced Micro Devices, Inc. | ||
3 | * | ||
4 | * Permission is hereby granted, free of charge, to any person obtaining a | ||
5 | * copy of this software and associated documentation files (the "Software"), | ||
6 | * to deal in the Software without restriction, including without limitation | ||
7 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
8 | * and/or sell copies of the Software, and to permit persons to whom the | ||
9 | * Software is furnished to do so, subject to the following conditions: | ||
10 | * | ||
11 | * The above copyright notice and this permission notice shall be included in | ||
12 | * all copies or substantial portions of the Software. | ||
13 | * | ||
14 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
15 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
16 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
17 | * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR | ||
18 | * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, | ||
19 | * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
20 | * OTHER DEALINGS IN THE SOFTWARE. | ||
21 | * | ||
22 | */ | ||
23 | #ifndef __ATHUB_V2_0_H__ | ||
24 | #define __ATHUB_V2_0_H__ | ||
25 | |||
26 | int athub_v2_0_set_clockgating(struct amdgpu_device *adev, | ||
27 | enum amd_clockgating_state state); | ||
28 | void athub_v2_0_get_clockgating(struct amdgpu_device *adev, u32 *flags); | ||
29 | |||
30 | #endif | ||
diff --git a/drivers/gpu/drm/amd/include/amd_shared.h b/drivers/gpu/drm/amd/include/amd_shared.h index 15fbb2dff462..1e638357c4a3 100644 --- a/drivers/gpu/drm/amd/include/amd_shared.h +++ b/drivers/gpu/drm/amd/include/amd_shared.h | |||
@@ -96,6 +96,8 @@ enum amd_powergating_state { | |||
96 | #define AMD_CG_SUPPORT_HDP_DS (1 << 25) | 96 | #define AMD_CG_SUPPORT_HDP_DS (1 << 25) |
97 | #define AMD_CG_SUPPORT_HDP_SD (1 << 26) | 97 | #define AMD_CG_SUPPORT_HDP_SD (1 << 26) |
98 | #define AMD_CG_SUPPORT_IH_CG (1 << 27) | 98 | #define AMD_CG_SUPPORT_IH_CG (1 << 27) |
99 | #define AMD_CG_SUPPORT_ATHUB_LS (1 << 28) | ||
100 | #define AMD_CG_SUPPORT_ATHUB_MGCG (1 << 29) | ||
99 | /* PG flags */ | 101 | /* PG flags */ |
100 | #define AMD_PG_SUPPORT_GFX_PG (1 << 0) | 102 | #define AMD_PG_SUPPORT_GFX_PG (1 << 0) |
101 | #define AMD_PG_SUPPORT_GFX_SMG (1 << 1) | 103 | #define AMD_PG_SUPPORT_GFX_SMG (1 << 1) |