Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amdgpu: add support for athub v2.1

Add athub v2.1 function and support to compile it.

Signed-off-by: Likun Gao <Likun.Gao@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Likun Gao and committed by
Alex Deucher
45d76eeb 9822ac8f

+132 -1
+2 -1
drivers/gpu/drm/amd/amdgpu/Makefile
··· 163 163 # add ATHUB block 164 164 amdgpu-y += \ 165 165 athub_v1_0.o \ 166 - athub_v2_0.o 166 + athub_v2_0.o \ 167 + athub_v2_1.o 167 168 168 169 # add amdkfd interfaces 169 170 amdgpu-y += amdgpu_amdkfd.o
+100
drivers/gpu/drm/amd/amdgpu/athub_v2_1.c
··· 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_1.h" 26 + 27 + #include "athub/athub_2_1_0_offset.h" 28 + #include "athub/athub_2_1_0_sh_mask.h" 29 + #include "navi10_enum.h" 30 + 31 + #include "soc15_common.h" 32 + 33 + static void 34 + athub_v2_1_update_medium_grain_clock_gating(struct amdgpu_device *adev, 35 + bool enable) 36 + { 37 + uint32_t def, data; 38 + 39 + def = data = RREG32_SOC15(ATHUB, 0, mmATHUB_MISC_CNTL); 40 + 41 + if (enable && (adev->cg_flags & AMD_CG_SUPPORT_MC_MGCG)) 42 + data |= ATHUB_MISC_CNTL__CG_ENABLE_MASK; 43 + else 44 + data &= ~ATHUB_MISC_CNTL__CG_ENABLE_MASK; 45 + 46 + if (def != data) 47 + WREG32_SOC15(ATHUB, 0, mmATHUB_MISC_CNTL, data); 48 + } 49 + 50 + static void 51 + athub_v2_1_update_medium_grain_light_sleep(struct amdgpu_device *adev, 52 + bool enable) 53 + { 54 + uint32_t def, data; 55 + 56 + def = data = RREG32_SOC15(ATHUB, 0, mmATHUB_MISC_CNTL); 57 + 58 + if (enable && (adev->cg_flags & AMD_CG_SUPPORT_MC_LS) && 59 + (adev->cg_flags & AMD_CG_SUPPORT_HDP_LS)) 60 + data |= ATHUB_MISC_CNTL__CG_MEM_LS_ENABLE_MASK; 61 + else 62 + data &= ~ATHUB_MISC_CNTL__CG_MEM_LS_ENABLE_MASK; 63 + 64 + if(def != data) 65 + WREG32_SOC15(ATHUB, 0, mmATHUB_MISC_CNTL, data); 66 + } 67 + 68 + int athub_v2_1_set_clockgating(struct amdgpu_device *adev, 69 + enum amd_clockgating_state state) 70 + { 71 + if (amdgpu_sriov_vf(adev)) 72 + return 0; 73 + 74 + switch (adev->asic_type) { 75 + case CHIP_SIENNA_CICHLID: 76 + athub_v2_1_update_medium_grain_clock_gating(adev, 77 + state == AMD_CG_STATE_GATE ? true : false); 78 + athub_v2_1_update_medium_grain_light_sleep(adev, 79 + state == AMD_CG_STATE_GATE ? true : false); 80 + break; 81 + default: 82 + break; 83 + } 84 + 85 + return 0; 86 + } 87 + 88 + void athub_v2_1_get_clockgating(struct amdgpu_device *adev, u32 *flags) 89 + { 90 + int data; 91 + 92 + /* AMD_CG_SUPPORT_ATHUB_MGCG */ 93 + data = RREG32_SOC15(ATHUB, 0, mmATHUB_MISC_CNTL); 94 + if (data & ATHUB_MISC_CNTL__CG_ENABLE_MASK) 95 + *flags |= AMD_CG_SUPPORT_ATHUB_MGCG; 96 + 97 + /* AMD_CG_SUPPORT_ATHUB_LS */ 98 + if (data & ATHUB_MISC_CNTL__CG_MEM_LS_ENABLE_MASK) 99 + *flags |= AMD_CG_SUPPORT_ATHUB_LS; 100 + }
+30
drivers/gpu/drm/amd/amdgpu/athub_v2_1.h
··· 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_1_H__ 24 + #define __ATHUB_V2_1_H__ 25 + 26 + int athub_v2_1_set_clockgating(struct amdgpu_device *adev, 27 + enum amd_clockgating_state state); 28 + void athub_v2_1_get_clockgating(struct amdgpu_device *adev, u32 *flags); 29 + 30 + #endif