drm/amdgpu: add amdgpu_smuio structure
Subsystems (2)
PATCH 1/5 drm/amdgpu: add amdgpu_smuio structure
Add amdgpu_smuio structure in amdgpu_device to
provide various callback functions to support
smuio ip funcitonality
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 ++++ drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h | 37 +++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h
drivers/gpu/drm/amd/amdgpu/amdgpu.h +4 -0
@@ -106,6 +106,7 @@#include "amdgpu_mmhub.h" #include "amdgpu_gfxhub.h" #include "amdgpu_df.h" +#include "amdgpu_smuio.h" #define MAX_GPU_INSTANCE 16
@@ -923,6 +924,9 @@ struct amdgpu_device {/* nbio */ struct amdgpu_nbio nbio; +/* smuio */ +struct amdgpu_smuio smuio; +/* mmhub */ struct amdgpu_mmhub mmhub;
drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h new file +37 -0
@@ -0,0 +1,37 @@ +/* +* Copyright 2020 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +*/ +#ifndef __AMDGPU_SMUIO_H__ +#define __AMDGPU_SMUIO_H__ + +struct amdgpu_smuio_funcs { +u32 (*get_rom_index_offset)(struct amdgpu_device *adev); +u32 (*get_rom_data_offset)(struct amdgpu_device *adev); +void (*update_rom_clock_gating)(struct amdgpu_device *adev,bool enable); +void (*get_clock_gating_state)(struct amdgpu_device *adev,u32 *flags); +}; + +struct amdgpu_smuio { +const struct amdgpu_smuio_funcs *funcs; +}; + +#endif /* __AMDGPU_SMUIO_H__ */
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/5 drm/amdgpu: implement smuio v9_0 callbacks
Vega10/12 will use smuio v9_0 callbacks
--- drivers/gpu/drm/amd/amdgpu/Makefile | 4 ++ drivers/gpu/drm/amd/amdgpu/smuio_v9_0.c | 77 +++++++++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/smuio_v9_0.h | 30 +++++++++++++ 3 files changed, 111 insertions(+) create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v9_0.c create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v9_0.h
drivers/gpu/drm/amd/amdgpu/Makefile +4 -0
@@ -167,6 +167,10 @@ amdgpu-y += \ athub_v2_0.o \ athub_v2_1.o +# add SMUIO block +amdgpu-y += \ + smuio_v9_0.o + # add amdkfd interfaces amdgpu-y += amdgpu_amdkfd.o
drivers/gpu/drm/amd/amdgpu/smuio_v9_0.c new file +77 -0
77 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/smuio_v9_0.h new file +30 -0
@@ -0,0 +1,30 @@ +/* +* Copyright 2020 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +*/ +#ifndef __SMUIO_V9_0_H__ +#define __SMUIO_V9_0_H__ + +#include "soc15_common.h" + +extern const struct amdgpu_smuio_funcs smuio_v9_0_funcs; + +#endif /* __SMUIO_V9_0_H__ */
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/5 drm/amdgpu: implement smuio v11_0 callbacks
In reply to Hawking ZhangVega20/Arcturus will use smuio v11_0 callbacks
--- drivers/gpu/drm/amd/amdgpu/Makefile | 3 +- drivers/gpu/drm/amd/amdgpu/smuio_v11_0.c | 77 ++++++++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/smuio_v11_0.h | 30 +++++++++++++ 3 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v11_0.c create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v11_0.h
drivers/gpu/drm/amd/amdgpu/Makefile +2 -1
@@ -169,7 +169,8 @@ amdgpu-y += \ # add SMUIO block amdgpu-y += \ - smuio_v9_0.o + smuio_v9_0.o \ + smuio_v11_0.o # add amdkfd interfaces amdgpu-y += amdgpu_amdkfd.o
drivers/gpu/drm/amd/amdgpu/smuio_v11_0.c new file +77 -0
77 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/smuio_v11_0.h new file +30 -0
@@ -0,0 +1,30 @@ +/* +* Copyright 2020 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +*/ +#ifndef __SMUIO_V11_0_H__ +#define __SMUIO_V11_0_H__ + +#include "soc15_common.h" + +extern const struct amdgpu_smuio_funcs smuio_v11_0_funcs; + +#endif /* __SMUIO_V11_0_H__ */
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/5 drm/amdgpu: switch to use smuio callbacks for AI family
In reply to Hawking ZhangSwitch to smuio callbacks: use smuio v9_0 callbacks for Vega10/12, smuio v11_0 callbacks for Vega20/Arcturus. APUs don't support enable/disable rom clock gating and also don't support read bios from rom. So APU flag check is needed in clock gating callbacks and asic funciton for read bios from rom to prevent access unknown offset on APU.
--- drivers/gpu/drm/amd/amdgpu/soc15.c | 57 ++++++++++---------------------------- 1 file changed, 14 insertions(+), 43 deletions(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +14 -43
@@ -42,8 +42,6 @@#include "sdma1/sdma1_4_0_offset.h" #include "hdp/hdp_4_0_offset.h" #include "hdp/hdp_4_0_sh_mask.h" -#include "smuio/smuio_9_0_offset.h" -#include "smuio/smuio_9_0_sh_mask.h" #include "nbio/nbio_7_0_default.h" #include "nbio/nbio_7_0_offset.h" #include "nbio/nbio_7_0_sh_mask.h"
@@ -71,6 +69,8 @@#include "jpeg_v2_0.h" #include "vcn_v2_5.h" #include "jpeg_v2_5.h" +#include "smuio_v9_0.h" +#include "smuio_v11_0.h" #include "dce_virtual.h" #include "mxgpu_ai.h" #include "amdgpu_smu.h"
@@ -91,12 +91,6 @@#define HDP_MEM_POWER_CTRL__RC_MEM_POWER_LS_EN_MASK 0x00020000L#define mmHDP_MEM_POWER_CTRL_BASE_IDX 0 -/* for Vega20/arcturus regiter offset change */ -#define mmROM_INDEX_VG20 0x00e4 -#define mmROM_INDEX_VG20_BASE_IDX 0 -#define mmROM_DATA_VG20 0x00e5 -#define mmROM_DATA_VG20_BASE_IDX 0 -/* * Indirect registers accessor */
@@ -296,17 +290,10 @@ static bool soc15_read_bios_from_rom(struct amdgpu_device *adev, dw_ptr = (u32 *)bios; length_dw =ALIGN (length_bytes,4 ) /4 ; -switch (adev->asic_type) { -case CHIP_VEGA20 : -case CHIP_ARCTURUS : - rom_index_offset =SOC15_REG_OFFSET (SMUIO ,0 , mmROM_INDEX_VG20); - rom_data_offset =SOC15_REG_OFFSET (SMUIO ,0 , mmROM_DATA_VG20); -break ; -default : - rom_index_offset =SOC15_REG_OFFSET (SMUIO ,0 , mmROM_INDEX); - rom_data_offset =SOC15_REG_OFFSET (SMUIO ,0 , mmROM_DATA); -break ; - } + rom_index_offset = + adev->smuio.funcs->get_rom_index_offset (adev); + rom_data_offset = + adev->smuio.funcs->get_rom_data_offset (adev);/* set rom index to 0 */ WREG32 (rom_index_offset,0 );
@@ -718,6 +705,12 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)else adev->df.funcs = &df_v1_7_funcs; +if (adev->asic_type ==CHIP_VEGA20 || + adev->asic_type ==CHIP_ARCTURUS ) + adev->smuio.funcs = &smuio_v11_0_funcs; +else + adev->smuio.funcs = &smuio_v9_0_funcs; + adev->rev_id =soc15_get_rev_id (adev);switch (adev->asic_type) {
@@ -1511,24 +1504,6 @@ static void soc15_update_drm_light_sleep(struct amdgpu_device *adev, bool enableWREG32 (SOC15_REG_OFFSET (MP0 ,0 , mmMP0_MISC_LIGHT_SLEEP_CTRL), data); } -static void soc15_update_rom_medium_grain_clock_gating (struct amdgpu_device *adev, -bool enable) -{ -uint32_t def, data; - - def = data =RREG32 (SOC15_REG_OFFSET (SMUIO ,0 , mmCGTT_ROM_CLK_CTRL0)); - -if (enable && (adev->cg_flags &AMD_CG_SUPPORT_ROM_MGCG )) - data &= ~(CGTT_ROM_CLK_CTRL0__SOFT_OVERRIDE0_MASK | -CGTT_ROM_CLK_CTRL0__SOFT_OVERRIDE1_MASK ); -else - data |=CGTT_ROM_CLK_CTRL0__SOFT_OVERRIDE0_MASK | -CGTT_ROM_CLK_CTRL0__SOFT_OVERRIDE1_MASK ; - -if (def != data) -WREG32 (SOC15_REG_OFFSET (SMUIO ,0 , mmCGTT_ROM_CLK_CTRL0), data); -} -static int soc15_common_set_clockgating_state (void *handle,enum amd_clockgating_state state) {
@@ -1551,7 +1526,7 @@ static int soc15_common_set_clockgating_state(void *handle, state == AMD_CG_STATE_GATE);soc15_update_drm_light_sleep (adev, state ==AMD_CG_STATE_GATE ); -soc15_update_rom_medium_grain_clock_gating (adev, + adev->smuio.funcs->update_rom_clock_gating (adev, state ==AMD_CG_STATE_GATE ); adev->df.funcs->update_medium_grain_clock_gating (adev, state ==AMD_CG_STATE_GATE );
@@ -1568,8 +1543,6 @@ static int soc15_common_set_clockgating_state(void *handle, state == AMD_CG_STATE_GATE);soc15_update_drm_light_sleep (adev, state ==AMD_CG_STATE_GATE ); -soc15_update_rom_medium_grain_clock_gating (adev, - state ==AMD_CG_STATE_GATE );break ;case CHIP_ARCTURUS : soc15_update_hdp_light_sleep(adev,
@@ -1607,9 +1580,7 @@ static void soc15_common_get_clockgating_state(void *handle, u32 *flags) *flags |=AMD_CG_SUPPORT_DRM_LS ;/* AMD_CG_SUPPORT_ROM_MGCG */ - data =RREG32 (SOC15_REG_OFFSET (SMUIO ,0 , mmCGTT_ROM_CLK_CTRL0)); -if (!(data &CGTT_ROM_CLK_CTRL0__SOFT_OVERRIDE0_MASK )) - *flags |=AMD_CG_SUPPORT_ROM_MGCG ; + adev->smuio.funcs->get_clock_gating_state (adev, flags); adev->df.funcs->get_clockgating_state (adev, flags); }
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/5 drm/amdgpu: disable rom clock gating support for APUs
In reply to Hawking ZhangROM clock gating enable/disable is not supported on APU platform. (i.e. CGTT_ROM_CLK_CTRL0 register is not availabe on APU). SMUIO callbacks will check APU flag before enable/disable rom clock gating, and skip the programming. Accordingly, query clock gating status through CGTT_ROM_CLK_CTRL0 also doesn't support on APU platform.
The change applies to RAVEN/RAVEN2/PICASSO/RENOIR.
--- drivers/gpu/drm/amd/amdgpu/soc15.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +0 -4
@@ -1169,7 +1169,6 @@ static int soc15_common_early_init(void *handle)AMD_CG_SUPPORT_GFX_CGLS |AMD_CG_SUPPORT_BIF_LS |AMD_CG_SUPPORT_HDP_LS | -AMD_CG_SUPPORT_ROM_MGCG |AMD_CG_SUPPORT_MC_MGCG |AMD_CG_SUPPORT_MC_LS | AMD_CG_SUPPORT_SDMA_MGCG |
@@ -1187,7 +1186,6 @@ static int soc15_common_early_init(void *handle)AMD_CG_SUPPORT_GFX_CGLS |AMD_CG_SUPPORT_BIF_LS |AMD_CG_SUPPORT_HDP_LS | -AMD_CG_SUPPORT_ROM_MGCG |AMD_CG_SUPPORT_MC_MGCG |AMD_CG_SUPPORT_MC_LS | AMD_CG_SUPPORT_SDMA_MGCG |
@@ -1211,7 +1209,6 @@ static int soc15_common_early_init(void *handle)AMD_CG_SUPPORT_HDP_LS |AMD_CG_SUPPORT_DRM_MGCG |AMD_CG_SUPPORT_DRM_LS | -AMD_CG_SUPPORT_ROM_MGCG |AMD_CG_SUPPORT_MC_MGCG |AMD_CG_SUPPORT_MC_LS | AMD_CG_SUPPORT_SDMA_MGCG |
@@ -1264,7 +1261,6 @@ static int soc15_common_early_init(void *handle)AMD_CG_SUPPORT_SDMA_LS |AMD_CG_SUPPORT_BIF_LS |AMD_CG_SUPPORT_HDP_LS | -AMD_CG_SUPPORT_ROM_MGCG |AMD_CG_SUPPORT_VCN_MGCG |AMD_CG_SUPPORT_JPEG_MGCG | AMD_CG_SUPPORT_IH_CG |
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
RE: [PATCH 5/5] drm/amdgpu: disable rom clock gating support for APUs
[AMD Official Use Only - Internal Distribution Only]
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Hawking Zhang
Sent: Monday, November 9, 2020 4:17 PM
To: [email protected]
Cc: Zhang, Hawking <[email protected]>
Subject: [PATCH 5/5] drm/amdgpu: disable rom clock gating support for APUs
ROM clock gating enable/disable is not supported on APU platform. (i.e. CGTT_ROM_CLK_CTRL0 register is not availabe on APU). SMUIO callbacks will check APU flag before enable/disable rom clock gating, and skip the programming. Accordingly, query clock gating status through CGTT_ROM_CLK_CTRL0 also doesn't support on APU platform.
The change applies to RAVEN/RAVEN2/PICASSO/RENOIR.
--- drivers/gpu/drm/amd/amdgpu/soc15.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +0 -4
@@ -1169,7 +1169,6 @@ static int soc15_common_early_init(void *handle)AMD_CG_SUPPORT_GFX_CGLS |AMD_CG_SUPPORT_BIF_LS |AMD_CG_SUPPORT_HDP_LS | -AMD_CG_SUPPORT_ROM_MGCG |AMD_CG_SUPPORT_MC_MGCG |AMD_CG_SUPPORT_MC_LS | AMD_CG_SUPPORT_SDMA_MGCG |
@@ -1187,7 +1186,6 @@ static int soc15_common_early_init(void *handle)AMD_CG_SUPPORT_GFX_CGLS |AMD_CG_SUPPORT_BIF_LS |AMD_CG_SUPPORT_HDP_LS | -AMD_CG_SUPPORT_ROM_MGCG |AMD_CG_SUPPORT_MC_MGCG |AMD_CG_SUPPORT_MC_LS | AMD_CG_SUPPORT_SDMA_MGCG |
@@ -1211,7 +1209,6 @@ static int soc15_common_early_init(void *handle)AMD_CG_SUPPORT_HDP_LS |AMD_CG_SUPPORT_DRM_MGCG |AMD_CG_SUPPORT_DRM_LS | -AMD_CG_SUPPORT_ROM_MGCG |AMD_CG_SUPPORT_MC_MGCG |AMD_CG_SUPPORT_MC_LS | AMD_CG_SUPPORT_SDMA_MGCG |
@@ -1264,7 +1261,6 @@ static int soc15_common_early_init(void *handle)AMD_CG_SUPPORT_SDMA_LS |AMD_CG_SUPPORT_BIF_LS |AMD_CG_SUPPORT_HDP_LS | -AMD_CG_SUPPORT_ROM_MGCG |AMD_CG_SUPPORT_VCN_MGCG |AMD_CG_SUPPORT_JPEG_MGCG | AMD_CG_SUPPORT_IH_CG |
--
2.7.4
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Cjohn.clements%40amd.com%7C5304c5c8408143f3733e08d88487e5ca%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637405066507439386%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=ZGqNyyHZ3Fy%2Fe3SpP9nbSCaR%2FXHAnQIaVv414Tdg1iM%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx