Add initial support for Yellow Carp
Subsystems (7)
Alex Deucher
maintainercover Add initial support for Yellow Carp
This patch set adds initial support for Yellow Carp, a new GPU from AMD.
I did not send out patch 1 due to its size (new register headers), but you can view the entire patch set here:
https://gitlab.freedesktop.org/agd5f/linux/-/commits/yellow_carp
Aaron Liu (42):
drm/amdgpu: add yellow carp asic header files (v3) drm/amdgpu: add yellow carp asic_type enum
drm/amdgpu: add uapi to define yellow carp series drm/amdgpu: add yellow carp support for gpu_info and ip block setting drm/amdgpu: add nv common ip block support for yellow carp drm/amdgpu: add yellow carp support for ih block drm/amdgpu: add gmc v10 supports for yellow carp drm/amdgpu: support fw load type for yellow carp drm/amdgpu: add gfx support for yellow carp
drm/amdgpu: add sdma support for yellow carp
drm/amdgpu: set ip blocks for yellow carp
drm/amdkfd: add yellow carp KFD support
drm/amdgpu: support nbio_7_2_1 for yellow carp drm/admgpu/pm: add smu v13 driver interface header for yellow carp
(v3)
drm/amdgpu/pm: add smu v13.0.1 firmware header for yellow carp (V4) drm/amdgpu/pm: add smu v13.0.1 smc header for yellow carp (v2) drm/amd/pm: add smu13 ip support for moment(V3) drm/amd/pm: add yellow_carp_ppt implementation(V3) drm/amd/pm: partially enable swsmu for yellow carp(V2) drm/amdgpu: add smu ip block for yellow carp(V3) drm/amdgpu: add gfx golden settings for yellow carp (v3) drm/amdgpu: reserved buffer is not needed with ip discovery enabled drm/amdgpu: add psp_v13 support for yellow carp drm/amdgpu: enable psp_v13 for yellow carp
drm/amdgpu/pm: set_pp_feature is unsupport for yellow carp drm/amdgpu/pm: add set_driver_table_location implementation for yellow
carp
drm/amdgpu: add GFX Clock Gating support for yellow carp drm/amdgpu: add MMHUB Clock Gating support for yellow carp drm/amdgpu: add GFX Power Gating support for yellow carp drm/amdgpu/pm: enable smu_hw_init for yellow carp drm/amdgpu/pm: add gfx_off_control for yellow carp drm/amdgpu/pm: enable gfx_off in yellow carp smu post init drm/amdgpu: add SDMA Clock Gating support for yellow carp drm/amdgpu: add HDP Clock Gating support for yellow carp drm/amdgpu: add ATHUB Clock Gating support for yellow carp drm/amdgpu: add IH Clock Gating support for yellow carp drm/amdgpu: enable VCN PG and CG for yellow carp drm/amdgpu/pm: support smu_post_init for yellow carp drm/amdgpu: add RLC_PG_DELAY_3 for yellow carp
drm/amdgpu: add timestamp counter query support for yellow carp drm/amd/pm: add PrepareMp1ForUnload support for yellow carp drm/amdgpu: add mode2 reset support for yellow carp
Alex Deucher (2):
drm/amdgpu: add yellow_carp_reg_base_init function for yellow carp
(v2)
drm/amdgpu: add mmhub client support for yellow carp
Huang Rui (2):
drm/amdgpu: introduce a stolen reserved buffer to protect specific
buffer region (v2)
drm/amd/pm: add vcn/jepg enable functions for yellow carp
James Zhu (5):
drm/amdgpu/jpeg: Remove harvest checking on CHIP_YELLOW_CARP drm/amdgpu/vcn: add vcn support for yellow carp drm/amdgpu: enable vcn/jpeg on yellow carp drm/amdgpu: enable vcn dpg mode on yellow carp drm/amdgpu: add video_codecs query support for yellow carp
Nicholas Kazlauskas (22):
drm/amdgpu: Load TA firmware for yellow carp drm/amdgpu: Update atomfirmware for DCN3.1 phy tuning and eDP caps drm/amd/display: Add DCN3.1 yellow carp asic family IDs drm/amd/display: Add DCN3.1 clock manager support drm/amd/display: Add DCN3.1 DCCG
drm/amd/display: Add DCN3.1 DIO
drm/amd/display: Add DCN3.1 OPTC
drm/amd/display: Add DCN3.1 DCHHUB
drm/amd/display: Add DCN3.1 DML calculation support drm/amd/display: Add DCN3.1 IRQ manager drm/amd/display: Add DCN3.1 GPIO support drm/amd/display: Add DCN3.1 DMCUB
drm/amd/display: Add DCN3.1 PANEL
drm/amd/display: Add DCN3.1 HDCP support drm/amd/display: Add DCN3.1 BIOS parser support drm/amd/display: Add DCN3.1 HWSEQ
drm/amd/display: Add z10 restore checks for DC interfaces drm/amd/display: Add DCN3.1 Resource
drm/amd/display: Add DCN3.1 blocks to the DC Makefile drm/amd/display: Add DCN3.1 Yellow Carp support to DM drm/amd/display: Add DC DCN3.1 support to Kconfig drm/amdgpu: Add DC support and display block for Yellow Carp
Xiaomeng Hou (16):
drm/amd/pm: add read_sensor function for yellow carp drm/amd/pm: add set_watermarks_table function for yellow carp drm/amd/pm: add the fine grain tuning function for yellow carp drm/amd/pm: add support to get dpm clock value for yellow carp drm/amd/pm: add feature map for yellow carp
drm/amd/pm: implement is_dpm_running() callback for yellow carp drm/amd/pm: initialize feature_enabled/feature_support bitmap for
yellow carp
drm/amd/pm: add callback force_clk_levels for yellow carp drm/amd/pm: add callback to get bootup values for yellow carp drm/amd/pm: add callback get_dpm_ultimate_freq for yellow carp drm/amd/pm: add callbacks to read/write sysfs file
pp_power_profile_mode
drm/amd/pm: add the interface to dump smu metrics table for yellow
carp
drm/amdgpu: add gpu harvest support for yellow carp (v2) drm/amdgpu: correct the cu and rb info for yellow carp drm/amd/pm: add set_performance_level function for yellow carp drm/amd/pm: disable manually setting MCLK power level on yellow carp
drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 9 + drivers/gpu/drm/amd/amdgpu/amdgpu_gfxhub.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 19 + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 4 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 10 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 4 + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 8 + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 83 +- drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 40 + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 17 +- drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 9 +- drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 1 + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 1 + drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 142 +- drivers/gpu/drm/amd/amdgpu/nv.c | 51 + drivers/gpu/drm/amd/amdgpu/nv.h | 2 + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 37 +- drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 7 + .../gpu/drm/amd/amdgpu/yellow_carp_reg_init.c | 51 + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 52 + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 19 + .../drm/amd/amdkfd/kfd_device_queue_manager.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 1 + .../gpu/drm/amd/amdkfd/kfd_packet_manager.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 1 + drivers/gpu/drm/amd/display/Kconfig | 7 + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 44 + .../amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 13 + .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 6 + drivers/gpu/drm/amd/display/dc/Makefile | 3 + .../drm/amd/display/dc/bios/bios_parser2.c | 113 + .../display/dc/bios/command_table_helper2.c | 5 + .../gpu/drm/amd/display/dc/clk_mgr/Makefile | 11 + .../gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 30 + .../display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 4 + .../display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 673 + .../display/dc/clk_mgr/dcn31/dcn31_clk_mgr.h | 103 + .../amd/display/dc/clk_mgr/dcn31/dcn31_smu.c | 333 + .../amd/display/dc/clk_mgr/dcn31/dcn31_smu.h | 271 + drivers/gpu/drm/amd/display/dc/core/dc.c | 17 + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 18 + .../gpu/drm/amd/display/dc/core/dc_resource.c | 26 + .../gpu/drm/amd/display/dc/core/dc_stream.c | 6 + drivers/gpu/drm/amd/display/dc/dc.h | 28 + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 23 + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 3 + .../gpu/drm/amd/display/dc/dce/dce_hwseq.h | 21 +- .../display/dc/dce110/dce110_hw_sequencer.c | 23 + .../drm/amd/display/dc/dcn10/dcn10_hubbub.h | 48 + .../amd/display/dc/dcn10/dcn10_link_encoder.h | 20 + .../gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 11 + .../gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 2 + .../gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 54 + .../drm/amd/display/dc/dcn20/dcn20_hubbub.h | 9 + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 16 + .../drm/amd/display/dc/dcn20/dcn20_hwseq.c | 37 + .../drm/amd/display/dc/dcn20/dcn20_resource.c | 39 + .../drm/amd/display/dc/dcn30/dcn30_hwseq.c | 5 + drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 35 + .../gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 279 + .../gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h | 147 + .../display/dc/dcn31/dcn31_dio_link_encoder.c | 412 + .../display/dc/dcn31/dcn31_dio_link_encoder.h | 246 + .../drm/amd/display/dc/dcn31/dcn31_hubbub.c | 956 + .../drm/amd/display/dc/dcn31/dcn31_hubbub.h | 122 + .../gpu/drm/amd/display/dc/dcn31/dcn31_hubp.c | 103 + .../gpu/drm/amd/display/dc/dcn31/dcn31_hubp.h | 246 + .../drm/amd/display/dc/dcn31/dcn31_hwseq.c | 598 + .../drm/amd/display/dc/dcn31/dcn31_hwseq.h | 56 + .../gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 151 + .../gpu/drm/amd/display/dc/dcn31/dcn31_init.h | 33 + .../gpu/drm/amd/display/dc/dcn31/dcn31_optc.c | 287 + .../gpu/drm/amd/display/dc/dcn31/dcn31_optc.h | 259 + .../amd/display/dc/dcn31/dcn31_panel_cntl.c | 157 + .../amd/display/dc/dcn31/dcn31_panel_cntl.h | 40 + .../drm/amd/display/dc/dcn31/dcn31_resource.c | 2180 + .../drm/amd/display/dc/dcn31/dcn31_resource.h | 42 + drivers/gpu/drm/amd/display/dc/dm_cp_psp.h | 5 + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 6 + drivers/gpu/drm/amd/display/dc/dml/Makefile | 11 + .../dc/dml/dcn31/display_mode_vba_31.c | 7506 ++ .../dc/dml/dcn31/display_mode_vba_31.h | 43 + .../dc/dml/dcn31/display_rq_dlg_calc_31.c | 1727 + .../dc/dml/dcn31/display_rq_dlg_calc_31.h | 69 + .../drm/amd/display/dc/dml/display_mode_lib.c | 18 + .../drm/amd/display/dc/dml/display_mode_lib.h | 4 + .../amd/display/dc/dml/display_mode_structs.h | 12 + .../drm/amd/display/dc/dml/display_mode_vba.c | 42 + .../drm/amd/display/dc/dml/display_mode_vba.h | 52 + .../gpu/drm/amd/display/dc/gpio/hw_factory.c | 3 + .../drm/amd/display/dc/gpio/hw_translate.c | 3 + .../gpu/drm/amd/display/dc/inc/core_types.h | 10 + .../gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 3 + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 56 + .../gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 5 + .../drm/amd/display/dc/inc/hw/link_encoder.h | 14 + .../gpu/drm/amd/display/dc/inc/hw/mem_input.h | 4 + .../amd/display/dc/inc/hw/timing_generator.h | 4 + .../gpu/drm/amd/display/dc/inc/hw_sequencer.h | 4 + drivers/gpu/drm/amd/display/dc/irq/Makefile | 11 + .../display/dc/irq/dcn31/irq_service_dcn31.c | 432 + .../display/dc/irq/dcn31/irq_service_dcn31.h | 37 + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 12 + .../gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 118 + drivers/gpu/drm/amd/display/dmub/src/Makefile | 3 + .../gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 354 + .../gpu/drm/amd/display/dmub/src/dmub_dcn31.h | 230 + .../gpu/drm/amd/display/dmub/src/dmub_srv.c | 37 + .../gpu/drm/amd/display/include/dal_asic_id.h | 13 + .../gpu/drm/amd/display/include/dal_types.h | 3 + .../drm/amd/display/modules/hdcp/hdcp_log.c | 4 + .../drm/amd/display/modules/hdcp/hdcp_psp.c | 135 +- .../drm/amd/display/modules/hdcp/hdcp_psp.h | 38 + .../drm/amd/display/modules/inc/mod_hdcp.h | 23 +- .../include/asic_reg/dcn/dcn_3_1_2_offset.h | 15083 +++ .../include/asic_reg/dcn/dcn_3_1_2_sh_mask.h | 60747 +++++++++ .../include/asic_reg/dpcs/dpcs_4_2_0_offset.h | 11936 ++ .../asic_reg/dpcs/dpcs_4_2_0_sh_mask.h | 103385 +++++++++++++++ .../include/asic_reg/mp/mp_13_0_1_offset.h | 355 + .../include/asic_reg/mp/mp_13_0_1_sh_mask.h | 531 + drivers/gpu/drm/amd/include/atomfirmware.h | 56 +- .../gpu/drm/amd/include/yellow_carp_offset.h | 1366 + .../amd/pm/inc/smu13_driver_if_yellow_carp.h | 222 + drivers/gpu/drm/amd/pm/inc/smu_v13_0_1.h | 57 + drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_pmfw.h | 139 + .../gpu/drm/amd/pm/inc/smu_v13_0_1_ppsmc.h | 97 + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 7 + drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile | 2 +- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_1.c | 311 + .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 1210 + .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.h | 28 + include/drm/amd_asic_type.h | 1 + include/uapi/drm/amdgpu_drm.h | 1 + 136 files changed, 215465 insertions(+), 66 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/yellow_carp_reg_init.c create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.h create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/Makefile create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dio_link_encoder.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dio_link_encoder.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_panel_cntl.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_panel_cntl.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.h create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.h create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.c create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.h create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn31/irq_service_dcn31.c create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn31/irq_service_dcn31.h create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_1_2_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_1_2_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_4_2_0_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_4_2_0_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_1_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_1_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/yellow_carp_offset.h create mode 100644 drivers/gpu/drm/amd/pm/inc/smu13_driver_if_yellow_carp.h create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v13_0_1.h create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_pmfw.h create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_ppsmc.h create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_1.c create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.h
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 2/89 drm/amdgpu: add yellow carp asic_type enum
From: Aaron Liu <[email protected]>
This patch adds yellow carp to amd_asic_type enum and amdgpu_asic_name[].
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 + include/drm/amd_asic_type.h | 1 + 2 files changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -0
@@ -120,6 +120,7 @@ const char *amdgpu_asic_name[] = {"VANGOGH" ,"DIMGREY_CAVEFISH" ,"BEIGE_GOBY" , +"YELLOW_CARP" , "LAST", };
include/drm/amd_asic_type.h +1 -0
@@ -60,6 +60,7 @@ enum amd_asic_type {CHIP_VANGOGH ,/* 31 */ CHIP_DIMGREY_CAVEFISH ,/* 32 */ CHIP_BEIGE_GOBY ,/* 33 */ +CHIP_YELLOW_CARP ,/* 34 */ CHIP_LAST, };
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 3/89 drm/amdgpu: add uapi to define yellow carp series
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
Add a flag to define yellow carp series.
--- include/uapi/drm/amdgpu_drm.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/drm/amdgpu_drm.h +1 -0
@@ -1137,6 +1137,7 @@ struct drm_amdgpu_info_video_caps {#define AMDGPU_FAMILY_RV 142/* Raven */ #define AMDGPU_FAMILY_NV 143/* Navi10 */ #define AMDGPU_FAMILY_VGH 144/* Van Gogh */ +#define AMDGPU_FAMILY_YC 146/* Yellow Carp */ /* * Definition of free sync enter and exit signals
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 4/89 drm/amdgpu: add yellow carp support for gpu_info and ip block setting
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
This patch adds yellow carp support for gpu_info firmware and ip block setting.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +7 -0
@@ -82,6 +82,7 @@ MODULE_FIRMWARE("amdgpu/navi10_gpu_info.bin");MODULE_FIRMWARE ("amdgpu/navi14_gpu_info.bin" );MODULE_FIRMWARE ("amdgpu/navi12_gpu_info.bin" );MODULE_FIRMWARE ("amdgpu/vangogh_gpu_info.bin" ); +MODULE_FIRMWARE ("amdgpu/yellow_carp_gpu_info.bin" );#define AMDGPU_RESUME_MS 2000
@@ -1875,6 +1876,9 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev)case CHIP_VANGOGH : chip_name ="vangogh" ;break ; +case CHIP_YELLOW_CARP : + chip_name ="yellow_carp" ; +break ; }snprintf (fw_name,sizeof (fw_name),"amdgpu/%s_gpu_info.bin" , chip_name);
@@ -2053,8 +2057,11 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev)case CHIP_DIMGREY_CAVEFISH :case CHIP_BEIGE_GOBY :case CHIP_VANGOGH : +case CHIP_YELLOW_CARP :if (adev->asic_type ==CHIP_VANGOGH ) adev->family =AMDGPU_FAMILY_VGH ; +else if (adev->asic_type ==CHIP_YELLOW_CARP ) + adev->family =AMDGPU_FAMILY_YC ;else adev->family =AMDGPU_FAMILY_NV ;
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 5/89 drm/amdgpu: add yellow_carp_reg_base_init function for yellow carp (v2)
In reply to Alex DeucherThis patch adds yellow_carp_reg_base_init function to init the register base for yellow carp.
v2: squash in updates (Alex)
--- drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- drivers/gpu/drm/amd/amdgpu/nv.h | 2 + .../gpu/drm/amd/amdgpu/yellow_carp_reg_init.c | 51 + .../gpu/drm/amd/include/yellow_carp_offset.h | 1366 +++++++++++++++++ 4 files changed, 1420 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/yellow_carp_reg_init.c create mode 100644 drivers/gpu/drm/amd/include/yellow_carp_offset.h
drivers/gpu/drm/amd/amdgpu/Makefile +1 -1
@@ -75,7 +75,7 @@ amdgpu-y += \ vega20_reg_init.o nbio_v7_4.o nbio_v2_3.o nv.o navi10_reg_init.o navi14_reg_init.o \ arct_reg_init.o navi12_reg_init.o mxgpu_nv.o sienna_cichlid_reg_init.o vangogh_reg_init.o \ nbio_v7_2.o dimgrey_cavefish_reg_init.o hdp_v4_0.o hdp_v5_0.o aldebaran_reg_init.o aldebaran.o \ - beige_goby_reg_init.o + beige_goby_reg_init.o yellow_carp_reg_init.o # add DF block amdgpu-y += \
drivers/gpu/drm/amd/amdgpu/nv.h +2 -0
@@ -37,4 +37,6 @@ int sienna_cichlid_reg_base_init(struct amdgpu_device *adev);void vangogh_reg_base_init (struct amdgpu_device *adev);int dimgrey_cavefish_reg_base_init (struct amdgpu_device *adev);int beige_goby_reg_base_init (struct amdgpu_device *adev); +int yellow_carp_reg_base_init (struct amdgpu_device *adev); +#endif
drivers/gpu/drm/amd/amdgpu/yellow_carp_reg_init.c new file +51 -0
51 lines not on this page · raw message
drivers/gpu/drm/amd/include/yellow_carp_offset.h new file +1366 -0
1,366 lines not on this page · raw message
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 6/89 drm/amdgpu: add nv common ip block support for yellow carp
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
This patch adds common ip support for yellow carp.
--- drivers/gpu/drm/amd/amdgpu/nv.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/amd/amdgpu/nv.c +8 -0
@@ -782,6 +782,9 @@ static int nv_reg_base_init(struct amdgpu_device *adev)case CHIP_BEIGE_GOBY :beige_goby_reg_base_init (adev);break ; +case CHIP_YELLOW_CARP : +yellow_carp_reg_base_init (adev); +break ;default :return -EINVAL ; }
@@ -1309,6 +1312,11 @@ static int nv_common_early_init(void *handle)AMD_PG_SUPPORT_MMHUB ; adev->external_rev_id = adev->rev_id +0x46 ;break ; +case CHIP_YELLOW_CARP : + adev->cg_flags =0 ; + adev->pg_flags =0 ; + adev->external_rev_id = adev->rev_id +0x01 ; +break ;default :/* FIXME: not supported yet */ return -EINVAL ;
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 7/89 drm/amdgpu: add yellow carp support for ih block
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
This patch adds the support for yellow carp ih block.
--- drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/navi10_ih.c +1 -0
@@ -328,6 +328,7 @@ static int navi10_ih_irq_init(struct amdgpu_device *adev)case CHIP_VANGOGH :case CHIP_DIMGREY_CAVEFISH :case CHIP_BEIGE_GOBY : +case CHIP_YELLOW_CARP : ih_chicken =RREG32_SOC15 (OSSSYS ,0 , mmIH_CHICKEN_Sienna_Cichlid); ih_chicken =REG_SET_FIELD (ih_chicken,IH_CHICKEN ,MC_SPACE_GPA_ENABLE ,1 );
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 8/89 drm/amdgpu: add gmc v10 supports for yellow carp
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
Add gfx memory controller support for yellow carp.
--- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +7 -2
@@ -675,6 +675,7 @@ static void gmc_v10_0_set_mmhub_funcs(struct amdgpu_device *adev) {switch (adev->asic_type) {case CHIP_VANGOGH : +case CHIP_YELLOW_CARP : adev->mmhub.funcs = &mmhub_v2_3_funcs;break ;default :
@@ -691,6 +692,7 @@ static void gmc_v10_0_set_gfxhub_funcs(struct amdgpu_device *adev)case CHIP_VANGOGH :case CHIP_DIMGREY_CAVEFISH :case CHIP_BEIGE_GOBY : +case CHIP_YELLOW_CARP : adev->gfxhub.funcs = &gfxhub_v2_1_funcs;break ;default :
@@ -807,6 +809,7 @@ static int gmc_v10_0_mc_init(struct amdgpu_device *adev)case CHIP_VANGOGH :case CHIP_DIMGREY_CAVEFISH :case CHIP_BEIGE_GOBY : +case CHIP_YELLOW_CARP :default : adev->gmc.gart_size =512ULL <<20 ;break ;
@@ -875,6 +878,7 @@ static int gmc_v10_0_sw_init(void *handle)case CHIP_VANGOGH :case CHIP_DIMGREY_CAVEFISH :case CHIP_BEIGE_GOBY : +case CHIP_YELLOW_CARP : adev->num_vmhubs =2 ;/* * To fulfill 4-level page support,
@@ -991,6 +995,7 @@ static void gmc_v10_0_init_golden_registers(struct amdgpu_device *adev)case CHIP_VANGOGH :case CHIP_DIMGREY_CAVEFISH :case CHIP_BEIGE_GOBY : +case CHIP_YELLOW_CARP :break ;default :break ;
@@ -1146,7 +1151,7 @@ static int gmc_v10_0_set_clockgating_state(void *handle,return r;if (adev->asic_type >=CHIP_SIENNA_CICHLID && - adev->asic_type <=CHIP_DIMGREY_CAVEFISH ) + adev->asic_type <=CHIP_YELLOW_CARP )return athub_v2_1_set_clockgating (adev, state);else return athub_v2_0_set_clockgating (adev, state);
@@ -1159,7 +1164,7 @@ static void gmc_v10_0_get_clockgating_state(void *handle, u32 *flags) adev->mmhub.funcs->get_clockgating (adev, flags);if (adev->asic_type >=CHIP_SIENNA_CICHLID && - adev->asic_type <=CHIP_DIMGREY_CAVEFISH ) + adev->asic_type <=CHIP_YELLOW_CARP )athub_v2_1_get_clockgating (adev, flags);else athub_v2_0_get_clockgating (adev, flags);
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 9/89 drm/amdgpu: support fw load type for yellow carp
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
This patch sets fw load type as direct with fw_load_type=0 for yellow carp.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c +1 -0
@@ -404,6 +404,7 @@ amdgpu_ucode_get_load_type(struct amdgpu_device *adev, int load_type)case CHIP_DIMGREY_CAVEFISH :case CHIP_ALDEBARAN :case CHIP_BEIGE_GOBY : +case CHIP_YELLOW_CARP :if (!load_type)return AMDGPU_FW_LOAD_DIRECT ;else
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 10/89 drm/amdgpu: add gfx support for yellow carp
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
Add yellow carp checks to gfx10 code.
--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +26 -0
@@ -243,6 +243,13 @@ MODULE_FIRMWARE("amdgpu/beige_goby_mec.bin");MODULE_FIRMWARE ("amdgpu/beige_goby_mec2.bin" );MODULE_FIRMWARE ("amdgpu/beige_goby_rlc.bin" ); +MODULE_FIRMWARE ("amdgpu/yellow_carp_ce.bin" ); +MODULE_FIRMWARE ("amdgpu/yellow_carp_pfp.bin" ); +MODULE_FIRMWARE ("amdgpu/yellow_carp_me.bin" ); +MODULE_FIRMWARE ("amdgpu/yellow_carp_mec.bin" ); +MODULE_FIRMWARE ("amdgpu/yellow_carp_mec2.bin" ); +MODULE_FIRMWARE ("amdgpu/yellow_carp_rlc.bin" ); +static const struct soc15_reg_golden golden_settings_gc_10_1[] = {SOC15_REG_GOLDEN_VALUE (GC ,0 , mmCB_HW_CONTROL_4,0xffffffff ,0x00400014 ),
@@ -3859,6 +3866,7 @@ static void gfx_v10_0_check_fw_write_wait(struct amdgpu_device *adev)case CHIP_VANGOGH :case CHIP_DIMGREY_CAVEFISH :case CHIP_BEIGE_GOBY : +case CHIP_YELLOW_CARP : adev->gfx.cp_fw_write_wait = true;break ;default :
@@ -3976,6 +3984,9 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev)case CHIP_BEIGE_GOBY : chip_name ="beige_goby" ;break ; +case CHIP_YELLOW_CARP : + chip_name ="yellow_carp" ; +break ;default :BUG (); }
@@ -4545,6 +4556,7 @@ static void gfx_v10_0_gpu_early_init(struct amdgpu_device *adev)case CHIP_VANGOGH :case CHIP_DIMGREY_CAVEFISH :case CHIP_BEIGE_GOBY : +case CHIP_YELLOW_CARP : adev->gfx.config.max_hw_contexts =8 ; adev->gfx.config.sc_prim_fifo_size_frontend =0x20 ; adev->gfx.config.sc_prim_fifo_size_backend =0x100 ;
@@ -4670,6 +4682,7 @@ static int gfx_v10_0_sw_init(void *handle)case CHIP_VANGOGH :case CHIP_DIMGREY_CAVEFISH :case CHIP_BEIGE_GOBY : +case CHIP_YELLOW_CARP : adev->gfx.me.num_me =1 ; adev->gfx.me.num_pipe_per_me =1 ; adev->gfx.me.num_queue_per_pipe =1 ;
@@ -6178,6 +6191,7 @@ static void gfx_v10_0_cp_gfx_set_doorbell(struct amdgpu_device *adev,case CHIP_VANGOGH :case CHIP_DIMGREY_CAVEFISH :case CHIP_BEIGE_GOBY : +case CHIP_YELLOW_CARP : tmp =REG_SET_FIELD (0 ,CP_RB_DOORBELL_RANGE_LOWER , DOORBELL_RANGE_LOWER_Sienna_Cichlid, ring->doorbell_index);WREG32_SOC15 (GC ,0 , mmCP_RB_DOORBELL_RANGE_LOWER, tmp);
@@ -6314,6 +6328,7 @@ static void gfx_v10_0_cp_compute_enable(struct amdgpu_device *adev, bool enable)case CHIP_VANGOGH :case CHIP_DIMGREY_CAVEFISH :case CHIP_BEIGE_GOBY : +case CHIP_YELLOW_CARP :WREG32_SOC15 (GC ,0 , mmCP_MEC_CNTL_Sienna_Cichlid,0 );break ;default :
@@ -6327,6 +6342,7 @@ static void gfx_v10_0_cp_compute_enable(struct amdgpu_device *adev, bool enable)case CHIP_VANGOGH :case CHIP_DIMGREY_CAVEFISH :case CHIP_BEIGE_GOBY : +case CHIP_YELLOW_CARP :WREG32_SOC15 (GC ,0 , mmCP_MEC_CNTL_Sienna_Cichlid, (CP_MEC_CNTL__MEC_ME1_HALT_MASK |CP_MEC_CNTL__MEC_ME2_HALT_MASK ));
@@ -6424,6 +6440,7 @@ static void gfx_v10_0_kiq_setting(struct amdgpu_ring *ring)case CHIP_VANGOGH :case CHIP_DIMGREY_CAVEFISH :case CHIP_BEIGE_GOBY : +case CHIP_YELLOW_CARP : tmp =RREG32_SOC15 (GC ,0 , mmRLC_CP_SCHEDULERS_Sienna_Cichlid); tmp &=0xffffff00 ; tmp |= (ring->me <<5 ) | (ring->pipe <<3 ) | (ring->queue);
@@ -7152,6 +7169,7 @@ static bool gfx_v10_0_check_grbm_cam_remapping(struct amdgpu_device *adev) }break ;case CHIP_VANGOGH : +case CHIP_YELLOW_CARP :return true;default : data =RREG32_SOC15 (GC ,0 , mmVGT_ESGS_RING_SIZE);
@@ -7186,6 +7204,7 @@ static void gfx_v10_0_setup_grbm_cam_remapping(struct amdgpu_device *adev)case CHIP_VANGOGH :case CHIP_DIMGREY_CAVEFISH :case CHIP_BEIGE_GOBY : +case CHIP_YELLOW_CARP :/* mmVGT_TF_RING_SIZE_UMD -> mmVGT_TF_RING_SIZE */ data = (SOC15_REG_OFFSET (GC ,0 , mmVGT_TF_RING_SIZE_UMD) << GRBM_CAM_DATA__CAM_ADDR__SHIFT) |
@@ -7496,6 +7515,7 @@ static int gfx_v10_0_soft_reset(void *handle)case CHIP_VANGOGH :case CHIP_DIMGREY_CAVEFISH :case CHIP_BEIGE_GOBY : +case CHIP_YELLOW_CARP :if (REG_GET_FIELD (tmp,GRBM_STATUS2 , RLC_BUSY_Sienna_Cichlid)) grbm_soft_reset = REG_SET_FIELD(grbm_soft_reset, GRBM_SOFT_RESET,
@@ -7606,6 +7626,7 @@ static int gfx_v10_0_early_init(void *handle)case CHIP_VANGOGH :case CHIP_DIMGREY_CAVEFISH :case CHIP_BEIGE_GOBY : +case CHIP_YELLOW_CARP : adev->gfx.num_gfx_rings = GFX10_NUM_GFX_RINGS_Sienna_Cichlid;break ;default :
@@ -7663,6 +7684,7 @@ static void gfx_v10_0_set_safe_mode(struct amdgpu_device *adev)case CHIP_VANGOGH :case CHIP_DIMGREY_CAVEFISH :case CHIP_BEIGE_GOBY : +case CHIP_YELLOW_CARP :WREG32_SOC15 (GC ,0 , mmRLC_SAFE_MODE_Sienna_Cichlid, data);/* wait for RLC_SAFE_MODE */
@@ -7698,6 +7720,7 @@ static void gfx_v10_0_unset_safe_mode(struct amdgpu_device *adev)case CHIP_VANGOGH :case CHIP_DIMGREY_CAVEFISH :case CHIP_BEIGE_GOBY : +case CHIP_YELLOW_CARP :WREG32_SOC15 (GC ,0 , mmRLC_SAFE_MODE_Sienna_Cichlid, data);break ;default :
@@ -8069,6 +8092,7 @@ static int gfx_v10_0_set_powergating_state(void *handle,amdgpu_gfx_off_ctrl (adev, enable);break ;case CHIP_VANGOGH : +case CHIP_YELLOW_CARP :gfx_v10_cntl_pg (adev, enable);amdgpu_gfx_off_ctrl (adev, enable);break ;
@@ -8095,6 +8119,7 @@ static int gfx_v10_0_set_clockgating_state(void *handle,case CHIP_VANGOGH :case CHIP_DIMGREY_CAVEFISH :case CHIP_BEIGE_GOBY : +case CHIP_YELLOW_CARP :gfx_v10_0_update_gfx_clock_gating (adev, state ==AMD_CG_STATE_GATE );break ;
@@ -9206,6 +9231,7 @@ static void gfx_v10_0_set_rlc_funcs(struct amdgpu_device *adev)case CHIP_VANGOGH :case CHIP_DIMGREY_CAVEFISH :case CHIP_BEIGE_GOBY : +case CHIP_YELLOW_CARP : adev->gfx.rlc.funcs = &gfx_v10_0_rlc_funcs;break ;case CHIP_NAVI12 :
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 11/89 drm/amdgpu: add sdma support for yellow carp
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
This patch adds the sdma v5.2 support for yellow carp.
--- drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c +7 -0
@@ -50,6 +50,7 @@ MODULE_FIRMWARE("amdgpu/dimgrey_cavefish_sdma.bin");MODULE_FIRMWARE ("amdgpu/beige_goby_sdma.bin" );MODULE_FIRMWARE ("amdgpu/vangogh_sdma.bin" ); +MODULE_FIRMWARE ("amdgpu/yellow_carp_sdma.bin" );#define SDMA1_REG_OFFSET 0x600#define SDMA3_REG_OFFSET 0x400
@@ -94,6 +95,7 @@ static void sdma_v5_2_init_golden_registers(struct amdgpu_device *adev)case CHIP_VANGOGH :case CHIP_DIMGREY_CAVEFISH :case CHIP_BEIGE_GOBY : +case CHIP_YELLOW_CARP :break ;default :break ;
@@ -165,6 +167,9 @@ static int sdma_v5_2_init_microcode(struct amdgpu_device *adev)case CHIP_BEIGE_GOBY : chip_name ="beige_goby" ;break ; +case CHIP_YELLOW_CARP : + chip_name ="yellow_carp" ; +break ;default :BUG (); }
@@ -1229,6 +1234,7 @@ static int sdma_v5_2_early_init(void *handle)break ;case CHIP_VANGOGH :case CHIP_BEIGE_GOBY : +case CHIP_YELLOW_CARP : adev->sdma.num_instances =1 ;break ;default :
@@ -1630,6 +1636,7 @@ static int sdma_v5_2_set_clockgating_state(void *handle,case CHIP_VANGOGH :case CHIP_DIMGREY_CAVEFISH :case CHIP_BEIGE_GOBY : +case CHIP_YELLOW_CARP :sdma_v5_2_update_medium_grain_clock_gating (adev, state ==AMD_CG_STATE_GATE ); sdma_v5_2_update_medium_grain_light_sleep(adev,
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 12/89 drm/amdgpu: set ip blocks for yellow carp
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
Enable ip blocks for yellow carp.
--- drivers/gpu/drm/amd/amdgpu/nv.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/gpu/drm/amd/amdgpu/nv.c +9 -0
@@ -988,6 +988,15 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &smu_v11_0_ip_block);amdgpu_device_ip_block_add (adev, &vcn_v3_0_ip_block);break ; +case CHIP_YELLOW_CARP : +amdgpu_device_ip_block_add (adev, &nv_common_ip_block); +amdgpu_device_ip_block_add (adev, &gmc_v10_0_ip_block); +amdgpu_device_ip_block_add (adev, &navi10_ih_ip_block); +if (adev->enable_virtual_display ||amdgpu_sriov_vf (adev)) +amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +amdgpu_device_ip_block_add (adev, &gfx_v10_0_ip_block); +amdgpu_device_ip_block_add (adev, &sdma_v5_2_ip_block); +break ;default :return -EINVAL ; }
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 13/89 drm/amdkfd: add yellow carp KFD support
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
This patch is to add GFX10 based Yellow Carp KFD support. We will bypass IOMMU v2.
--- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 52 +++++++++++++++++++ drivers/gpu/drm/amd/amdkfd/kfd_device.c | 19 +++++++ .../drm/amd/amdkfd/kfd_device_queue_manager.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 1 + .../gpu/drm/amd/amdkfd/kfd_packet_manager.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 1 + 6 files changed, 75 insertions(+)
drivers/gpu/drm/amd/amdkfd/kfd_crat.c +52 -0
@@ -746,6 +746,54 @@ static struct kfd_gpu_cache_info beige_goby_cache_info[] = { }, }; +static struct kfd_gpu_cache_info yellow_carp_cache_info[] = { + { +/* TCP L1 Cache per CU */ + .cache_size =16 , + .cache_level =1 , + .flags = (CRAT_CACHE_FLAGS_ENABLED | +CRAT_CACHE_FLAGS_DATA_CACHE | +CRAT_CACHE_FLAGS_SIMD_CACHE ), + .num_cu_shared =1 , + }, + { +/* Scalar L1 Instruction Cache per SQC */ + .cache_size =32 , + .cache_level =1 , + .flags = (CRAT_CACHE_FLAGS_ENABLED | +CRAT_CACHE_FLAGS_INST_CACHE | +CRAT_CACHE_FLAGS_SIMD_CACHE ), + .num_cu_shared =2 , + }, + { +/* Scalar L1 Data Cache per SQC */ + .cache_size =16 , + .cache_level =1 , + .flags = (CRAT_CACHE_FLAGS_ENABLED | +CRAT_CACHE_FLAGS_DATA_CACHE | +CRAT_CACHE_FLAGS_SIMD_CACHE ), + .num_cu_shared =2 , + }, + { +/* GL1 Data Cache per SA */ + .cache_size =128 , + .cache_level =1 , + .flags = (CRAT_CACHE_FLAGS_ENABLED | +CRAT_CACHE_FLAGS_DATA_CACHE | +CRAT_CACHE_FLAGS_SIMD_CACHE ), + .num_cu_shared =6 , + }, + { +/* L2 Data Cache per GPU (Total Tex Cache) */ + .cache_size =2048 , + .cache_level =2 , + .flags = (CRAT_CACHE_FLAGS_ENABLED | +CRAT_CACHE_FLAGS_DATA_CACHE | +CRAT_CACHE_FLAGS_SIMD_CACHE ), + .num_cu_shared =6 , + }, +}; +static void kfd_populated_cu_info_cpu (struct kfd_topology_device *dev,struct crat_subtype_computeunit *cu) {
@@ -1383,6 +1431,10 @@ static int kfd_fill_gpu_cache_info(struct kfd_dev *kdev, pcache_info = beige_goby_cache_info; num_of_cache_types =ARRAY_SIZE (beige_goby_cache_info);break ; +case CHIP_YELLOW_CARP : + pcache_info = yellow_carp_cache_info; + num_of_cache_types =ARRAY_SIZE (yellow_carp_cache_info); +break ;default :return -EINVAL ; }
drivers/gpu/drm/amd/amdkfd/kfd_device.c +19 -0
@@ -83,6 +83,7 @@ static const struct kfd2kgd_calls *kfd2kgd_funcs[] = { [CHIP_VANGOGH] = &gfx_v10_3_kfd2kgd, [CHIP_DIMGREY_CAVEFISH] = &gfx_v10_3_kfd2kgd, [CHIP_BEIGE_GOBY] = &gfx_v10_3_kfd2kgd, + [CHIP_YELLOW_CARP] = &gfx_v10_3_kfd2kgd, };#ifdef KFD_SUPPORT_IOMMU_V2
@@ -577,6 +578,23 @@ static const struct kfd_device_info beige_goby_device_info = { .num_sdma_queues_per_engine = 8, }; +static const struct kfd_device_info yellow_carp_device_info = { + .asic_family =CHIP_YELLOW_CARP , + .asic_name ="yellow_carp" , + .max_pasid_bits =16 , + .max_no_of_hqd =24 , + .doorbell_size =8 , + .ih_ring_entry_size =8 *sizeof (uint32_t ), + .event_interrupt_class = &event_interrupt_class_v9, + .num_of_watch_points =4 , + .mqd_size_aligned =MQD_SIZE_ALIGNED , + .needs_iommu_device = false, + .supports_cwsr = true, + .needs_pci_atomics = false, + .num_sdma_engines =1 , + .num_xgmi_sdma_engines =0 , + .num_sdma_queues_per_engine =2 , +};/* For each entry, [0] is regular and [1] is virtualisation device. */ static const struct kfd_device_info *kfd_supported_devices[][2 ] = {
@@ -606,6 +624,7 @@ static const struct kfd_device_info *kfd_supported_devices[][2] = { [CHIP_VANGOGH] = {&vangogh_device_info, NULL}, [CHIP_DIMGREY_CAVEFISH] = {&dimgrey_cavefish_device_info, &dimgrey_cavefish_device_info}, [CHIP_BEIGE_GOBY] = {&beige_goby_device_info, &beige_goby_device_info}, + [CHIP_YELLOW_CARP] = {&yellow_carp_device_info, NULL}, }; static int kfd_gtt_sa_init(struct kfd_dev *kfd, unsigned int buf_size,
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +1 -0
@@ -1937,6 +1937,7 @@ struct device_queue_manager *device_queue_manager_init(struct kfd_dev *dev)case CHIP_VANGOGH :case CHIP_DIMGREY_CAVEFISH :case CHIP_BEIGE_GOBY : +case CHIP_YELLOW_CARP :device_queue_manager_init_v10_navi10 (&dqm->asic_ops);break ;default :
drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c +1 -0
@@ -425,6 +425,7 @@ int kfd_init_apertures(struct kfd_process *process)case CHIP_VANGOGH :case CHIP_DIMGREY_CAVEFISH :case CHIP_BEIGE_GOBY : +case CHIP_YELLOW_CARP :kfd_init_apertures_v9 (pdd, id);break ;default :
drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c +1 -0
@@ -250,6 +250,7 @@ int pm_init(struct packet_manager *pm, struct device_queue_manager *dqm)case CHIP_VANGOGH :case CHIP_DIMGREY_CAVEFISH :case CHIP_BEIGE_GOBY : +case CHIP_YELLOW_CARP : pm->pmf = &kfd_v9_pm_funcs;break ;case CHIP_ALDEBARAN :
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +1 -0
@@ -1399,6 +1399,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu)case CHIP_VANGOGH :case CHIP_DIMGREY_CAVEFISH :case CHIP_BEIGE_GOBY : +case CHIP_YELLOW_CARP : dev->node_props.capability |= ((HSA_CAP_DOORBELL_TYPE_2_0 <<HSA_CAP_DOORBELL_TYPE_TOTALBITS_SHIFT ) &HSA_CAP_DOORBELL_TYPE_TOTALBITS_MASK );
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 14/89 drm/amdgpu: support nbio_7_2_1 for yellow carp
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
This patch adds nbio_7_2_1 support yellow carp.
--- drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 142 ++++++++++++++++++------- 1 file changed, 104 insertions(+), 38 deletions(-)
drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c +104 -38
@@ -28,6 +28,25 @@#include "nbio/nbio_7_2_0_sh_mask.h" #include <uapi/linux/kfd_ioctl.h> +#define regRCC_STRAP0_RCC_DEV0_EPF0_STRAP0_YC 0x0015 +#define regRCC_STRAP0_RCC_DEV0_EPF0_STRAP0_YC_BASE_IDX 2 +#define regBIF_BX0_BIF_FB_EN_YC 0x0100 +#define regBIF_BX0_BIF_FB_EN_YC_BASE_IDX 2 +#define regBIF1_PCIE_MST_CTRL_3 0x4601c6 +#define regBIF1_PCIE_MST_CTRL_3_BASE_IDX 5 +#define BIF1_PCIE_MST_CTRL_3__CI_SWUS_MAX_READ_REQUEST_SIZE_MODE__SHIFT \ + 0x1b +#define BIF1_PCIE_MST_CTRL_3__CI_SWUS_MAX_READ_REQUEST_SIZE_PRIV__SHIFT \ + 0x1c +#define BIF1_PCIE_MST_CTRL_3__CI_SWUS_MAX_READ_REQUEST_SIZE_MODE_MASK \ + 0x08000000L +#define BIF1_PCIE_MST_CTRL_3__CI_SWUS_MAX_READ_REQUEST_SIZE_PRIV_MASK \ + 0x30000000L +#define regBIF1_PCIE_TX_POWER_CTRL_1 0x460187 +#define regBIF1_PCIE_TX_POWER_CTRL_1_BASE_IDX 5 +#define BIF1_PCIE_TX_POWER_CTRL_1__MST_MEM_LS_EN_MASK 0x00000001L +#define BIF1_PCIE_TX_POWER_CTRL_1__REPLAY_MEM_LS_EN_MASK 0x00000008L +static void nbio_v7_2_remap_hdp_registers (struct amdgpu_device *adev) { WREG32_SOC15(NBIO, 0, regBIF_BX0_REMAP_HDP_MEM_FLUSH_CNTL,
@@ -38,7 +57,12 @@ static void nbio_v7_2_remap_hdp_registers(struct amdgpu_device *adev)static u32 nbio_v7_2_get_rev_id (struct amdgpu_device *adev) { -u32 tmp =RREG32_SOC15 (NBIO ,0 , regRCC_STRAP0_RCC_DEV0_EPF0_STRAP0); +u32 tmp; + +if (adev->asic_type ==CHIP_YELLOW_CARP ) + tmp =RREG32_SOC15 (NBIO ,0 , regRCC_STRAP0_RCC_DEV0_EPF0_STRAP0_YC); +else + tmp =RREG32_SOC15 (NBIO ,0 , regRCC_STRAP0_RCC_DEV0_EPF0_STRAP0); tmp &=RCC_STRAP0_RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0_MASK ; tmp >>=RCC_STRAP0_RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0__SHIFT ;
@@ -49,11 +73,19 @@ static u32 nbio_v7_2_get_rev_id(struct amdgpu_device *adev)static void nbio_v7_2_mc_access_enable (struct amdgpu_device *adev,bool enable) {if (enable) -WREG32_SOC15 (NBIO ,0 , regBIF_BX0_BIF_FB_EN, -BIF_BX0_BIF_FB_EN__FB_READ_EN_MASK | -BIF_BX0_BIF_FB_EN__FB_WRITE_EN_MASK ); +if (adev->asic_type ==CHIP_YELLOW_CARP ) +WREG32_SOC15 (NBIO ,0 , regBIF_BX0_BIF_FB_EN_YC, +BIF_BX0_BIF_FB_EN__FB_READ_EN_MASK | +BIF_BX0_BIF_FB_EN__FB_WRITE_EN_MASK ); +else +WREG32_SOC15 (NBIO ,0 , regBIF_BX0_BIF_FB_EN, +BIF_BX0_BIF_FB_EN__FB_READ_EN_MASK | +BIF_BX0_BIF_FB_EN__FB_WRITE_EN_MASK );else -WREG32_SOC15 (NBIO ,0 , regBIF_BX0_BIF_FB_EN,0 ); +if (adev->asic_type ==CHIP_YELLOW_CARP ) +WREG32_SOC15 (NBIO ,0 , regBIF_BX0_BIF_FB_EN_YC,0 ); +else +WREG32_SOC15 (NBIO ,0 , regBIF_BX0_BIF_FB_EN,0 ); }static u32 nbio_v7_2_get_memsize (struct amdgpu_device *adev)
@@ -92,13 +124,13 @@ static void nbio_v7_2_vcn_doorbell_range(struct amdgpu_device *adev, bool use_doif (use_doorbell) { doorbell_range =REG_SET_FIELD (doorbell_range, -GDC0_BIF_VCN0_DOORBELL_RANGE ,OFFSET , - doorbell_index); +GDC0_BIF_VCN0_DOORBELL_RANGE ,OFFSET , + doorbell_index); doorbell_range =REG_SET_FIELD (doorbell_range, -GDC0_BIF_VCN0_DOORBELL_RANGE ,SIZE ,8 ); +GDC0_BIF_VCN0_DOORBELL_RANGE ,SIZE ,8 ); }else { doorbell_range =REG_SET_FIELD (doorbell_range, -GDC0_BIF_VCN0_DOORBELL_RANGE ,SIZE ,0 ); +GDC0_BIF_VCN0_DOORBELL_RANGE ,SIZE ,0 ); }WREG32_PCIE_PORT (reg, doorbell_range);
@@ -123,22 +155,22 @@ static void nbio_v7_2_enable_doorbell_selfring_aperture(struct amdgpu_device *adif (enable) { tmp =REG_SET_FIELD (tmp,BIF_BX_PF0_DOORBELL_SELFRING_GPA_APER_CNTL , -DOORBELL_SELFRING_GPA_APER_EN ,1 ) | -REG_SET_FIELD (tmp,BIF_BX_PF0_DOORBELL_SELFRING_GPA_APER_CNTL , -DOORBELL_SELFRING_GPA_APER_MODE ,1 ) | -REG_SET_FIELD (tmp,BIF_BX_PF0_DOORBELL_SELFRING_GPA_APER_CNTL , -DOORBELL_SELFRING_GPA_APER_SIZE ,0 ); +DOORBELL_SELFRING_GPA_APER_EN ,1 ) | +REG_SET_FIELD (tmp,BIF_BX_PF0_DOORBELL_SELFRING_GPA_APER_CNTL , +DOORBELL_SELFRING_GPA_APER_MODE ,1 ) | +REG_SET_FIELD (tmp,BIF_BX_PF0_DOORBELL_SELFRING_GPA_APER_CNTL , +DOORBELL_SELFRING_GPA_APER_SIZE ,0 );WREG32_SOC15 (NBIO ,0 , - regBIF_BX_PF0_DOORBELL_SELFRING_GPA_APER_BASE_LOW, -lower_32_bits (adev->doorbell.base)); + regBIF_BX_PF0_DOORBELL_SELFRING_GPA_APER_BASE_LOW, +lower_32_bits (adev->doorbell.base));WREG32_SOC15 (NBIO ,0 , - regBIF_BX_PF0_DOORBELL_SELFRING_GPA_APER_BASE_HIGH, -upper_32_bits (adev->doorbell.base)); + regBIF_BX_PF0_DOORBELL_SELFRING_GPA_APER_BASE_HIGH, +upper_32_bits (adev->doorbell.base)); }WREG32_SOC15 (NBIO ,0 , regBIF_BX_PF0_DOORBELL_SELFRING_GPA_APER_CNTL, - tmp); + tmp); }
@@ -218,19 +250,42 @@ static void nbio_v7_2_update_medium_grain_light_sleep(struct amdgpu_device *adev {uint32_t def, data; - def = data =RREG32_PCIE_PORT (SOC15_REG_OFFSET (NBIO ,0 , regPCIE_CNTL2)); -if (enable && (adev->cg_flags &AMD_CG_SUPPORT_BIF_LS )) { - data |= (PCIE_CNTL2__SLV_MEM_LS_EN_MASK | -PCIE_CNTL2__MST_MEM_LS_EN_MASK | -PCIE_CNTL2__REPLAY_MEM_LS_EN_MASK ); +if (adev->asic_type ==CHIP_YELLOW_CARP ) { + def = data =RREG32_PCIE_PORT (SOC15_REG_OFFSET (NBIO ,0 , regPCIE_CNTL2)); +if (enable && (adev->cg_flags &AMD_CG_SUPPORT_BIF_LS )) + data |=PCIE_CNTL2__SLV_MEM_LS_EN_MASK ; +else + data &= ~PCIE_CNTL2__SLV_MEM_LS_EN_MASK ; + +if (def != data) +WREG32_PCIE_PORT (SOC15_REG_OFFSET (NBIO ,0 , regPCIE_CNTL2), data); + + data =RREG32_PCIE_PORT (SOC15_REG_OFFSET (NBIO ,0 , regBIF1_PCIE_TX_POWER_CTRL_1)); + def = data; +if (enable && (adev->cg_flags &AMD_CG_SUPPORT_BIF_LS )) + data |= (BIF1_PCIE_TX_POWER_CTRL_1__MST_MEM_LS_EN_MASK | +BIF1_PCIE_TX_POWER_CTRL_1__REPLAY_MEM_LS_EN_MASK ); +else + data &= ~(BIF1_PCIE_TX_POWER_CTRL_1__MST_MEM_LS_EN_MASK | +BIF1_PCIE_TX_POWER_CTRL_1__REPLAY_MEM_LS_EN_MASK ); + +if (def != data) +WREG32_PCIE_PORT (SOC15_REG_OFFSET (NBIO ,0 , regBIF1_PCIE_TX_POWER_CTRL_1), + data); }else { - data &= ~(PCIE_CNTL2__SLV_MEM_LS_EN_MASK | -PCIE_CNTL2__MST_MEM_LS_EN_MASK | -PCIE_CNTL2__REPLAY_MEM_LS_EN_MASK ); + def = data =RREG32_PCIE_PORT (SOC15_REG_OFFSET (NBIO ,0 , regPCIE_CNTL2)); +if (enable && (adev->cg_flags &AMD_CG_SUPPORT_BIF_LS )) + data |= (PCIE_CNTL2__SLV_MEM_LS_EN_MASK | +PCIE_CNTL2__MST_MEM_LS_EN_MASK | +PCIE_CNTL2__REPLAY_MEM_LS_EN_MASK ); +else + data &= ~(PCIE_CNTL2__SLV_MEM_LS_EN_MASK | +PCIE_CNTL2__MST_MEM_LS_EN_MASK | +PCIE_CNTL2__REPLAY_MEM_LS_EN_MASK ); + +if (def != data) +WREG32_PCIE_PORT (SOC15_REG_OFFSET (NBIO ,0 , regPCIE_CNTL2), data); } - -if (def != data) -WREG32_PCIE_PORT (SOC15_REG_OFFSET (NBIO ,0 , regPCIE_CNTL2), data); } static void nbio_v7_2_get_clockgating_state(struct amdgpu_device *adev,
@@ -297,14 +352,25 @@ const struct nbio_hdp_flush_reg nbio_v7_2_hdp_flush_reg = {static void nbio_v7_2_init_registers (struct amdgpu_device *adev) {uint32_t def, data; - - def = data =RREG32_PCIE_PORT (SOC15_REG_OFFSET (NBIO ,0 , regPCIE_CONFIG_CNTL)); - data =REG_SET_FIELD (data,PCIE_CONFIG_CNTL ,CI_SWUS_MAX_READ_REQUEST_SIZE_MODE ,1 ); - data =REG_SET_FIELD (data,PCIE_CONFIG_CNTL ,CI_SWUS_MAX_READ_REQUEST_SIZE_PRIV ,1 ); - -if (def != data) -WREG32_PCIE_PORT (SOC15_REG_OFFSET (NBIO ,0 , regPCIE_CONFIG_CNTL), - data); +if (adev->asic_type ==CHIP_YELLOW_CARP ) { + def = data =RREG32_PCIE_PORT (SOC15_REG_OFFSET (NBIO ,0 , regBIF1_PCIE_MST_CTRL_3)); + data =REG_SET_FIELD (data,BIF1_PCIE_MST_CTRL_3 , +CI_SWUS_MAX_READ_REQUEST_SIZE_MODE ,1 ); + data =REG_SET_FIELD (data,BIF1_PCIE_MST_CTRL_3 , +CI_SWUS_MAX_READ_REQUEST_SIZE_PRIV ,1 ); + +if (def != data) +WREG32_PCIE_PORT (SOC15_REG_OFFSET (NBIO ,0 , regBIF1_PCIE_MST_CTRL_3), data); + }else { + def = data =RREG32_PCIE_PORT (SOC15_REG_OFFSET (NBIO ,0 , regPCIE_CONFIG_CNTL)); + data =REG_SET_FIELD (data,PCIE_CONFIG_CNTL , +CI_SWUS_MAX_READ_REQUEST_SIZE_MODE ,1 ); + data =REG_SET_FIELD (data,PCIE_CONFIG_CNTL , +CI_SWUS_MAX_READ_REQUEST_SIZE_PRIV ,1 ); + +if (def != data) +WREG32_PCIE_PORT (SOC15_REG_OFFSET (NBIO ,0 , regPCIE_CONFIG_CNTL), data); + } }const struct amdgpu_nbio_funcs nbio_v7_2_funcs = {
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 15/89 drm/admgpu/pm: add smu v13 driver interface header for yellow carp (v3)
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
This patch is to add smu v13 driver interface header for yellow carp.
v2: squash in updates (Alex)
v3: squash in v69.29.0 update (Alex)
--- .../amd/pm/inc/smu13_driver_if_yellow_carp.h | 222 ++++++++++++++++++ 1 file changed, 222 insertions(+) create mode 100644 drivers/gpu/drm/amd/pm/inc/smu13_driver_if_yellow_carp.h
drivers/gpu/drm/amd/pm/inc/smu13_driver_if_yellow_carp.h new file +222 -0
@@ -0,0 +1,222 @@ +/* +* 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 __SMU13_DRIVER_IF_YELLOW_CARP_H__ +#define __SMU13_DRIVER_IF_YELLOW_CARP_H__ + +// *** IMPORTANT *** +// SMU TEAM: Always increment the interface version if +// any structure is changed in this file +#define SMU13_DRIVER_IF_VERSION 4 + +typedef struct { +int32_t value; +uint32_t numFractionalBits; +}FloatInIntFormat_t ; + +typedef enum { +DSPCLK_DCFCLK =0 , +DSPCLK_DISPCLK , +DSPCLK_PIXCLK , +DSPCLK_PHYCLK , +DSPCLK_COUNT , +}DSPCLK_e ; + +typedef struct { +uint16_t Freq;// in MHz +uint16_t Vid;// min voltage in SVI3 VID +}DisplayClockTable_t ; + +typedef struct { +uint16_t MinClock;// This is either DCFCLK or SOCCLK (in MHz) +uint16_t MaxClock;// This is either DCFCLK or SOCCLK (in MHz) +uint16_t MinMclk; +uint16_t MaxMclk; + +uint8_t WmSetting; +uint8_t WmType;// Used for normal pstate change or memory retraining +uint8_t Padding[2 ]; +}WatermarkRowGeneric_t ; + +#define NUM_WM_RANGES 4 +#define WM_PSTATE_CHG 0 +#define WM_RETRAINING 1 + +typedef enum { +WM_SOCCLK =0 , +WM_DCFCLK , +WM_COUNT , +}WM_CLOCK_e ; + +typedef struct { +// Watermarks +WatermarkRowGeneric_t WatermarkRow[WM_COUNT ][NUM_WM_RANGES ]; + +uint32_t MmHubPadding[7 ];// SMU internal use +}Watermarks_t ; + +typedef enum { +CUSTOM_DPM_SETTING_GFXCLK , +CUSTOM_DPM_SETTING_CCLK , +CUSTOM_DPM_SETTING_FCLK_CCX , +CUSTOM_DPM_SETTING_FCLK_GFX , +CUSTOM_DPM_SETTING_FCLK_STALLS , +CUSTOM_DPM_SETTING_LCLK , +CUSTOM_DPM_SETTING_COUNT , +}CUSTOM_DPM_SETTING_e ; + +typedef struct { +uint8_t ActiveHystLimit; +uint8_t IdleHystLimit; +uint8_t FPS; +uint8_t MinActiveFreqType; +FloatInIntFormat_t MinActiveFreq; +FloatInIntFormat_t PD_Data_limit; +FloatInIntFormat_t PD_Data_time_constant; +FloatInIntFormat_t PD_Data_error_coeff; +FloatInIntFormat_t PD_Data_error_rate_coeff; +}DpmActivityMonitorCoeffExt_t ; + +typedef struct { +DpmActivityMonitorCoeffExt_t DpmActivityMonitorCoeff[CUSTOM_DPM_SETTING_COUNT ]; +}CustomDpmSettings_t ; + +#define NUM_DCFCLK_DPM_LEVELS 8 +#define NUM_DISPCLK_DPM_LEVELS 8 +#define NUM_DPPCLK_DPM_LEVELS 8 +#define NUM_SOCCLK_DPM_LEVELS 8 +#define NUM_VCN_DPM_LEVELS 8 +#define NUM_SOC_VOLTAGE_LEVELS 8 +#define NUM_DF_PSTATE_LEVELS 4 + +typedef struct { +uint32_t FClk; +uint32_t MemClk; +uint32_t Voltage; +uint8_t WckRatio; +uint8_t Spare[3 ]; +}DfPstateTable_t ; + +//Freq in MHz +//Voltage in milli volts with 2 fractional bits +typedef struct { +uint32_t DcfClocks[NUM_DCFCLK_DPM_LEVELS ]; +uint32_t DispClocks[NUM_DISPCLK_DPM_LEVELS ]; +uint32_t DppClocks[NUM_DPPCLK_DPM_LEVELS ]; +uint32_t SocClocks[NUM_SOCCLK_DPM_LEVELS ]; +uint32_t VClocks[NUM_VCN_DPM_LEVELS ]; +uint32_t DClocks[NUM_VCN_DPM_LEVELS ]; +uint32_t SocVoltage[NUM_SOC_VOLTAGE_LEVELS ]; +DfPstateTable_t DfPstateTable[NUM_DF_PSTATE_LEVELS ]; + +uint8_t NumDcfClkLevelsEnabled; +uint8_t NumDispClkLevelsEnabled;//Applies to both Dispclk and Dppclk +uint8_t NumSocClkLevelsEnabled; +uint8_t VcnClkLevelsEnabled;//Applies to both Vclk and Dclk +uint8_t NumDfPstatesEnabled; +uint8_t spare[3 ]; + +uint32_t MinGfxClk; +uint32_t MaxGfxClk; +}DpmClocks_t ; + + +// Throttler Status Bitmask +#define THROTTLER_STATUS_BIT_SPL 0 +#define THROTTLER_STATUS_BIT_FPPT 1 +#define THROTTLER_STATUS_BIT_SPPT 2 +#define THROTTLER_STATUS_BIT_SPPT_APU 3 +#define THROTTLER_STATUS_BIT_THM_CORE 4 +#define THROTTLER_STATUS_BIT_THM_GFX 5 +#define THROTTLER_STATUS_BIT_THM_SOC 6 +#define THROTTLER_STATUS_BIT_TDC_VDD 7 +#define THROTTLER_STATUS_BIT_TDC_SOC 8 +#define THROTTLER_STATUS_BIT_PROCHOT_CPU 9 +#define THROTTLER_STATUS_BIT_PROCHOT_GFX 10 +#define THROTTLER_STATUS_BIT_EDC_CPU 11 +#define THROTTLER_STATUS_BIT_EDC_GFX 12 + +typedef struct { +uint16_t GfxclkFrequency;//[MHz] +uint16_t SocclkFrequency;//[MHz] +uint16_t VclkFrequency;//[MHz] +uint16_t DclkFrequency;//[MHz] +uint16_t MemclkFrequency;//[MHz] +uint16_t spare; + +uint16_t GfxActivity;//[centi] +uint16_t UvdActivity;//[centi] + +uint16_t Voltage[2 ];//[mV] indices: VDDCR_VDD, VDDCR_SOC +uint16_t Current[2 ];//[mA] indices: VDDCR_VDD, VDDCR_SOC +uint16_t Power[2 ];//[mW] indices: VDDCR_VDD, VDDCR_SOC + +//3rd party tools in Windows need this info in the case of APUs +uint16_t CoreFrequency[8 ];//[MHz] +uint16_t CorePower[8 ];//[mW] +uint16_t CoreTemperature[8 ];//[centi-Celsius] +uint16_t L3Frequency;//[MHz] +uint16_t L3Temperature;//[centi-Celsius] + +uint16_t GfxTemperature;//[centi-Celsius] +uint16_t SocTemperature;//[centi-Celsius] +uint16_t ThrottlerStatus; + +uint16_t CurrentSocketPower;//[mW] +uint16_t StapmOpnLimit;//[W] +uint16_t StapmCurrentLimit;//[W] +uint32_t ApuPower;//[mW] +uint32_t dGpuPower;//[mW] + +uint16_t VddTdcValue;//[mA] +uint16_t SocTdcValue;//[mA] +uint16_t VddEdcValue;//[mA] +uint16_t SocEdcValue;//[mA] + +uint16_t InfrastructureCpuMaxFreq;//[MHz] +uint16_t InfrastructureGfxMaxFreq;//[MHz] + +uint16_t SkinTemp; +uint16_t DeviceState; +}SmuMetrics_t ; + + +// Workload bits +#define WORKLOAD_PPLIB_FULL_SCREEN_3D_BIT 0 +#define WORKLOAD_PPLIB_VIDEO_BIT 2 +#define WORKLOAD_PPLIB_VR_BIT 3 +#define WORKLOAD_PPLIB_COMPUTE_BIT 4 +#define WORKLOAD_PPLIB_CUSTOM_BIT 5 +#define WORKLOAD_PPLIB_COUNT 6 + +#define TABLE_BIOS_IF 0 // Called by BIOS +#define TABLE_WATERMARKS 1 // Called by DAL through VBIOS +#define TABLE_CUSTOM_DPM 2 // Called by Driver +#define TABLE_SPARE1 3 +#define TABLE_DPMCLOCKS 4 // Called by Driver and VBIOS +#define TABLE_MOMENTARY_PM 5 // Called by Tools +#define TABLE_MODERN_STDBY 6 // Called by Tools for Modern Standby Log +#define TABLE_SMU_METRICS 7 // Called by Driver +#define TABLE_INFRASTRUCTURE_LIMITS 8 +#define TABLE_COUNT 9 + +#endif
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 16/89 drm/amdgpu/pm: add smu v13.0.1 firmware header for yellow carp (V4)
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
This patch is to add smu v13.0.1 firmware header for yellow carp.
--- drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_pmfw.h | 139 ++++++++++++++++++ 1 file changed, 139 insertions(+) create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_pmfw.h
drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_pmfw.h new file +139 -0
@@ -0,0 +1,139 @@ +/* +* 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 __SMU_V13_0_1_PMFW_H__ +#define __SMU_V13_0_1_PMFW_H__ + +#include "smu13_driver_if_yellow_carp.h" + +#pragma pack(push, 1) + +#define ENABLE_DEBUG_FEATURES + +// Firmware features +// Feature Control Defines +#define FEATURE_CCLK_DPM_BIT 0 +#define FEATURE_FAN_CONTROLLER_BIT 1 +#define FEATURE_DATA_CALCULATION_BIT 2 +#define FEATURE_PPT_BIT 3 +#define FEATURE_TDC_BIT 4 +#define FEATURE_THERMAL_BIT 5 +#define FEATURE_FIT_BIT 6 +#define FEATURE_EDC_BIT 7 +#define FEATURE_PLL_POWER_DOWN_BIT 8 +#define FEATURE_ULV_BIT 9 +#define FEATURE_VDDOFF_BIT 10 +#define FEATURE_VCN_DPM_BIT 11 +#define FEATURE_CSTATE_BOOST_BIT 12 +#define FEATURE_FCLK_DPM_BIT 13 +#define FEATURE_SOCCLK_DPM_BIT 14 +#define FEATURE_MP0CLK_DPM_BIT 15 +#define FEATURE_LCLK_DPM_BIT 16 +#define FEATURE_SHUBCLK_DPM_BIT 17 +#define FEATURE_DCFCLK_DPM_BIT 18 +#define FEATURE_GFX_DPM_BIT 19 +#define FEATURE_DS_GFXCLK_BIT 20 +#define FEATURE_DS_SOCCLK_BIT 21 +#define FEATURE_DS_LCLK_BIT 22 +#define FEATURE_DS_DCFCLK_BIT 23 +#define FEATURE_DS_SHUBCLK_BIT 24 +#define FEATURE_GFX_TEMP_VMIN_BIT 25 +#define FEATURE_ZSTATES_BIT 26 +#define FEATURE_WHISPER_MODE_BIT 27 +#define FEATURE_DS_FCLK_BIT 28 +#define FEATURE_DS_SMNCLK_BIT 29 +#define FEATURE_DS_MP1CLK_BIT 30 +#define FEATURE_DS_MP0CLK_BIT 31 +#define FEATURE_CLK_LOW_POWER_BIT 32 +#define FEATURE_FUSE_PG_BIT 33 +#define FEATURE_GFX_DEM_BIT 34 +#define FEATURE_PSI_BIT 35 +#define FEATURE_PROCHOT_BIT 36 +#define FEATURE_CPUOFF_BIT 37 +#define FEATURE_STAPM_BIT 38 +#define FEATURE_S0I3_BIT 39 +#define FEATURE_DF_LIGHT_CSTATE 40 // shift the order or DFCstate annd DF light Cstate +#define FEATURE_PERF_LIMIT_BIT 41 +#define FEATURE_CORE_DLDO_BIT 42 +#define FEATURE_RSMU_LOW_POWER_BIT 43 +#define FEATURE_SMN_LOW_POWER_BIT 44 +#define FEATURE_THM_LOW_POWER_BIT 45 +#define FEATURE_SMUIO_LOW_POWER_BIT 46 +#define FEATURE_MP1_LOW_POWER_BIT 47 +#define FEATURE_DS_VCN_BIT 48 +#define FEATURE_CPPC_BIT 49 +#define FEATURE_CPPC_PREFERRED_CORES 50 +#define FEATURE_SMART_SHIFT_BIT 51 +#define FEATURE_DF_CSTATES_BIT 52 +#define FEATURE_MSMU_LOW_POWER_BIT 53 +#define FEATURE_SOC_VOLTAGE_MON_BIT 54 +#define FEATURE_ATHUB_PG_BIT 55 +#define FEATURE_VDDOFF_ECO_BIT 56 +#define FEATURE_ZSTATES_ECO_BIT 57 +#define FEATURE_CC6_BIT 58 +#define FEATURE_DS_UMCCLK_BIT 59 +#define FEATURE_DS_HSPCLK_BIT 60 +#define NUM_FEATURES 61 + +typedef struct { +// MP1_EXT_SCRATCH0 +uint32_t DpmHandlerID :8 ; +uint32_t ActivityMonitorID :8 ; +uint32_t DpmTimerID :8 ; +uint32_t DpmHubID :4 ; +uint32_t DpmHubTask :4 ; +// MP1_EXT_SCRATCH1 +uint32_t GfxoffStatus :8 ; +uint32_t GfxStatus :2 ; +uint32_t CpuOff :2 ; +uint32_t VddOff :1 ; +uint32_t InUlv :1 ; +uint32_t InWhisperMode :1 ; +uint32_t spare0 :1 ; +uint32_t ZstateStatus :4 ; +uint32_t spare1 :12 ; +// MP1_EXT_SCRATCH2 +uint32_t P2JobHandler :24 ; +uint32_t RsmuPmiP2FinishedCnt :8 ; +// MP1_EXT_SCRATCH3 +uint32_t PostCode :32 ; +// MP1_EXT_SCRATCH4 +uint32_t MsgPortBusy :15 ; +uint32_t RsmuPmiP1Pending :1 ; +uint32_t DfCstateExitPending :1 ; +uint32_t Pc6EntryPending :1 ; +uint32_t Pc6ExitPending :1 ; +uint32_t WarmResetPending :1 ; +uint32_t Mp0ClkPending :1 ; +uint32_t spare2 :3 ; +uint32_t RsmuPmiP2PendingCnt :8 ; +// MP1_EXT_SCRATCH5 +uint32_t IdleMask :32 ; +// MP1_EXT_SCRATCH6 = RTOS threads' status +// MP1_EXT_SCRATCH7 = RTOS Current Job +}FwStatus_t ; + + +#pragma pack(pop) + +#endif
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 17/89 drm/amdgpu/pm: add smu v13.0.1 smc header for yellow carp (v2)
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
This patch is to add smu v13.0.1 smc header for yellow carp.
v2: squash in updates (Alex)
--- .../gpu/drm/amd/pm/inc/smu_v13_0_1_ppsmc.h | 97 +++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_ppsmc.h
drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_ppsmc.h new file +97 -0
@@ -0,0 +1,97 @@ +/* +* 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 SMU_13_0_1_PPSMC_H +#define SMU_13_0_1_PPSMC_H + +/** @def PPS_PMFW_IF_VER +* PPS (PPLib) to PMFW IF version 1.0 +*/ +#define PPS_PMFW_IF_VER "1.0" ///< Major.Minor + +/** @defgroup ResponseCodes PMFW Response Codes: +* @{ +*/ +#define PPSMC_Result_OK 0x1 ///< Message Response OK +#define PPSMC_Result_Failed 0xFF ///< Message Response Failed +#define PPSMC_Result_UnknownCmd 0xFE ///< Message Response Unknown Command +#define PPSMC_Result_CmdRejectedPrereq 0xFD ///< Message Response Command Failed Prerequisite +#define PPSMC_Result_CmdRejectedBusy 0xFC ///< Message Response Command Rejected due to PMFW is busy. Sender should retry sending this message +/** @}*/ + +/** @defgroup definitions Message definitions +* @{ +*/ +#define PPSMC_MSG_TestMessage 0x01 ///< To check if PMFW is alive and responding. Requirement specified by PMFW team +#define PPSMC_MSG_GetSmuVersion 0x02 ///< Get PMFW version +#define PPSMC_MSG_GetDriverIfVersion 0x03 ///< Get PMFW_DRIVER_IF version +#define PPSMC_MSG_EnableGfxOff 0x04 ///< Enable GFXOFF +#define PPSMC_MSG_DisableGfxOff 0x05 ///< Disable GFXOFF +#define PPSMC_MSG_PowerDownVcn 0x06 ///< Power down VCN +#define PPSMC_MSG_PowerUpVcn 0x07 ///< Power up VCN; VCN is power gated by default +#define PPSMC_MSG_SetHardMinVcn 0x08 ///< For wireless display +#define PPSMC_MSG_SetSoftMinGfxclk 0x09 ///< Set SoftMin for GFXCLK, argument is frequency in MHz +#define PPSMC_MSG_ActiveProcessNotify 0x0A ///< Set active work load type +#define PPSMC_MSG_ForcePowerDownGfx 0x0B ///< Force power down GFX, i.e. enter GFXOFF +#define PPSMC_MSG_PrepareMp1ForUnload 0x0C ///< Prepare PMFW for GFX driver unload +#define PPSMC_MSG_SetDriverDramAddrHigh 0x0D ///< Set high 32 bits of DRAM address for Driver table transfer +#define PPSMC_MSG_SetDriverDramAddrLow 0x0E ///< Set low 32 bits of DRAM address for Driver table transfer +#define PPSMC_MSG_TransferTableSmu2Dram 0x0F ///< Transfer driver interface table from PMFW SRAM to DRAM +#define PPSMC_MSG_TransferTableDram2Smu 0x10 ///< Transfer driver interface table from DRAM to PMFW SRAM +#define PPSMC_MSG_GfxDeviceDriverReset 0x11 ///< Request GFX mode 2 reset +#define PPSMC_MSG_GetEnabledSmuFeatures 0x12 ///< Get enabled features in PMFW +#define PPSMC_MSG_SetHardMinSocclkByFreq 0x13 ///< Set hard min for SOC CLK +#define PPSMC_MSG_SetSoftMinFclk 0x14 ///< Set hard min for FCLK +#define PPSMC_MSG_SetSoftMinVcn 0x15 ///< Set soft min for VCN clocks (VCLK and DCLK) +#define PPSMC_MSG_SPARE0 0x16 ///< Spared +#define PPSMC_MSG_GetGfxclkFrequency 0x17 ///< Get GFX clock frequency +#define PPSMC_MSG_GetFclkFrequency 0x18 ///< Get FCLK frequency +#define PPSMC_MSG_AllowGfxOff 0x19 ///< Inform PMFW of allowing GFXOFF entry +#define PPSMC_MSG_DisallowGfxOff 0x1A ///< Inform PMFW of disallowing GFXOFF entry +#define PPSMC_MSG_SetSoftMaxGfxClk 0x1B ///< Set soft max for GFX CLK +#define PPSMC_MSG_SetHardMinGfxClk 0x1C ///< Set hard min for GFX CLK +#define PPSMC_MSG_SetSoftMaxSocclkByFreq 0x1D ///< Set soft max for SOC CLK +#define PPSMC_MSG_SetSoftMaxFclkByFreq 0x1E ///< Set soft max for FCLK +#define PPSMC_MSG_SetSoftMaxVcn 0x1F ///< Set soft max for VCN clocks (VCLK and DCLK) +#define PPSMC_MSG_SetPowerLimitPercentage 0x20 ///< Set power limit percentage +#define PPSMC_MSG_PowerDownJpeg 0x21 ///< Power down Jpeg +#define PPSMC_MSG_PowerUpJpeg 0x22 ///< Power up Jpeg; VCN is power gated by default +#define PPSMC_MSG_SetHardMinFclkByFreq 0x23 ///< Set hard min for FCLK +#define PPSMC_MSG_SetSoftMinSocclkByFreq 0x24 ///< Set soft min for SOC CLK +#define PPSMC_MSG_AllowZstates 0x25 ///< Inform PMFM of allowing Zstate entry, i.e. no Miracast activity +#define PPSMC_MSG_DisallowZstates 0x26 ///< Inform PMFW of disallowing Zstate entry, i.e. there is Miracast activity +#define PPSMC_MSG_RequestActiveWgp 0x27 ///< Request GFX active WGP number +#define PPSMC_MSG_QueryActiveWgp 0x28 ///< Query the anumber of active WGP number +#define PPSMC_Message_Count 0x29 ///< Total number of PPS messages +/** @}*/ + +/** @enum Mode_Reset_e +* Mode reset type, argument for PPSMC_MSG_GfxDeviceDriverReset +*/ +typedef enum { +MODE1_RESET =1 ,///< Mode reset type 1 +MODE2_RESET =2 ///< Mode reset type 2 +}Mode_Reset_e ; +/** @}*/ + +#endif
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 18/89 drm/amd/pm: add smu13 ip support for moment(V3)
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
For supporting yellow carp, we need to add smu13 ip support for the moment.
V2: add smu_v13_0_1.c|h dedicated for apu.
V3: cleanup code.
--- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 1 + drivers/gpu/drm/amd/pm/inc/smu_v13_0_1.h | 52 +++++++ drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile | 2 +- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_1.c | 131 ++++++++++++++++++ 4 files changed, 185 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v13_0_1.h create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_1.c
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +1 -0
@@ -1275,6 +1275,7 @@ extern const struct amd_ip_funcs smu_ip_funcs;extern const struct amdgpu_ip_block_version smu_v11_0_ip_block;extern const struct amdgpu_ip_block_version smu_v12_0_ip_block;extern const struct amdgpu_ip_block_version smu_v13_0_ip_block; +extern const struct amdgpu_ip_block_version smu_v13_0_1_ip_block;bool is_support_sw_smu (struct amdgpu_device *adev);bool is_support_cclk_dpm (struct amdgpu_device *adev);
drivers/gpu/drm/amd/pm/inc/smu_v13_0_1.h new file +52 -0
52 lines not on this page · raw message
drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile +1 -1
@@ -23,7 +23,7 @@ # Makefile for the 'smu manager' sub-component of powerplay. # It provides the smu management services for the driver. -SMU13_MGR = smu_v13_0.o aldebaran_ppt.o +SMU13_MGR = smu_v13_0.o aldebaran_ppt.o smu_v13_0_1.o AMD_SWSMU_SMU13MGR = $(addprefix $(AMD_SWSMU_PATH)/smu13/,$(SMU13_MGR))
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_1.c new file +131 -0
131 lines not on this page · raw message
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 19/89 drm/amd/pm: add yellow_carp_ppt implementation(V3)
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
yellow_carp_ppt is swsmu layer 2 code for yellow carp.
V2: rename smu_v13_0 to smu_v13_0_1
V3: cleanup code.
--- drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile | 2 +- .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 163 ++++++++++++++++++ .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.h | 28 +++ 3 files changed, 192 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.h
drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile +1 -1
@@ -23,7 +23,7 @@ # Makefile for the 'smu manager' sub-component of powerplay. # It provides the smu management services for the driver. -SMU13_MGR = smu_v13_0.o aldebaran_ppt.o smu_v13_0_1.o +SMU13_MGR = smu_v13_0.o aldebaran_ppt.o smu_v13_0_1.o yellow_carp_ppt.o AMD_SWSMU_SMU13MGR = $(addprefix $(AMD_SWSMU_PATH)/smu13/,$(SMU13_MGR))
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c new file +163 -0
163 lines not on this page · raw message
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.h new file +28 -0
@@ -0,0 +1,28 @@ +/* +* 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 __YELLOW_CARP_PPT_H__ +#define __YELLOW_CARP_PPT_H__ + +extern void yellow_carp_set_ppt_funcs (struct smu_context *smu); + +#endif
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 20/89 drm/amd/pm: partially enable swsmu for yellow carp(V2)
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
This patch is to partially enable swSMU for yellow carp for the moment.
V2: rename smu_v13_0 to smu_v13_0_1.
--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +6 -0
@@ -658,6 +658,9 @@ static int smu_late_init(void *handle)smu_set_fine_grain_gfx_freq_parameters (smu); +if (adev->asic_type ==CHIP_YELLOW_CARP ) +return 0 ; +if (!smu->pm_enabled)return 0 ;
@@ -1303,6 +1306,9 @@ static int smu_hw_init(void *handle)smu_set_gfx_cgpg (&adev->smu, true); } +if (adev->asic_type ==CHIP_YELLOW_CARP ) +return 0 ; +if (!smu->pm_enabled)return 0 ;
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 21/89 drm/amdgpu: add smu ip block for yellow carp(V3)
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
Yellow carp smu ip version: 13_0_1.
V2: rename smu_v13_0 to smu_v13_0_1.
V3: reuse smu_v13_0 with aldebaran.
--- drivers/gpu/drm/amd/amdgpu/nv.c | 1 + drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 1 - drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 4 ++++ 3 files changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/nv.c +1 -0
@@ -992,6 +992,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &nv_common_ip_block);amdgpu_device_ip_block_add (adev, &gmc_v10_0_ip_block);amdgpu_device_ip_block_add (adev, &navi10_ih_ip_block); +amdgpu_device_ip_block_add (adev, &smu_v13_0_ip_block);if (adev->enable_virtual_display ||amdgpu_sriov_vf (adev))amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block);amdgpu_device_ip_block_add (adev, &gfx_v10_0_ip_block);
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +0 -1
@@ -1275,7 +1275,6 @@ extern const struct amd_ip_funcs smu_ip_funcs;extern const struct amdgpu_ip_block_version smu_v11_0_ip_block;extern const struct amdgpu_ip_block_version smu_v12_0_ip_block;extern const struct amdgpu_ip_block_version smu_v13_0_ip_block; -extern const struct amdgpu_ip_block_version smu_v13_0_1_ip_block;bool is_support_sw_smu (struct amdgpu_device *adev);bool is_support_cclk_dpm (struct amdgpu_device *adev);
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +4 -0
@@ -35,6 +35,7 @@#include "renoir_ppt.h" #include "vangogh_ppt.h" #include "aldebaran_ppt.h" +#include "yellow_carp_ppt.h" #include "amd_pcie.h" /*
@@ -584,6 +585,9 @@ static int smu_set_funcs(struct amdgpu_device *adev)case CHIP_VANGOGH :vangogh_set_ppt_funcs (smu);break ; +case CHIP_YELLOW_CARP : +yellow_carp_set_ppt_funcs (smu); +break ;default :return -EINVAL ; }
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 22/89 drm/amdgpu: add gfx golden settings for yellow carp (v3)
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
This patch is to add gfx golden settings for yellow carp post si.
v2: squash in updates (Alex)
v3: squash in LDS update (Alex)
--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 29 ++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +29 -0
@@ -3381,6 +3381,30 @@ static const struct soc15_reg_golden golden_settings_gc_10_3_vangogh[] = SOC15_REG_GOLDEN_VALUE(GC, 0, mmLDS_CONFIG, 0x00000020, 0x00000020), }; +static const struct soc15_reg_golden golden_settings_gc_10_3_3[] = +{ +SOC15_REG_GOLDEN_VALUE (GC ,0 , mmCGTT_SPI_CS_CLK_CTRL,0xff7f0fff ,0x78000100 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , mmCH_PIPE_STEER,0x000000ff ,0x000000e4 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , mmCPF_GCR_CNTL,0x0007ffff ,0x0000c200 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , mmDB_DEBUG3,0xffffffff ,0x00000280 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , mmDB_DEBUG4,0xffffffff ,0x00800000 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , mmGB_ADDR_CONFIG,0x0c1807ff ,0x00000242 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , mmGCR_GENERAL_CNTL,0x1ff1ffff ,0x00000500 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , mmGL1_PIPE_STEER,0x000000ff ,0x000000e4 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , mmGL2_PIPE_STEER_0,0x77777777 ,0x32103210 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , mmGL2_PIPE_STEER_1,0x77777777 ,0x32103210 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , mmGL2A_ADDR_MATCH_MASK,0xffffffff ,0xfffffff3 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , mmGL2C_ADDR_MATCH_MASK,0xffffffff ,0xfffffff3 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , mmGL2C_CM_CTRL1,0xff8fff0f ,0x580f1008 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , mmGL2C_CTRL3,0xf7ffffff ,0x00f80988 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , mmLDS_CONFIG,0x000001ff ,0x00000020 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , mmPA_CL_ENHANCE,0xf17fffff ,0x01200007 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , mmPA_SC_BINNER_TIMEOUT_COUNTER,0xffffffff ,0x00000800 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , mmPA_SC_ENHANCE_2,0xffffffbf ,0x00000820 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , mmTA_CNTL_AUX,0xfff7ffff ,0x01030000 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , mmUTCL1_CTRL,0xffffffff ,0x00100000 ) +}; +static const struct soc15_reg_golden golden_settings_gc_10_3_4[] = {SOC15_REG_GOLDEN_VALUE (GC ,0 , mmCGTT_SPI_CS_CLK_CTRL,0x78000000 ,0x78000100 ),
@@ -3670,6 +3694,11 @@ static void gfx_v10_0_init_golden_registers(struct amdgpu_device *adev) golden_settings_gc_10_3_vangogh, (const u32)ARRAY_SIZE(golden_settings_gc_10_3_vangogh));break ; +case CHIP_YELLOW_CARP : +soc15_program_register_sequence (adev, + golden_settings_gc_10_3_3, + (const u32 )ARRAY_SIZE (golden_settings_gc_10_3_3)); +break ;case CHIP_DIMGREY_CAVEFISH : soc15_program_register_sequence(adev, golden_settings_gc_10_3_4,
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 23/89 drm/amdgpu: introduce a stolen reserved buffer to protect specific buffer region (v2)
In reply to Alex DeucherFrom: Huang Rui <[email protected]>
Some ASICs such as Yellow Carp needs to reserve a region of video memory to avoid access from driver. So this patch is to introduce a stolen reserved buffer to protect specific buffer region.
v2: free this buffer in amdgpu_ttm_fini.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 16 ++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 10 ++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 4 ++++ drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 1 + 5 files changed, 32 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +16 -0
@@ -777,3 +777,19 @@ uint64_t amdgpu_gmc_vram_cpu_pa(struct amdgpu_device *adev, struct amdgpu_bo *bo {return amdgpu_bo_gpu_offset (bo) - adev->gmc.vram_start + adev->gmc.aper_base; } + +void amdgpu_gmc_get_reserved_allocation (struct amdgpu_device *adev) +{ +/* Some ASICs need to reserve a region of video memory to avoid access +* from driver */ +switch (adev->asic_type) { +case CHIP_YELLOW_CARP : + adev->mman.stolen_reserved_offset =0x1ffb0000 ; + adev->mman.stolen_reserved_size =64 *PAGE_SIZE ; +break ; +default : + adev->mman.stolen_reserved_offset =0 ; + adev->mman.stolen_reserved_size =0 ; +break ; + } +}
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h +1 -0
@@ -332,6 +332,7 @@ amdgpu_gmc_set_vm_fault_masks(struct amdgpu_device *adev, int hub_type, bool enable);void amdgpu_gmc_get_vbios_allocations (struct amdgpu_device *adev); +void amdgpu_gmc_get_reserved_allocation (struct amdgpu_device *adev);void amdgpu_gmc_init_pdb0 (struct amdgpu_device *adev);uint64_t amdgpu_gmc_vram_mc2pa (struct amdgpu_device *adev,uint64_t mc_addr);
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +10 -0
@@ -1740,6 +1740,13 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) NULL);if (r)return r; + r =amdgpu_bo_create_kernel_at (adev, adev->mman.stolen_reserved_offset, + adev->mman.stolen_reserved_size, +AMDGPU_GEM_DOMAIN_VRAM , + &adev->mman.stolen_reserved_memory, +NULL ); +if (r) +return r;DRM_INFO ("amdgpu: %uM of VRAM memory ready\n" , (unsigned ) (adev->gmc.real_vram_size / (1024 *1024 )));
@@ -1809,6 +1816,9 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev)amdgpu_bo_free_kernel (&adev->mman.stolen_extended_memory,NULL ,NULL );/* return the IP Discovery TMR memory back to VRAM */ amdgpu_bo_free_kernel (&adev->mman.discovery_memory,NULL ,NULL ); +if (adev->mman.stolen_reserved_size) +amdgpu_bo_free_kernel (&adev->mman.stolen_reserved_memory, +NULL ,NULL );amdgpu_ttm_fw_reserve_vram_fini (adev);if (adev->mman.aper_base_kaddr)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +4 -0
@@ -84,6 +84,10 @@ struct amdgpu_mman {struct amdgpu_bo *stolen_extended_memory;bool keep_stolen_vga_memory; +struct amdgpu_bo *stolen_reserved_memory; +uint64_t stolen_reserved_offset; +uint64_t stolen_reserved_size; +/* discovery */ uint8_t *discovery_bin;uint32_t discovery_tmr_size;
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +1 -0
@@ -936,6 +936,7 @@ static int gmc_v10_0_sw_init(void *handle)return r;amdgpu_gmc_get_vbios_allocations (adev); +amdgpu_gmc_get_reserved_allocation (adev);/* Memory manager */ r =amdgpu_bo_init (adev);
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 24/89 drm/amdgpu: reserved buffer is not needed with ip discovery enabled
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
When IP discovery enabled, the reserved buffer has been alloacted.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +7 -4
@@ -782,14 +782,17 @@ void amdgpu_gmc_get_reserved_allocation(struct amdgpu_device *adev) {/* Some ASICs need to reserve a region of video memory to avoid access * from driver */ + adev->mman.stolen_reserved_offset =0 ; + adev->mman.stolen_reserved_size =0 ; +switch (adev->asic_type) {case CHIP_YELLOW_CARP : - adev->mman.stolen_reserved_offset =0x1ffb0000 ; - adev->mman.stolen_reserved_size =64 *PAGE_SIZE ; +if (amdgpu_discovery ==0 ) { + adev->mman.stolen_reserved_offset =0x1ffb0000 ; + adev->mman.stolen_reserved_size =64 *PAGE_SIZE ; + }break ;default : - adev->mman.stolen_reserved_offset =0 ; - adev->mman.stolen_reserved_size =0 ;break ; } }
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 25/89 drm/amdgpu: add mmhub client support for yellow carp
In reply to Alex DeucherTo help debugging GPUVM page faults.
--- drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +1 -0
@@ -92,6 +92,7 @@ mmhub_v2_3_print_l2_protection_fault_status(struct amdgpu_device *adev, status);switch (adev->asic_type) {case CHIP_VANGOGH : +case CHIP_YELLOW_CARP : mmhub_cid = mmhub_client_ids_vangogh[cid][rw];break ;default :
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 26/89 drm/amdgpu: add psp_v13 support for yellow carp
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
This patch adds psp_v13 support for yellow carp.
--- drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 33 ++++++++++++++++++++------ 1 file changed, 26 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/psp_v13_0.c +26 -7
@@ -31,6 +31,8 @@MODULE_FIRMWARE ("amdgpu/aldebaran_sos.bin" );MODULE_FIRMWARE ("amdgpu/aldebaran_ta.bin" ); +MODULE_FIRMWARE ("amdgpu/yellow_carp_asd.bin" ); +MODULE_FIRMWARE ("amdgpu/yellow_carp_toc.bin" );static int psp_v13_0_init_microcode (struct psp_context *psp) {
@@ -42,17 +44,34 @@ static int psp_v13_0_init_microcode(struct psp_context *psp)case CHIP_ALDEBARAN : chip_name ="aldebaran" ;break ; +case CHIP_YELLOW_CARP : + chip_name ="yellow_carp" ; +break ; +default : +BUG (); + } +switch (adev->asic_type) { +case CHIP_ALDEBARAN : + err =psp_init_sos_microcode (psp, chip_name); +if (err) +return err; + err =psp_init_ta_microcode (&adev->psp, chip_name); +if (err) +return err; +break ; +case CHIP_YELLOW_CARP : + err =psp_init_asd_microcode (psp, chip_name); +if (err) +return err; + err =psp_init_toc_microcode (psp, chip_name); +if (err) +return err; +break ;default :BUG (); } - err =psp_init_sos_microcode (psp, chip_name); -if (err) -return err; - - err =psp_init_ta_microcode (&adev->psp, chip_name); - -return err; +return 0 ; }static bool psp_v13_0_is_sos_alive (struct psp_context *psp)
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 27/89 drm/amdgpu: enable psp_v13 for yellow carp
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
This patch enables psp_v13 for yellow carp.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 4 ++++ drivers/gpu/drm/amd/amdgpu/nv.c | 2 ++ 2 files changed, 6 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +4 -0
@@ -115,6 +115,10 @@ static int psp_early_init(void *handle)case CHIP_ALDEBARAN :psp_v13_0_set_psp_funcs (psp);break ; +case CHIP_YELLOW_CARP : +psp_v13_0_set_psp_funcs (psp); + psp->autoload_supported = true; +break ;default :return -EINVAL ; }
drivers/gpu/drm/amd/amdgpu/nv.c +2 -0
@@ -992,6 +992,8 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &nv_common_ip_block);amdgpu_device_ip_block_add (adev, &gmc_v10_0_ip_block);amdgpu_device_ip_block_add (adev, &navi10_ih_ip_block); +if (likely (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP )) +amdgpu_device_ip_block_add (adev, &psp_v13_0_ip_block);amdgpu_device_ip_block_add (adev, &smu_v13_0_ip_block);if (adev->enable_virtual_display ||amdgpu_sriov_vf (adev))amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block);
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 28/89 drm/amdgpu/pm: set_pp_feature is unsupport for yellow carp
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
For yellow carp, SMU firmware just only supports get_pp_feature.
--- drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +1 -2
@@ -149,9 +149,8 @@ static const struct pptable_funcs yellow_carp_ppt_funcs = { .send_smc_msg = smu_cmn_send_smc_msg, .set_default_dpm_table = smu_v13_0_1_set_default_dpm_tables, .is_dpm_running = yellow_carp_is_dpm_running, + .get_enabled_mask = smu_cmn_get_enabled_32_bits_mask, .get_pp_feature_mask = smu_cmn_get_pp_feature_mask, - .set_pp_feature_mask = smu_cmn_set_pp_feature_mask, - .disable_all_features_with_exception = smu_cmn_disable_all_features_with_exception, };void yellow_carp_set_ppt_funcs (struct smu_context *smu)
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 29/89 drm/amdgpu/pm: add set_driver_table_location implementation for yellow carp
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
This patch adds set_driver_table_location implementation for yellow carp.
--- drivers/gpu/drm/amd/pm/inc/smu_v13_0_1.h | 1 + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_1.c | 23 +++++++++++++++++++ .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 1 + 3 files changed, 25 insertions(+)
drivers/gpu/drm/amd/pm/inc/smu_v13_0_1.h +1 -0
@@ -48,5 +48,6 @@ int smu_v13_0_1_fini_smc_tables(struct smu_context *smu);int smu_v13_0_1_set_default_dpm_tables (struct smu_context *smu); +int smu_v13_0_1_set_driver_table_location (struct smu_context *smu);#endif #endif
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_1.c +23 -0
@@ -129,3 +129,26 @@ int smu_v13_0_1_set_default_dpm_tables(struct smu_context *smu)return smu_cmn_update_table (smu,SMU_TABLE_DPMCLOCKS ,0 , smu_table->clocks_table, false); } +int smu_v13_0_1_set_driver_table_location (struct smu_context *smu) +{ +struct smu_table *driver_table = &smu->smu_table.driver_table; +int ret =0 ; + +if (!driver_table->mc_address) +return 0 ; + + ret =smu_cmn_send_smc_msg_with_param (smu, + SMU_MSG_SetDriverDramAddrHigh, +upper_32_bits (driver_table->mc_address), +NULL ); + +if (ret) +return ret; + + ret =smu_cmn_send_smc_msg_with_param (smu, + SMU_MSG_SetDriverDramAddrLow, +lower_32_bits (driver_table->mc_address), +NULL ); + +return ret; +}
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +1 -0
@@ -151,6 +151,7 @@ static const struct pptable_funcs yellow_carp_ppt_funcs = { .is_dpm_running = yellow_carp_is_dpm_running, .get_enabled_mask = smu_cmn_get_enabled_32_bits_mask, .get_pp_feature_mask = smu_cmn_get_pp_feature_mask, + .set_driver_table_location = smu_v13_0_1_set_driver_table_location, };void yellow_carp_set_ppt_funcs (struct smu_context *smu)
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 30/89 drm/amdgpu: add GFX Clock Gating support for yellow carp
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
Add below supports:
GFX Coarse Grain Clock Gating(CGCG) GFX Coarse grain light sleep/deep sleep(CGLS) GFX Medium Grain Clock Gating(MGCG) GFX Medium Grain light sleep/deep sleep(MGLS) GFX Fine Grain Clock Gating(FGCG)
RLC MGLS
CP MGLS
--- drivers/gpu/drm/amd/amdgpu/nv.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/nv.c +9 -1
@@ -1325,7 +1325,15 @@ static int nv_common_early_init(void *handle) adev->external_rev_id = adev->rev_id +0x46 ;break ;case CHIP_YELLOW_CARP : - adev->cg_flags =0 ; + adev->cg_flags =AMD_CG_SUPPORT_GFX_MGCG | +AMD_CG_SUPPORT_GFX_MGLS | +AMD_CG_SUPPORT_GFX_CGCG | +AMD_CG_SUPPORT_GFX_CGLS | +AMD_CG_SUPPORT_GFX_3D_CGCG | +AMD_CG_SUPPORT_GFX_3D_CGLS | +AMD_CG_SUPPORT_GFX_RLC_LS | +AMD_CG_SUPPORT_GFX_CP_LS | +AMD_CG_SUPPORT_GFX_FGCG ; adev->pg_flags =0 ; adev->external_rev_id = adev->rev_id +0x01 ;break ;
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 31/89 drm/amdgpu: add MMHUB Clock Gating support for yellow carp
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
Add AMD_CG_SUPPORT_MC_MGCG/AMD_CG_SUPPORT_MC_LS support.
--- drivers/gpu/drm/amd/amdgpu/nv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/nv.c +3 -1
@@ -1333,7 +1333,9 @@ static int nv_common_early_init(void *handle)AMD_CG_SUPPORT_GFX_3D_CGLS |AMD_CG_SUPPORT_GFX_RLC_LS |AMD_CG_SUPPORT_GFX_CP_LS | -AMD_CG_SUPPORT_GFX_FGCG ; +AMD_CG_SUPPORT_GFX_FGCG | +AMD_CG_SUPPORT_MC_MGCG | +AMD_CG_SUPPORT_MC_LS ; adev->pg_flags =0 ; adev->external_rev_id = adev->rev_id +0x01 ;break ;
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 32/89 drm/amdgpu: add GFX Power Gating support for yellow carp
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
Add GFX Power Gating support.
--- drivers/gpu/drm/amd/amdgpu/nv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/nv.c +1 -1
@@ -1336,7 +1336,7 @@ static int nv_common_early_init(void *handle)AMD_CG_SUPPORT_GFX_FGCG |AMD_CG_SUPPORT_MC_MGCG |AMD_CG_SUPPORT_MC_LS ; - adev->pg_flags =0 ; + adev->pg_flags =AMD_PG_SUPPORT_GFX_PG ; adev->external_rev_id = adev->rev_id +0x01 ;break ;default :
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 33/89 drm/amdgpu/pm: enable smu_hw_init for yellow carp
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
This patch is to enable smu_hw_init for yellow carp.
--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 3 --- 1 file changed, 3 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0 -3
@@ -1310,9 +1310,6 @@ static int smu_hw_init(void *handle)smu_set_gfx_cgpg (&adev->smu, true); } -if (adev->asic_type ==CHIP_YELLOW_CARP ) -return 0 ; -if (!smu->pm_enabled)return 0 ;
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 34/89 drm/amdgpu/pm: add gfx_off_control for yellow carp
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
This patch implements gfx_off_control.
--- drivers/gpu/drm/amd/pm/inc/smu_v13_0_1.h | 2 ++ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_1.c | 21 +++++++++++++++++++ .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 1 + 3 files changed, 24 insertions(+)
drivers/gpu/drm/amd/pm/inc/smu_v13_0_1.h +2 -0
@@ -49,5 +49,7 @@ int smu_v13_0_1_fini_smc_tables(struct smu_context *smu);int smu_v13_0_1_set_default_dpm_tables (struct smu_context *smu);int smu_v13_0_1_set_driver_table_location (struct smu_context *smu); + +int smu_v13_0_1_gfx_off_control (struct smu_context *smu,bool enable);#endif #endif
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_1.c +21 -0
@@ -152,3 +152,24 @@ int smu_v13_0_1_set_driver_table_location(struct smu_context *smu)return ret; } + +int smu_v13_0_1_gfx_off_control (struct smu_context *smu,bool enable) +{ +int ret =0 ; +struct amdgpu_device *adev = smu->adev; + +switch (adev->asic_type) { +case CHIP_YELLOW_CARP : +if (!(adev->pm.pp_feature &PP_GFXOFF_MASK )) +return 0 ; +if (enable) + ret =smu_cmn_send_smc_msg (smu, SMU_MSG_AllowGfxOff,NULL ); +else + ret =smu_cmn_send_smc_msg (smu, SMU_MSG_DisallowGfxOff,NULL ); +break ; +default : +break ; + } + +return ret; +}
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +1 -0
@@ -152,6 +152,7 @@ static const struct pptable_funcs yellow_carp_ppt_funcs = { .get_enabled_mask = smu_cmn_get_enabled_32_bits_mask, .get_pp_feature_mask = smu_cmn_get_pp_feature_mask, .set_driver_table_location = smu_v13_0_1_set_driver_table_location, + .gfx_off_control = smu_v13_0_1_gfx_off_control, };void yellow_carp_set_ppt_funcs (struct smu_context *smu)
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 35/89 drm/amdgpu/pm: enable gfx_off in yellow carp smu post init
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
Enable gfx_off in smu_late_init for yellow carp.
--- .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +13 -0
@@ -140,6 +140,18 @@ static bool yellow_carp_is_dpm_running(struct smu_context *smu) } +static int yellow_carp_post_smu_init (struct smu_context *smu) +{ +struct amdgpu_device *adev = smu->adev; +int ret =0 ; + +/* allow message will be sent after enable message on Yellow Carp*/ + ret =smu_cmn_send_smc_msg (smu, SMU_MSG_EnableGfxOff,NULL ); +if (ret) +dev_err (adev->dev,"Failed to Enable GfxOff!\n" ); +return ret; +} +static const struct pptable_funcs yellow_carp_ppt_funcs = { .check_fw_status = smu_v13_0_1_check_fw_status, .check_fw_version = smu_v13_0_1_check_fw_version,
@@ -153,6 +165,7 @@ static const struct pptable_funcs yellow_carp_ppt_funcs = { .get_pp_feature_mask = smu_cmn_get_pp_feature_mask, .set_driver_table_location = smu_v13_0_1_set_driver_table_location, .gfx_off_control = smu_v13_0_1_gfx_off_control, + .post_init = yellow_carp_post_smu_init, };void yellow_carp_set_ppt_funcs (struct smu_context *smu)
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 36/89 drm/amdgpu: add SDMA Clock Gating support for yellow carp
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
Add AMD_CG_SUPPORT_SDMA_LS support.
SDMA MGCG programming is migrated to RLC.
--- drivers/gpu/drm/amd/amdgpu/nv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/nv.c +2 -1
@@ -1335,7 +1335,8 @@ static int nv_common_early_init(void *handle)AMD_CG_SUPPORT_GFX_CP_LS |AMD_CG_SUPPORT_GFX_FGCG |AMD_CG_SUPPORT_MC_MGCG | -AMD_CG_SUPPORT_MC_LS ; +AMD_CG_SUPPORT_MC_LS | +AMD_CG_SUPPORT_SDMA_LS ; adev->pg_flags =AMD_PG_SUPPORT_GFX_PG ; adev->external_rev_id = adev->rev_id +0x01 ;break ;
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 37/89 drm/amdgpu: add HDP Clock Gating support for yellow carp
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
HDP MGCG is enabled by default.
Adding AMD_CG_SUPPORT_HDP_MGCG to ensure hdp mgcg enabled. HDP MGLS need to be enabled by driver.
--- drivers/gpu/drm/amd/amdgpu/nv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/nv.c +3 -1
@@ -1336,7 +1336,9 @@ static int nv_common_early_init(void *handle)AMD_CG_SUPPORT_GFX_FGCG |AMD_CG_SUPPORT_MC_MGCG |AMD_CG_SUPPORT_MC_LS | -AMD_CG_SUPPORT_SDMA_LS ; +AMD_CG_SUPPORT_SDMA_LS | +AMD_CG_SUPPORT_HDP_MGCG | +AMD_CG_SUPPORT_HDP_LS ; adev->pg_flags =AMD_PG_SUPPORT_GFX_PG ; adev->external_rev_id = adev->rev_id +0x01 ;break ;
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 38/89 drm/amdgpu: add ATHUB Clock Gating support for yellow carp
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
ATHUB MGCG/MGLS is enabled by default.
Adding ATHUB MGCG/MGLS flag to ensure athub mgcg/ls enabled.
--- drivers/gpu/drm/amd/amdgpu/nv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/nv.c +3 -1
@@ -1338,7 +1338,9 @@ static int nv_common_early_init(void *handle)AMD_CG_SUPPORT_MC_LS |AMD_CG_SUPPORT_SDMA_LS |AMD_CG_SUPPORT_HDP_MGCG | -AMD_CG_SUPPORT_HDP_LS ; +AMD_CG_SUPPORT_HDP_LS | +AMD_CG_SUPPORT_ATHUB_MGCG | +AMD_CG_SUPPORT_ATHUB_LS ; adev->pg_flags =AMD_PG_SUPPORT_GFX_PG ; adev->external_rev_id = adev->rev_id +0x01 ;break ;
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 39/89 drm/amdgpu: add IH Clock Gating support for yellow carp
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
IH CG need to be enabled by driver.
--- drivers/gpu/drm/amd/amdgpu/nv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/nv.c +2 -1
@@ -1340,7 +1340,8 @@ static int nv_common_early_init(void *handle)AMD_CG_SUPPORT_HDP_MGCG |AMD_CG_SUPPORT_HDP_LS |AMD_CG_SUPPORT_ATHUB_MGCG | -AMD_CG_SUPPORT_ATHUB_LS ; +AMD_CG_SUPPORT_ATHUB_LS | +AMD_CG_SUPPORT_IH_CG ; adev->pg_flags =AMD_PG_SUPPORT_GFX_PG ; adev->external_rev_id = adev->rev_id +0x01 ;break ;
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 40/89 drm/amd/pm: add vcn/jepg enable functions for yellow carp
In reply to Alex DeucherFrom: Huang Rui <[email protected]>
This patch is to add vcn/jepg enable functions to power up/down them with smu messages. VCN/JEPG are poweroff by default.
--- .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +33 -0
@@ -124,6 +124,37 @@ static int yellow_carp_init_smc_tables(struct smu_context *smu)return -ENOMEM ; } +static int yellow_carp_dpm_set_vcn_enable (struct smu_context *smu,bool enable) +{ +int ret =0 ; + +/* vcn dpm on is a prerequisite for vcn power gate messages */ +if (enable) + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_PowerUpVcn, +0 ,NULL ); +else + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_PowerDownVcn, +0 ,NULL ); + +return ret; +} + +static int yellow_carp_dpm_set_jpeg_enable (struct smu_context *smu,bool enable) +{ +int ret =0 ; + +if (enable) + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_PowerUpJpeg, +0 ,NULL ); +else + ret =smu_cmn_send_smc_msg_with_param (smu, + SMU_MSG_PowerDownJpeg,0 , +NULL ); + +return ret; +} + +static bool yellow_carp_is_dpm_running (struct smu_context *smu) {struct amdgpu_device *adev = smu->adev;
@@ -159,6 +190,8 @@ static const struct pptable_funcs yellow_carp_ppt_funcs = { .fini_smc_tables = smu_v13_0_1_fini_smc_tables, .send_smc_msg_with_param = smu_cmn_send_smc_msg_with_param, .send_smc_msg = smu_cmn_send_smc_msg, + .dpm_set_vcn_enable = yellow_carp_dpm_set_vcn_enable, + .dpm_set_jpeg_enable = yellow_carp_dpm_set_jpeg_enable, .set_default_dpm_table = smu_v13_0_1_set_default_dpm_tables, .is_dpm_running = yellow_carp_is_dpm_running, .get_enabled_mask = smu_cmn_get_enabled_32_bits_mask,
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 41/89 drm/amdgpu/jpeg: Remove harvest checking on CHIP_YELLOW_CARP
In reply to Alex DeucherFrom: James Zhu <[email protected]>
Register CC_UVD_HARVESTING is obsolete on CHIP_YELLOW_CARP.
--- drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c +6 -3
@@ -49,10 +49,13 @@ static int jpeg_v3_0_set_powergating_state(void *handle,static int jpeg_v3_0_early_init (void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -u32 harvest =RREG32_SOC15 (JPEG ,0 , mmCC_UVD_HARVESTING); -if (harvest &CC_UVD_HARVESTING__UVD_DISABLE_MASK ) -return -ENOENT ; +if (adev->asic_type !=CHIP_YELLOW_CARP ) { +u32 harvest =RREG32_SOC15 (JPEG ,0 , mmCC_UVD_HARVESTING); + +if (harvest &CC_UVD_HARVESTING__UVD_DISABLE_MASK ) +return -ENOENT ; + } adev->jpeg.num_jpeg_inst =1 ;
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 42/89 drm/amdgpu/vcn: add vcn support for yellow carp
In reply to Alex DeucherFrom: James Zhu <[email protected]>
Add vcn firmware support for yellow carp
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +8 -0
@@ -49,6 +49,7 @@#define FIRMWARE_DIMGREY_CAVEFISH "amdgpu/dimgrey_cavefish_vcn.bin"#define FIRMWARE_ALDEBARAN "amdgpu/aldebaran_vcn.bin"#define FIRMWARE_BEIGE_GOBY "amdgpu/beige_goby_vcn.bin" +#define FIRMWARE_YELLOW_CARP "amdgpu/yellow_carp_vcn.bin"MODULE_FIRMWARE (FIRMWARE_RAVEN );MODULE_FIRMWARE (FIRMWARE_PICASSO );
@@ -65,6 +66,7 @@ MODULE_FIRMWARE(FIRMWARE_NAVY_FLOUNDER);MODULE_FIRMWARE (FIRMWARE_VANGOGH );MODULE_FIRMWARE (FIRMWARE_DIMGREY_CAVEFISH );MODULE_FIRMWARE (FIRMWARE_BEIGE_GOBY ); +MODULE_FIRMWARE (FIRMWARE_YELLOW_CARP );static void amdgpu_vcn_idle_work_handler (struct work_struct *work);
@@ -159,6 +161,12 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG)) adev->vcn.indirect_sram = true;break ; +case CHIP_YELLOW_CARP : + fw_name =FIRMWARE_YELLOW_CARP ; +if ((adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) && + (adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG )) + adev->vcn.indirect_sram = true; +break ;default :return -EINVAL ; }
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 43/89 drm/amdgpu: enable vcn/jpeg on yellow carp
In reply to Alex DeucherFrom: James Zhu <[email protected]>
Enable vcn/jpeg IP on yellow carp.
--- drivers/gpu/drm/amd/amdgpu/nv.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/amdgpu/nv.c +3 -0
@@ -999,6 +999,9 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block);amdgpu_device_ip_block_add (adev, &gfx_v10_0_ip_block);amdgpu_device_ip_block_add (adev, &sdma_v5_2_ip_block); + +amdgpu_device_ip_block_add (adev, &vcn_v3_0_ip_block); +amdgpu_device_ip_block_add (adev, &jpeg_v3_0_ip_block);break ;default :return -EINVAL ;
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 44/89 drm/amdgpu: enable vcn dpg mode on yellow carp
In reply to Alex DeucherFrom: James Zhu <[email protected]>
Enable vcn dpg mode on yellow carp.
--- drivers/gpu/drm/amd/amdgpu/nv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/nv.c +2 -1
@@ -1345,7 +1345,8 @@ static int nv_common_early_init(void *handle)AMD_CG_SUPPORT_ATHUB_MGCG |AMD_CG_SUPPORT_ATHUB_LS |AMD_CG_SUPPORT_IH_CG ; - adev->pg_flags =AMD_PG_SUPPORT_GFX_PG ; + adev->pg_flags =AMD_PG_SUPPORT_GFX_PG | +AMD_PG_SUPPORT_VCN_DPG ; adev->external_rev_id = adev->rev_id +0x01 ;break ;default :
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 45/89 drm/amdgpu: enable VCN PG and CG for yellow carp
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
Enable VCN 3.0 PG and CG for Yellow Carp by setting up flags.
--- drivers/gpu/drm/amd/amdgpu/nv.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/nv.c +6 -2
@@ -1344,9 +1344,13 @@ static int nv_common_early_init(void *handle)AMD_CG_SUPPORT_HDP_LS |AMD_CG_SUPPORT_ATHUB_MGCG |AMD_CG_SUPPORT_ATHUB_LS | -AMD_CG_SUPPORT_IH_CG ; +AMD_CG_SUPPORT_IH_CG | +AMD_CG_SUPPORT_VCN_MGCG | +AMD_CG_SUPPORT_JPEG_MGCG ; adev->pg_flags =AMD_PG_SUPPORT_GFX_PG | -AMD_PG_SUPPORT_VCN_DPG ; +AMD_PG_SUPPORT_VCN | +AMD_PG_SUPPORT_VCN_DPG | +AMD_PG_SUPPORT_JPEG ; adev->external_rev_id = adev->rev_id +0x01 ;break ;default :
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 46/89 drm/amdgpu/pm: support smu_post_init for yellow carp
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
Add smu_post_init support for yellow carp.
--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +3 -3
@@ -662,9 +662,6 @@ static int smu_late_init(void *handle)smu_set_fine_grain_gfx_freq_parameters (smu); -if (adev->asic_type ==CHIP_YELLOW_CARP ) -return 0 ; -if (!smu->pm_enabled)return 0 ;
@@ -674,6 +671,9 @@ static int smu_late_init(void *handle)return ret; } +if (adev->asic_type ==CHIP_YELLOW_CARP ) +return 0 ; +if (!amdgpu_sriov_vf (adev) || smu->od_enabled) { ret =smu_set_default_od_settings (smu);if (ret) {
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 47/89 drm/amdgpu: add RLC_PG_DELAY_3 for yellow carp
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
RLC_PG_DELAY_3 is to make RLC in safe mode to prevent any misalignment or conflict in middle of any power feature entry/exit sequence when CGPG feature is enabled.
--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +16 -5
@@ -8052,12 +8052,23 @@ static void gfx_v10_cntl_power_gating(struct amdgpu_device *adev, bool enable)* in refclk count. Note that RLC FW is modified to take 16 bits from * RLC_PG_DELAY_3[15:0] as the hysteresis instead of just 8 bits. * -* The recommendation from RLC team is setting RLC_PG_DELAY_3 to 200us(0x4E20) -* as part of CGPG enablement starting point. +* The recommendation from RLC team is setting RLC_PG_DELAY_3 to 200us as part) +* of CGPG enablement starting point. +* Power/performance team will optimize it and might give a new value later. */ -if (enable && (adev->pg_flags &AMD_PG_SUPPORT_GFX_PG ) && adev->asic_type ==CHIP_VANGOGH ) { - data =0x4E20 & RLC_PG_DELAY_3__CGCG_ACTIVE_BEFORE_CGPG_MASK_Vangogh; -WREG32_SOC15 (GC ,0 , mmRLC_PG_DELAY_3, data); +if (enable && (adev->pg_flags &AMD_PG_SUPPORT_GFX_PG )) { +switch (adev->asic_type) { +case CHIP_VANGOGH : + data =0x4E20 & RLC_PG_DELAY_3__CGCG_ACTIVE_BEFORE_CGPG_MASK_Vangogh; +WREG32_SOC15 (GC ,0 , mmRLC_PG_DELAY_3, data); +break ; +case CHIP_YELLOW_CARP : + data =0x1388 & RLC_PG_DELAY_3__CGCG_ACTIVE_BEFORE_CGPG_MASK_Vangogh; +WREG32_SOC15 (GC ,0 , mmRLC_PG_DELAY_3, data); +break ; +default : +break ; + } } }
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 48/89 drm/amdgpu: add timestamp counter query support for yellow carp
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
Allows software to query HW counters to timestamp submissions. This patch can address KFDPerfCountersTest.
--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +1 -0
@@ -7598,6 +7598,7 @@ static uint64_t gfx_v10_0_get_gpu_clock_counter(struct amdgpu_device *adev)mutex_lock (&adev->gfx.gpu_clock_mutex);switch (adev->asic_type) {case CHIP_VANGOGH : +case CHIP_YELLOW_CARP : clock = (uint64_t )RREG32_SOC15 (SMUIO ,0 , mmGOLDEN_TSC_COUNT_LOWER_Vangogh) | ((uint64_t )RREG32_SOC15 (SMUIO ,0 , mmGOLDEN_TSC_COUNT_UPPER_Vangogh) <<32ULL );break ;
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 49/89 drm/amd/pm: add read_sensor function for yellow carp
In reply to Alex DeucherFrom: Xiaomeng Hou <[email protected]>
Add callback function read_sensor for yellow carp.
--- .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 140 ++++++++++++++++++ 1 file changed, 140 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +140 -0
@@ -183,6 +183,145 @@ static int yellow_carp_post_smu_init(struct smu_context *smu)return ret; } +static int yellow_carp_get_smu_metrics_data (struct smu_context *smu, +MetricsMember_t member, +uint32_t *value) +{ +struct smu_table_context *smu_table = &smu->smu_table; + +SmuMetrics_t *metrics = (SmuMetrics_t *)smu_table->metrics_table; +int ret =0 ; + +mutex_lock (&smu->metrics_lock); + + ret =smu_cmn_get_metrics_table_locked (smu,NULL , false); +if (ret) { +mutex_unlock (&smu->metrics_lock); +return ret; + } + +switch (member) { +case METRICS_AVERAGE_GFXCLK : + *value = metrics->GfxclkFrequency; +break ; +case METRICS_AVERAGE_SOCCLK : + *value = metrics->SocclkFrequency; +break ; +case METRICS_AVERAGE_VCLK : + *value = metrics->VclkFrequency; +break ; +case METRICS_AVERAGE_DCLK : + *value = metrics->DclkFrequency; +break ; +case METRICS_AVERAGE_UCLK : + *value = metrics->MemclkFrequency; +break ; +case METRICS_AVERAGE_GFXACTIVITY : + *value = metrics->GfxActivity /100 ; +break ; +case METRICS_AVERAGE_VCNACTIVITY : + *value = metrics->UvdActivity; +break ; +case METRICS_AVERAGE_SOCKETPOWER : + *value = (metrics->CurrentSocketPower <<8 ) /1000 ; +break ; +case METRICS_TEMPERATURE_EDGE : + *value = metrics->GfxTemperature /100 * +SMU_TEMPERATURE_UNITS_PER_CENTIGRADES ; +break ; +case METRICS_TEMPERATURE_HOTSPOT : + *value = metrics->SocTemperature /100 * +SMU_TEMPERATURE_UNITS_PER_CENTIGRADES ; +break ; +case METRICS_THROTTLER_STATUS : + *value = metrics->ThrottlerStatus; +break ; +case METRICS_VOLTAGE_VDDGFX : + *value = metrics->Voltage[0 ]; +break ; +case METRICS_VOLTAGE_VDDSOC : + *value = metrics->Voltage[1 ]; +break ; +default : + *value =UINT_MAX ; +break ; + } + +mutex_unlock (&smu->metrics_lock); + +return ret; +} + +static int yellow_carp_read_sensor (struct smu_context *smu, +enum amd_pp_sensors sensor, +void *data,uint32_t *size) +{ +int ret =0 ; + +if (!data || !size) +return -EINVAL ; + +mutex_lock (&smu->sensor_lock); +switch (sensor) { +case AMDGPU_PP_SENSOR_GPU_LOAD : + ret =yellow_carp_get_smu_metrics_data (smu, +METRICS_AVERAGE_GFXACTIVITY , + (uint32_t *)data); + *size =4 ; +break ; +case AMDGPU_PP_SENSOR_GPU_POWER : + ret =yellow_carp_get_smu_metrics_data (smu, +METRICS_AVERAGE_SOCKETPOWER , + (uint32_t *)data); + *size =4 ; +break ; +case AMDGPU_PP_SENSOR_EDGE_TEMP : + ret =yellow_carp_get_smu_metrics_data (smu, +METRICS_TEMPERATURE_EDGE , + (uint32_t *)data); + *size =4 ; +break ; +case AMDGPU_PP_SENSOR_HOTSPOT_TEMP : + ret =yellow_carp_get_smu_metrics_data (smu, +METRICS_TEMPERATURE_HOTSPOT , + (uint32_t *)data); + *size =4 ; +break ; +case AMDGPU_PP_SENSOR_GFX_MCLK : + ret =yellow_carp_get_smu_metrics_data (smu, +METRICS_AVERAGE_UCLK , + (uint32_t *)data); + *(uint32_t *)data *=100 ; + *size =4 ; +break ; +case AMDGPU_PP_SENSOR_GFX_SCLK : + ret =yellow_carp_get_smu_metrics_data (smu, +METRICS_AVERAGE_GFXCLK , + (uint32_t *)data); + *(uint32_t *)data *=100 ; + *size =4 ; +break ; +case AMDGPU_PP_SENSOR_VDDGFX : + ret =yellow_carp_get_smu_metrics_data (smu, +METRICS_VOLTAGE_VDDGFX , + (uint32_t *)data); + *size =4 ; +break ; +case AMDGPU_PP_SENSOR_VDDNB : + ret =yellow_carp_get_smu_metrics_data (smu, +METRICS_VOLTAGE_VDDSOC , + (uint32_t *)data); + *size =4 ; +break ; +default : + ret = -EOPNOTSUPP ; +break ; + } +mutex_unlock (&smu->sensor_lock); + +return ret; +} +static const struct pptable_funcs yellow_carp_ppt_funcs = { .check_fw_status = smu_v13_0_1_check_fw_status, .check_fw_version = smu_v13_0_1_check_fw_version,
@@ -193,6 +332,7 @@ static const struct pptable_funcs yellow_carp_ppt_funcs = { .dpm_set_vcn_enable = yellow_carp_dpm_set_vcn_enable, .dpm_set_jpeg_enable = yellow_carp_dpm_set_jpeg_enable, .set_default_dpm_table = smu_v13_0_1_set_default_dpm_tables, + .read_sensor = yellow_carp_read_sensor, .is_dpm_running = yellow_carp_is_dpm_running, .get_enabled_mask = smu_cmn_get_enabled_32_bits_mask, .get_pp_feature_mask = smu_cmn_get_pp_feature_mask,
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 50/89 drm/amd/pm: add set_watermarks_table function for yellow carp
In reply to Alex DeucherFrom: Xiaomeng Hou <[email protected]>
Add callback function set_watermarks_table for yellow carp.
--- .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +61 -0
@@ -322,6 +322,66 @@ static int yellow_carp_read_sensor(struct smu_context *smu,return ret; } +static int yellow_carp_set_watermarks_table (struct smu_context *smu, +struct pp_smu_wm_range_sets *clock_ranges) +{ +int i; +int ret =0 ; +Watermarks_t *table = smu->smu_table.watermarks_table; + +if (!table || !clock_ranges) +return -EINVAL ; + +if (clock_ranges) { +if (clock_ranges->num_reader_wm_sets >NUM_WM_RANGES || + clock_ranges->num_writer_wm_sets >NUM_WM_RANGES ) +return -EINVAL ; + +for (i =0 ; i < clock_ranges->num_reader_wm_sets; i++) { + table->WatermarkRow[WM_DCFCLK ][i].MinClock = + clock_ranges->reader_wm_sets[i].min_drain_clk_mhz; + table->WatermarkRow[WM_DCFCLK ][i].MaxClock = + clock_ranges->reader_wm_sets[i].max_drain_clk_mhz; + table->WatermarkRow[WM_DCFCLK ][i].MinMclk = + clock_ranges->reader_wm_sets[i].min_fill_clk_mhz; + table->WatermarkRow[WM_DCFCLK ][i].MaxMclk = + clock_ranges->reader_wm_sets[i].max_fill_clk_mhz; + + table->WatermarkRow[WM_DCFCLK ][i].WmSetting = + clock_ranges->reader_wm_sets[i].wm_inst; + } + +for (i =0 ; i < clock_ranges->num_writer_wm_sets; i++) { + table->WatermarkRow[WM_SOCCLK ][i].MinClock = + clock_ranges->writer_wm_sets[i].min_fill_clk_mhz; + table->WatermarkRow[WM_SOCCLK ][i].MaxClock = + clock_ranges->writer_wm_sets[i].max_fill_clk_mhz; + table->WatermarkRow[WM_SOCCLK ][i].MinMclk = + clock_ranges->writer_wm_sets[i].min_drain_clk_mhz; + table->WatermarkRow[WM_SOCCLK ][i].MaxMclk = + clock_ranges->writer_wm_sets[i].max_drain_clk_mhz; + + table->WatermarkRow[WM_SOCCLK ][i].WmSetting = + clock_ranges->writer_wm_sets[i].wm_inst; + } + + smu->watermarks_bitmap |=WATERMARKS_EXIST ; + } + +/* pass data to smu controller */ +if ((smu->watermarks_bitmap &WATERMARKS_EXIST ) && + !(smu->watermarks_bitmap &WATERMARKS_LOADED )) { + ret =smu_cmn_write_watermarks_table (smu); +if (ret) { +dev_err (smu->adev->dev,"Failed to update WMTABLE!" ); +return ret; + } + smu->watermarks_bitmap |=WATERMARKS_LOADED ; + } + +return 0 ; +} +static const struct pptable_funcs yellow_carp_ppt_funcs = { .check_fw_status = smu_v13_0_1_check_fw_status, .check_fw_version = smu_v13_0_1_check_fw_version,
@@ -334,6 +394,7 @@ static const struct pptable_funcs yellow_carp_ppt_funcs = { .set_default_dpm_table = smu_v13_0_1_set_default_dpm_tables, .read_sensor = yellow_carp_read_sensor, .is_dpm_running = yellow_carp_is_dpm_running, + .set_watermarks_table = yellow_carp_set_watermarks_table, .get_enabled_mask = smu_cmn_get_enabled_32_bits_mask, .get_pp_feature_mask = smu_cmn_get_pp_feature_mask, .set_driver_table_location = smu_v13_0_1_set_driver_table_location,
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 51/89 drm/amd/pm: add the fine grain tuning function for yellow carp
In reply to Alex DeucherFrom: Xiaomeng Hou <[email protected]>
Use the pp_od_clk_voltage sysfs file to configure the min and max value of gfx clock frequency or to restore the default values.
Command guide:
echo "s level value" > pp_od_clk_voltage
"s" - set the sclk frequency
"level" - 0 or 1, "0" represents the min value, "1" represents the max value
"value" - the target value of sclk frequency, it should be limited in the safe range
echo "r" > pp_od_clk_voltage
"r" - reset the sclk frequency, restore the default value
echo "c" > pp_od_clk_voltage
"c" - commit the min and max value of sclk frequency to the system only after the commit command, the setting target values by "s" command will take effect
Example:
1) check the default sclk frequency
$ cat pp_od_clk_voltage
OD_SCLK:
0: 200Mhz
1: 600Mhz
OD_RANGE:
SCLK: 200MHz 600MHz
2) use "s" -- set command to configure the min or max sclk frequency
$ echo "s 0 300" > pp_od_clk_voltage
$ echo "s 1 500" > pp_od_clk_voltage
$ echo "c" > pp_od_clk_voltage
$ cat pp_od_clk_voltage
OD_SCLK:
0: 300Mhz
1: 500Mhz
OD_RANGE:
SCLK: 200MHz 600MHz
3) use "r" -- reset command to restore the min and max sclk frequency
$ echo "r" > pp_od_clk_voltage
$ echo "c" > pp_od_clk_voltage
$ cat pp_od_clk_voltage
OD_SCLK:
0: 200Mhz
1: 600Mhz
OD_RANGE:
SCLK: 200MHz 600MHzv2: modify the description of reset command usage - need to do "commit"
after set the restore command
--- .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 116 ++++++++++++++++++ 1 file changed, 116 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +116 -0
@@ -382,6 +382,119 @@ static int yellow_carp_set_watermarks_table(struct smu_context *smu,return 0 ; } +static int yellow_carp_od_edit_dpm_table (struct smu_context *smu,enum PP_OD_DPM_TABLE_COMMAND type, +long input[],uint32_t size) +{ +int ret =0 ; + +switch (type) { +case PP_OD_EDIT_SCLK_VDDC_TABLE : +if (size !=2 ) { +dev_err (smu->adev->dev,"Input parameter number not correct\n" ); +return -EINVAL ; + } + +if (input[0 ] ==0 ) { +if (input[1 ] < smu->gfx_default_hard_min_freq) { +dev_warn (smu->adev->dev, +"Fine grain setting minimum sclk (%ld) MHz is less than the minimum allowed (%d) MHz\n" , + input[1 ], smu->gfx_default_hard_min_freq); +return -EINVAL ; + } + smu->gfx_actual_hard_min_freq = input[1 ]; + }else if (input[0 ] ==1 ) { +if (input[1 ] > smu->gfx_default_soft_max_freq) { +dev_warn (smu->adev->dev, +"Fine grain setting maximum sclk (%ld) MHz is greater than the maximum allowed (%d) MHz\n" , + input[1 ], smu->gfx_default_soft_max_freq); +return -EINVAL ; + } + smu->gfx_actual_soft_max_freq = input[1 ]; + }else { +return -EINVAL ; + } +break ; +case PP_OD_RESTORE_DEFAULT_TABLE : +if (size !=0 ) { +dev_err (smu->adev->dev,"Input parameter number not correct\n" ); +return -EINVAL ; + }else { + smu->gfx_actual_hard_min_freq = smu->gfx_default_hard_min_freq; + smu->gfx_actual_soft_max_freq = smu->gfx_default_soft_max_freq; + } +break ; +case PP_OD_COMMIT_DPM_TABLE : +if (size !=0 ) { +dev_err (smu->adev->dev,"Input parameter number not correct\n" ); +return -EINVAL ; + }else { +if (smu->gfx_actual_hard_min_freq > smu->gfx_actual_soft_max_freq) { +dev_err (smu->adev->dev, +"The setting minimun sclk (%d) MHz is greater than the setting maximum sclk (%d) MHz\n" , + smu->gfx_actual_hard_min_freq, + smu->gfx_actual_soft_max_freq); +return -EINVAL ; + } + + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_SetHardMinGfxClk, + smu->gfx_actual_hard_min_freq,NULL ); +if (ret) { +dev_err (smu->adev->dev,"Set hard min sclk failed!" ); +return ret; + } + + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_SetSoftMaxGfxClk, + smu->gfx_actual_soft_max_freq,NULL ); +if (ret) { +dev_err (smu->adev->dev,"Set soft max sclk failed!" ); +return ret; + } + } +break ; +default : +return -ENOSYS ; + } + +return ret; +} + +static int yellow_carp_print_clk_levels (struct smu_context *smu, +enum smu_clk_type clk_type,char *buf) +{ +int size =0 ; + +switch (clk_type) { +case SMU_OD_SCLK : + size =sprintf (buf,"%s:\n" ,"OD_SCLK" ); + size +=sprintf (buf + size,"0: %10uMhz\n" , + (smu->gfx_actual_hard_min_freq >0 ) ? smu->gfx_actual_hard_min_freq : smu->gfx_default_hard_min_freq); + size +=sprintf (buf + size,"1: %10uMhz\n" , + (smu->gfx_actual_soft_max_freq >0 ) ? smu->gfx_actual_soft_max_freq : smu->gfx_default_soft_max_freq); +break ; +case SMU_OD_RANGE : + size =sprintf (buf,"%s:\n" ,"OD_RANGE" ); + size +=sprintf (buf + size,"SCLK: %7uMhz %10uMhz\n" , + smu->gfx_default_hard_min_freq, smu->gfx_default_soft_max_freq); +break ; +default : +break ; + } + +return size; +} + +static int yellow_carp_set_fine_grain_gfx_freq_parameters (struct smu_context *smu) +{ +DpmClocks_t *clk_table = smu->smu_table.clocks_table; + + smu->gfx_default_hard_min_freq = clk_table->MinGfxClk; + smu->gfx_default_soft_max_freq = clk_table->MaxGfxClk; + smu->gfx_actual_hard_min_freq =0 ; + smu->gfx_actual_soft_max_freq =0 ; + +return 0 ; +} +static const struct pptable_funcs yellow_carp_ppt_funcs = { .check_fw_status = smu_v13_0_1_check_fw_status, .check_fw_version = smu_v13_0_1_check_fw_version,
@@ -400,6 +513,9 @@ static const struct pptable_funcs yellow_carp_ppt_funcs = { .set_driver_table_location = smu_v13_0_1_set_driver_table_location, .gfx_off_control = smu_v13_0_1_gfx_off_control, .post_init = yellow_carp_post_smu_init, + .od_edit_dpm_table = yellow_carp_od_edit_dpm_table, + .print_clk_levels = yellow_carp_print_clk_levels, + .set_fine_grain_gfx_freq_parameters = yellow_carp_set_fine_grain_gfx_freq_parameters, };void yellow_carp_set_ppt_funcs (struct smu_context *smu)
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 52/89 drm/amd/pm: add support to get dpm clock value for yellow carp
In reply to Alex DeucherFrom: Xiaomeng Hou <[email protected]>
Implement the sysfs API for getting values of pp dpm clocks(pp_dpm_socclk/mclk/fclk/vclk/dclk) for yellow carp.
--- .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 128 +++++++++++++++++- 1 file changed, 127 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +127 -1
@@ -458,10 +458,113 @@ static int yellow_carp_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPMreturn ret; } +static int yellow_carp_get_current_clk_freq (struct smu_context *smu, +enum smu_clk_type clk_type, +uint32_t *value) +{ +MetricsMember_t member_type; + +switch (clk_type) { +case SMU_SOCCLK : + member_type =METRICS_AVERAGE_SOCCLK ; +break ; +case SMU_VCLK : + member_type =METRICS_AVERAGE_VCLK ; +break ; +case SMU_DCLK : + member_type =METRICS_AVERAGE_DCLK ; +break ; +case SMU_MCLK : + member_type =METRICS_AVERAGE_UCLK ; +break ; +case SMU_FCLK : +return smu_cmn_send_smc_msg_with_param (smu, + SMU_MSG_GetFclkFrequency,0 , value); +default : +break ; + } + +return yellow_carp_get_smu_metrics_data (smu, member_type, value); +} + +static int yellow_carp_get_dpm_level_count (struct smu_context *smu, +enum smu_clk_type clk_type, +uint32_t *count) +{ +DpmClocks_t *clk_table = smu->smu_table.clocks_table; + +switch (clk_type) { +case SMU_SOCCLK : + *count = clk_table->NumSocClkLevelsEnabled; +break ; +case SMU_VCLK : + *count = clk_table->VcnClkLevelsEnabled; +break ; +case SMU_DCLK : + *count = clk_table->VcnClkLevelsEnabled; +break ; +case SMU_MCLK : + *count = clk_table->NumDfPstatesEnabled; +break ; +case SMU_FCLK : + *count = clk_table->NumDfPstatesEnabled; +break ; +default : +break ; + } + +return 0 ; +} + +static int yellow_carp_get_dpm_freq_by_index (struct smu_context *smu, +enum smu_clk_type clk_type, +uint32_t dpm_level, +uint32_t *freq) +{ +DpmClocks_t *clk_table = smu->smu_table.clocks_table; + +if (!clk_table || clk_type >=SMU_CLK_COUNT ) +return -EINVAL ; + +switch (clk_type) { +case SMU_SOCCLK : +if (dpm_level >= clk_table->NumSocClkLevelsEnabled) +return -EINVAL ; + *freq = clk_table->SocClocks[dpm_level]; +break ; +case SMU_VCLK : +if (dpm_level >= clk_table->VcnClkLevelsEnabled) +return -EINVAL ; + *freq = clk_table->VClocks[dpm_level]; +break ; +case SMU_DCLK : +if (dpm_level >= clk_table->VcnClkLevelsEnabled) +return -EINVAL ; + *freq = clk_table->DClocks[dpm_level]; +break ; +case SMU_UCLK : +case SMU_MCLK : +if (dpm_level >= clk_table->NumDfPstatesEnabled) +return -EINVAL ; + *freq = clk_table->DfPstateTable[dpm_level].MemClk; +break ; +case SMU_FCLK : +if (dpm_level >= clk_table->NumDfPstatesEnabled) +return -EINVAL ; + *freq = clk_table->DfPstateTable[dpm_level].FClk; +break ; +default : +return -EINVAL ; + } + +return 0 ; +} +static int yellow_carp_print_clk_levels (struct smu_context *smu,enum smu_clk_type clk_type,char *buf) { -int size =0 ; +int i, size =0 , ret =0 ; +uint32_t cur_value =0 , value =0 , count =0 ;switch (clk_type) {case SMU_OD_SCLK :
@@ -476,10 +579,33 @@ static int yellow_carp_print_clk_levels(struct smu_context *smu, size +=sprintf (buf + size,"SCLK: %7uMhz %10uMhz\n" , smu->gfx_default_hard_min_freq, smu->gfx_default_soft_max_freq);break ; +case SMU_SOCCLK : +case SMU_VCLK : +case SMU_DCLK : +case SMU_MCLK : +case SMU_FCLK : + ret =yellow_carp_get_current_clk_freq (smu, clk_type, &cur_value); +if (ret) + goto print_clk_out; + + ret =yellow_carp_get_dpm_level_count (smu, clk_type, &count); +if (ret) + goto print_clk_out; + +for (i =0 ; i < count; i++) { + ret =yellow_carp_get_dpm_freq_by_index (smu, clk_type, i, &value); +if (ret) + goto print_clk_out; + + size +=sprintf (buf + size,"%d: %uMhz %s\n" , i, value, + cur_value == value ?"*" :"" ); + } +break ;default :break ; } +print_clk_out:return size; }
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 53/89 drm/amd/pm: add feature map for yellow carp
In reply to Alex DeucherFrom: Xiaomeng Hou <[email protected]>
Add feature map for yellow carp.
--- .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +42 -0
@@ -75,6 +75,47 @@ static struct cmn2asic_msg_mapping yellow_carp_message_map[SMU_MSG_MAX_COUNT] = MSG_MAP(SetSoftMinSocclkByFreq, PPSMC_MSG_SetSoftMinSocclkByFreq, 1), }; +static struct cmn2asic_mapping yellow_carp_feature_mask_map[SMU_FEATURE_COUNT ] = { +FEA_MAP (CCLK_DPM ), +FEA_MAP (FAN_CONTROLLER ), +FEA_MAP (PPT ), +FEA_MAP (TDC ), +FEA_MAP (THERMAL ), +FEA_MAP (ULV ), +FEA_MAP (VCN_DPM ), +FEA_MAP_REVERSE (FCLK ), +FEA_MAP_REVERSE (SOCCLK ), +FEA_MAP (LCLK_DPM ), +FEA_MAP (SHUBCLK_DPM ), +FEA_MAP (DCFCLK_DPM ), +FEA_MAP_HALF_REVERSE (GFX ), +FEA_MAP (DS_GFXCLK ), +FEA_MAP (DS_SOCCLK ), +FEA_MAP (DS_LCLK ), +FEA_MAP (DS_DCFCLK ), +FEA_MAP (DS_FCLK ), +FEA_MAP (DS_MP1CLK ), +FEA_MAP (DS_MP0CLK ), +FEA_MAP (GFX_DEM ), +FEA_MAP (PSI ), +FEA_MAP (PROCHOT ), +FEA_MAP (CPUOFF ), +FEA_MAP (STAPM ), +FEA_MAP (S0I3 ), +FEA_MAP (PERF_LIMIT ), +FEA_MAP (CORE_DLDO ), +FEA_MAP (RSMU_LOW_POWER ), +FEA_MAP (SMN_LOW_POWER ), +FEA_MAP (THM_LOW_POWER ), +FEA_MAP (SMUIO_LOW_POWER ), +FEA_MAP (MP1_LOW_POWER ), +FEA_MAP (DS_VCN ), +FEA_MAP (CPPC ), +FEA_MAP (DF_CSTATES ), +FEA_MAP (MSMU_LOW_POWER ), +FEA_MAP (ATHUB_PG ), +}; +static struct cmn2asic_mapping yellow_carp_table_map[SMU_TABLE_COUNT ] = {TAB_MAP_VALID (WATERMARKS ),TAB_MAP_VALID (SMU_METRICS ),
@@ -648,6 +689,7 @@ void yellow_carp_set_ppt_funcs(struct smu_context *smu) { smu->ppt_funcs = &yellow_carp_ppt_funcs; smu->message_map = yellow_carp_message_map; + smu->feature_map = yellow_carp_feature_mask_map; smu->table_map = yellow_carp_table_map; smu->is_apu = true; }
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 54/89 drm/amd/pm: implement is_dpm_running() callback for yellow carp
In reply to Alex DeucherFrom: Xiaomeng Hou <[email protected]>
Implement function to check if DPM is running for yellow carp.
--- .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 30 +++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +21 -9
@@ -42,6 +42,18 @@#undef pr_info#undef pr_debug +#define FEATURE_MASK (feature) (1ULL << feature) +#define SMC_DPM_FEATURE ( \ + FEATURE_MASK(FEATURE_CCLK_DPM_BIT) | \ + FEATURE_MASK(FEATURE_VCN_DPM_BIT) | \ + FEATURE_MASK(FEATURE_FCLK_DPM_BIT) | \ + FEATURE_MASK(FEATURE_SOCCLK_DPM_BIT) | \ + FEATURE_MASK(FEATURE_MP0CLK_DPM_BIT) | \ + FEATURE_MASK(FEATURE_LCLK_DPM_BIT) | \ + FEATURE_MASK(FEATURE_SHUBCLK_DPM_BIT) | \ + FEATURE_MASK(FEATURE_DCFCLK_DPM_BIT)| \ + FEATURE_MASK(FEATURE_GFX_DPM_BIT)) +static struct cmn2asic_msg_mapping yellow_carp_message_map[SMU_MSG_MAX_COUNT ] = {MSG_MAP (TestMessage, PPSMC_MSG_TestMessage,1 ),MSG_MAP (GetSmuVersion, PPSMC_MSG_GetSmuVersion,1 ),
@@ -198,18 +210,18 @@ static int yellow_carp_dpm_set_jpeg_enable(struct smu_context *smu, bool enable)static bool yellow_carp_is_dpm_running (struct smu_context *smu) { -struct amdgpu_device *adev = smu->adev; +int ret =0 ; +uint32_t feature_mask[2 ]; +uint64_t feature_enabled; + + ret =smu_cmn_get_enabled_32_bits_mask (smu, feature_mask,2 ); -/* -* Until now, the pmfw hasn't exported the interface of SMU -* feature mask to APU SKU so just force on all the feature -* at early initial stage. -*/ -if (adev->in_suspend) +if (ret)return false; -else -return true; + feature_enabled = (uint64_t )feature_mask[1 ] <<32 | feature_mask[0 ]; + +return !!(feature_enabled &SMC_DPM_FEATURE ); }static int yellow_carp_post_smu_init (struct smu_context *smu)
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 55/89 drm/amd/pm: initialize feature_enabled/feature_support bitmap for yellow carp
In reply to Alex DeucherFrom: Xiaomeng Hou <[email protected]>
Initialize the feature_enabled and feature_supported bitmap for yellow carp.
--- .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +25 -0
@@ -177,6 +177,30 @@ static int yellow_carp_init_smc_tables(struct smu_context *smu)return -ENOMEM ; } +static int yellow_carp_system_features_control (struct smu_context *smu,bool en) +{ +struct smu_feature *feature = &smu->smu_feature; +uint32_t feature_mask[2 ]; +int ret =0 ; + +bitmap_zero (feature->enabled, feature->feature_num); +bitmap_zero (feature->supported, feature->feature_num); + +if (!en) +return ret; + + ret =smu_cmn_get_enabled_32_bits_mask (smu, feature_mask,2 ); +if (ret) +return ret; + +bitmap_copy (feature->enabled, (unsigned long *)&feature_mask, + feature->feature_num); +bitmap_copy (feature->supported, (unsigned long *)&feature_mask, + feature->feature_num); + +return 0 ; +} +static int yellow_carp_dpm_set_vcn_enable (struct smu_context *smu,bool enable) {int ret =0 ;
@@ -679,6 +703,7 @@ static const struct pptable_funcs yellow_carp_ppt_funcs = { .check_fw_version = smu_v13_0_1_check_fw_version, .init_smc_tables = yellow_carp_init_smc_tables, .fini_smc_tables = smu_v13_0_1_fini_smc_tables, + .system_features_control = yellow_carp_system_features_control, .send_smc_msg_with_param = smu_cmn_send_smc_msg_with_param, .send_smc_msg = smu_cmn_send_smc_msg, .dpm_set_vcn_enable = yellow_carp_dpm_set_vcn_enable,
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 56/89 drm/amd/pm: add callback force_clk_levels for yellow carp
In reply to Alex DeucherFrom: Xiaomeng Hou <[email protected]>
Implement the sysfs API to set a range of allowed DPM levels for specific clock domain.
v2: return error directly if the specified clock type not supported
--- .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 114 ++++++++++++++++++ 1 file changed, 114 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +114 -0
@@ -637,6 +637,82 @@ static int yellow_carp_get_dpm_freq_by_index(struct smu_context *smu,return 0 ; } +static bool yellow_carp_clk_dpm_is_enabled (struct smu_context *smu, +enum smu_clk_type clk_type) +{ +enum smu_feature_mask feature_id =0 ; + +switch (clk_type) { +case SMU_MCLK : +case SMU_UCLK : +case SMU_FCLK : + feature_id =SMU_FEATURE_DPM_FCLK_BIT ; +break ; +case SMU_GFXCLK : +case SMU_SCLK : + feature_id =SMU_FEATURE_DPM_GFXCLK_BIT ; +break ; +case SMU_SOCCLK : + feature_id =SMU_FEATURE_DPM_SOCCLK_BIT ; +break ; +case SMU_VCLK : +case SMU_DCLK : + feature_id =SMU_FEATURE_VCN_DPM_BIT ; +break ; +default : +return true; + } + +return smu_cmn_feature_is_enabled (smu, feature_id); +} + +static int yellow_carp_set_soft_freq_limited_range (struct smu_context *smu, +enum smu_clk_type clk_type, +uint32_t min, +uint32_t max) +{ +enum smu_message_type msg_set_min, msg_set_max; +int ret =0 ; + +if (!yellow_carp_clk_dpm_is_enabled (smu, clk_type)) +return -EINVAL ; + +switch (clk_type) { +case SMU_GFXCLK : +case SMU_SCLK : + msg_set_min = SMU_MSG_SetHardMinGfxClk; + msg_set_max = SMU_MSG_SetSoftMaxGfxClk; +break ; +case SMU_FCLK : +case SMU_MCLK : + msg_set_min = SMU_MSG_SetHardMinFclkByFreq; + msg_set_max = SMU_MSG_SetSoftMaxFclkByFreq; +break ; +case SMU_SOCCLK : + msg_set_min = SMU_MSG_SetHardMinSocclkByFreq; + msg_set_max = SMU_MSG_SetSoftMaxSocclkByFreq; +break ; +case SMU_VCLK : +case SMU_DCLK : + msg_set_min = SMU_MSG_SetHardMinVcn; + msg_set_max = SMU_MSG_SetSoftMaxVcn; +break ; +default : +return -EINVAL ; + } + + ret =smu_cmn_send_smc_msg_with_param (smu, msg_set_min, min,NULL ); +if (ret) + goto out; + + ret =smu_cmn_send_smc_msg_with_param (smu, msg_set_max, max,NULL ); +if (ret) + goto out; + +out: +return ret; +} +static int yellow_carp_print_clk_levels (struct smu_context *smu,enum smu_clk_type clk_type,char *buf) {
@@ -686,6 +762,43 @@ static int yellow_carp_print_clk_levels(struct smu_context *smu,return size; } +static int yellow_carp_force_clk_levels (struct smu_context *smu, +enum smu_clk_type clk_type,uint32_t mask) +{ +uint32_t soft_min_level =0 , soft_max_level =0 ; +uint32_t min_freq =0 , max_freq =0 ; +int ret =0 ; + + soft_min_level = mask ? (ffs (mask) -1 ) :0 ; + soft_max_level = mask ? (fls (mask) -1 ) :0 ; + +switch (clk_type) { +case SMU_SOCCLK : +case SMU_MCLK : +case SMU_FCLK : +case SMU_VCLK : +case SMU_DCLK : + ret =yellow_carp_get_dpm_freq_by_index (smu, clk_type, soft_min_level, &min_freq); +if (ret) + goto force_level_out; + + ret =yellow_carp_get_dpm_freq_by_index (smu, clk_type, soft_max_level, &max_freq); +if (ret) + goto force_level_out; + + ret =yellow_carp_set_soft_freq_limited_range (smu, clk_type, min_freq, max_freq); +if (ret) + goto force_level_out; +break ; +default : + ret = -EINVAL ; +break ; + } + +force_level_out: +return ret; +} +static int yellow_carp_set_fine_grain_gfx_freq_parameters (struct smu_context *smu) {DpmClocks_t *clk_table = smu->smu_table.clocks_table;
@@ -719,6 +832,7 @@ static const struct pptable_funcs yellow_carp_ppt_funcs = { .post_init = yellow_carp_post_smu_init, .od_edit_dpm_table = yellow_carp_od_edit_dpm_table, .print_clk_levels = yellow_carp_print_clk_levels, + .force_clk_levels = yellow_carp_force_clk_levels, .set_fine_grain_gfx_freq_parameters = yellow_carp_set_fine_grain_gfx_freq_parameters, };
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 57/89 drm/amd/pm: add PrepareMp1ForUnload support for yellow carp
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
Driver needs to notify the PMFW when the RLC is disabled.
--- drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +4 -0
@@ -65,6 +65,7 @@ static struct cmn2asic_msg_mapping yellow_carp_message_map[SMU_MSG_MAX_COUNT] =MSG_MAP (PowerUpVcn, PPSMC_MSG_PowerUpVcn,1 ),MSG_MAP (SetHardMinVcn, PPSMC_MSG_SetHardMinVcn,1 ),MSG_MAP (ActiveProcessNotify, PPSMC_MSG_ActiveProcessNotify,1 ), +MSG_MAP (PrepareMp1ForUnload, PPSMC_MSG_PrepareMp1ForUnload,1 ),MSG_MAP (SetDriverDramAddrHigh, PPSMC_MSG_SetDriverDramAddrHigh,1 ),MSG_MAP (SetDriverDramAddrLow, PPSMC_MSG_SetDriverDramAddrLow,1 ), MSG_MAP(TransferTableSmu2Dram, PPSMC_MSG_TransferTableSmu2Dram, 1),
@@ -183,6 +184,9 @@ static int yellow_carp_system_features_control(struct smu_context *smu, bool en)uint32_t feature_mask[2 ];int ret =0 ; +if (!en) + ret =smu_cmn_send_smc_msg (smu, SMU_MSG_PrepareMp1ForUnload,NULL ); +bitmap_zero (feature->enabled, feature->feature_num);bitmap_zero (feature->supported, feature->feature_num);
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 58/89 drm/amdgpu: Load TA firmware for yellow carp
In reply to Alex DeucherFrom: Nicholas Kazlauskas <[email protected]>
Add TA firmware to module firmware list for yellow carp and call psp_init_ta_microcode to parse the TA firmware for HDCP support.
--- drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/amd/amdgpu/psp_v13_0.c +4 -0
@@ -33,6 +33,7 @@ MODULE_FIRMWARE("amdgpu/aldebaran_sos.bin");MODULE_FIRMWARE ("amdgpu/aldebaran_ta.bin" );MODULE_FIRMWARE ("amdgpu/yellow_carp_asd.bin" );MODULE_FIRMWARE ("amdgpu/yellow_carp_toc.bin" ); +MODULE_FIRMWARE ("amdgpu/yellow_carp_ta.bin" );static int psp_v13_0_init_microcode (struct psp_context *psp) {
@@ -64,6 +65,9 @@ static int psp_v13_0_init_microcode(struct psp_context *psp)if (err)return err; err =psp_init_toc_microcode (psp, chip_name); +if (err) +return err; + err =psp_init_ta_microcode (psp, chip_name);if (err)return err;break ;
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 59/89 drm/amd/pm: add callback to get bootup values for yellow carp
In reply to Alex DeucherFrom: Xiaomeng Hou <[email protected]>
Add get_vbios_bootup_values function to get the bootup values for yellow carp.
--- drivers/gpu/drm/amd/pm/inc/smu_v13_0_1.h | 2 + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_1.c | 136 ++++++++++++++++++ .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 1 + 3 files changed, 139 insertions(+)
drivers/gpu/drm/amd/pm/inc/smu_v13_0_1.h +2 -0
@@ -46,6 +46,8 @@ int smu_v13_0_1_check_fw_version(struct smu_context *smu);int smu_v13_0_1_fini_smc_tables (struct smu_context *smu); +int smu_v13_0_1_get_vbios_bootup_values (struct smu_context *smu); +int smu_v13_0_1_set_default_dpm_tables (struct smu_context *smu);int smu_v13_0_1_set_driver_table_location (struct smu_context *smu);
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_1.c +136 -0
148 lines not on this page · raw message
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +1 -0
@@ -820,6 +820,7 @@ static const struct pptable_funcs yellow_carp_ppt_funcs = { .check_fw_version = smu_v13_0_1_check_fw_version, .init_smc_tables = yellow_carp_init_smc_tables, .fini_smc_tables = smu_v13_0_1_fini_smc_tables, + .get_vbios_bootup_values = smu_v13_0_1_get_vbios_bootup_values, .system_features_control = yellow_carp_system_features_control, .send_smc_msg_with_param = smu_cmn_send_smc_msg_with_param, .send_smc_msg = smu_cmn_send_smc_msg,
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 60/89 drm/amd/pm: add callback get_dpm_ultimate_freq for yellow carp
In reply to Alex DeucherFrom: Xiaomeng Hou <[email protected]>
Add callback function to get the hard frequency range of a clock domain for yellow carp.
--- .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 111 ++++++++++++++++++ 1 file changed, 111 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +111 -0
@@ -670,6 +670,116 @@ static bool yellow_carp_clk_dpm_is_enabled(struct smu_context *smu,return smu_cmn_feature_is_enabled (smu, feature_id); } +static int yellow_carp_get_dpm_ultimate_freq (struct smu_context *smu, +enum smu_clk_type clk_type, +uint32_t *min, +uint32_t *max) +{ +DpmClocks_t *clk_table = smu->smu_table.clocks_table; +uint32_t clock_limit; +uint32_t max_dpm_level, min_dpm_level; +int ret =0 ; + +if (!yellow_carp_clk_dpm_is_enabled (smu, clk_type)) { +switch (clk_type) { +case SMU_MCLK : +case SMU_UCLK : + clock_limit = smu->smu_table.boot_values.uclk; +break ; +case SMU_FCLK : + clock_limit = smu->smu_table.boot_values.fclk; +break ; +case SMU_GFXCLK : +case SMU_SCLK : + clock_limit = smu->smu_table.boot_values.gfxclk; +break ; +case SMU_SOCCLK : + clock_limit = smu->smu_table.boot_values.socclk; +break ; +case SMU_VCLK : + clock_limit = smu->smu_table.boot_values.vclk; +break ; +case SMU_DCLK : + clock_limit = smu->smu_table.boot_values.dclk; +break ; +default : + clock_limit =0 ; +break ; + } + +/* clock in Mhz unit */ +if (min) + *min = clock_limit /100 ; +if (max) + *max = clock_limit /100 ; + +return 0 ; + } + +if (max) { +switch (clk_type) { +case SMU_GFXCLK : +case SMU_SCLK : + *max = clk_table->MaxGfxClk; +break ; +case SMU_MCLK : +case SMU_UCLK : +case SMU_FCLK : + max_dpm_level =0 ; +break ; +case SMU_SOCCLK : + max_dpm_level = clk_table->NumSocClkLevelsEnabled -1 ; +break ; +case SMU_VCLK : +case SMU_DCLK : + max_dpm_level = clk_table->VcnClkLevelsEnabled -1 ; +break ; +default : + ret = -EINVAL ; + goto failed; + } + +if (clk_type !=SMU_GFXCLK && clk_type !=SMU_SCLK ) { + ret =yellow_carp_get_dpm_freq_by_index (smu, clk_type, max_dpm_level, max); +if (ret) + goto failed; + } + } + +if (min) { +switch (clk_type) { +case SMU_GFXCLK : +case SMU_SCLK : + *min = clk_table->MinGfxClk; +break ; +case SMU_MCLK : +case SMU_UCLK : +case SMU_FCLK : + min_dpm_level = clk_table->NumDfPstatesEnabled -1 ; +break ; +case SMU_SOCCLK : + min_dpm_level =0 ; +break ; +case SMU_VCLK : +case SMU_DCLK : + min_dpm_level =0 ; +break ; +default : + ret = -EINVAL ; + goto failed; + } + +if (clk_type !=SMU_GFXCLK && clk_type !=SMU_SCLK ) { + ret =yellow_carp_get_dpm_freq_by_index (smu, clk_type, min_dpm_level, min); +if (ret) + goto failed; + } + } + +failed: +return ret; +} + static int yellow_carp_set_soft_freq_limited_range(struct smu_context *smu, enum smu_clk_type clk_type, uint32_t min,
@@ -835,6 +945,7 @@ static const struct pptable_funcs yellow_carp_ppt_funcs = { .set_driver_table_location = smu_v13_0_1_set_driver_table_location, .gfx_off_control = smu_v13_0_1_gfx_off_control, .post_init = yellow_carp_post_smu_init, + .get_dpm_ultimate_freq = yellow_carp_get_dpm_ultimate_freq, .od_edit_dpm_table = yellow_carp_od_edit_dpm_table, .print_clk_levels = yellow_carp_print_clk_levels, .force_clk_levels = yellow_carp_force_clk_levels,
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 61/89 drm/amd/pm: add callbacks to read/write sysfs file pp_power_profile_mode
In reply to Alex DeucherFrom: Xiaomeng Hou <[email protected]>
Implement the sysfs API for getting/setting pp_power_profile_mode for yellow carp.
--- .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +86 -0
@@ -135,6 +135,14 @@ static struct cmn2asic_mapping yellow_carp_table_map[SMU_TABLE_COUNT] = {TAB_MAP_VALID (CUSTOM_DPM ), TAB_MAP_VALID(DPMCLOCKS), }; + +static struct cmn2asic_mapping yellow_carp_workload_map[PP_SMC_POWER_PROFILE_COUNT ] = { +WORKLOAD_MAP (PP_SMC_POWER_PROFILE_FULLSCREEN3D ,WORKLOAD_PPLIB_FULL_SCREEN_3D_BIT ), +WORKLOAD_MAP (PP_SMC_POWER_PROFILE_VIDEO ,WORKLOAD_PPLIB_VIDEO_BIT ), +WORKLOAD_MAP (PP_SMC_POWER_PROFILE_VR ,WORKLOAD_PPLIB_VR_BIT ), +WORKLOAD_MAP (PP_SMC_POWER_PROFILE_COMPUTE ,WORKLOAD_PPLIB_COMPUTE_BIT ), +WORKLOAD_MAP (PP_SMC_POWER_PROFILE_CUSTOM ,WORKLOAD_PPLIB_CUSTOM_BIT ), +};static int yellow_carp_init_smc_tables (struct smu_context *smu) {
@@ -463,6 +471,81 @@ static int yellow_carp_set_watermarks_table(struct smu_context *smu,return 0 ; } +static int yellow_carp_get_power_profile_mode (struct smu_context *smu, +char *buf) +{ +static const char *profile_name[] = { +"BOOTUP_DEFAULT" , +"3D_FULL_SCREEN" , +"POWER_SAVING" , +"VIDEO" , +"VR" , +"COMPUTE" , +"CUSTOM" }; +uint32_t i, size =0 ; +int16_t workload_type =0 ; + +if (!buf) +return -EINVAL ; + +for (i =0 ; i <=PP_SMC_POWER_PROFILE_CUSTOM ; i++) { +/* +* Conv PP_SMC_POWER_PROFILE* to WORKLOAD_PPLIB_*_BIT. +* Not all profile modes are supported on yellow carp. +*/ + workload_type =smu_cmn_to_asic_specific_index (smu, +CMN2ASIC_MAPPING_WORKLOAD , + i); + +if (workload_type <0 ) +continue ; + + size +=sprintf (buf + size,"%2d %14s%s\n" , + i, profile_name[i], (i == smu->power_profile_mode) ?"*" :" " ); + } + +return size; +} + +static int yellow_carp_set_power_profile_mode (struct smu_context *smu, +long *input,uint32_t size) +{ +int workload_type, ret; +uint32_t profile_mode = input[size]; + +if (profile_mode >PP_SMC_POWER_PROFILE_CUSTOM ) { +dev_err (smu->adev->dev,"Invalid power profile mode %d\n" , profile_mode); +return -EINVAL ; + } + +if (profile_mode ==PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT || + profile_mode ==PP_SMC_POWER_PROFILE_POWERSAVING ) +return 0 ; + +/* conv PP_SMC_POWER_PROFILE* to WORKLOAD_PPLIB_*_BIT */ + workload_type =smu_cmn_to_asic_specific_index (smu, +CMN2ASIC_MAPPING_WORKLOAD , + profile_mode); +if (workload_type <0 ) { +dev_dbg (smu->adev->dev,"Unsupported power profile mode %d on YELLOWCARP\n" , + profile_mode); +return -EINVAL ; + } + + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_ActiveProcessNotify, +1 << workload_type, +NULL ); +if (ret) { +dev_err_once (smu->adev->dev,"Fail to set workload type %d\n" , + workload_type); +return ret; + } + + smu->power_profile_mode = profile_mode; + +return 0 ; +} +static int yellow_carp_od_edit_dpm_table (struct smu_context *smu,enum PP_OD_DPM_TABLE_COMMAND type,long input[],uint32_t size) {
@@ -940,6 +1023,8 @@ static const struct pptable_funcs yellow_carp_ppt_funcs = { .read_sensor = yellow_carp_read_sensor, .is_dpm_running = yellow_carp_is_dpm_running, .set_watermarks_table = yellow_carp_set_watermarks_table, + .get_power_profile_mode = yellow_carp_get_power_profile_mode, + .set_power_profile_mode = yellow_carp_set_power_profile_mode, .get_enabled_mask = smu_cmn_get_enabled_32_bits_mask, .get_pp_feature_mask = smu_cmn_get_pp_feature_mask, .set_driver_table_location = smu_v13_0_1_set_driver_table_location,
@@ -958,5 +1043,6 @@ void yellow_carp_set_ppt_funcs(struct smu_context *smu) smu->message_map = yellow_carp_message_map; smu->feature_map = yellow_carp_feature_mask_map; smu->table_map = yellow_carp_table_map; + smu->workload_map = yellow_carp_workload_map; smu->is_apu = true; }
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 62/89 drm/amd/pm: add the interface to dump smu metrics table for yellow carp
In reply to Alex DeucherFrom: Xiaomeng Hou <[email protected]>
This patch is to add the interface to dump smu metrics table for yellow carp.
--- .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 56 ++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +55 -1
@@ -169,7 +169,7 @@ static int yellow_carp_init_smc_tables(struct smu_context *smu)if (!smu_table->watermarks_table) goto err2_out; - smu_table->gpu_metrics_table_size =sizeof (struct gpu_metrics_v2_0 ); + smu_table->gpu_metrics_table_size =sizeof (struct gpu_metrics_v2_1 ); smu_table->gpu_metrics_table =kzalloc (smu_table->gpu_metrics_table_size,GFP_KERNEL );if (!smu_table->gpu_metrics_table) goto err3_out;
@@ -546,6 +546,59 @@ static int yellow_carp_set_power_profile_mode(struct smu_context *smu,return 0 ; } +static ssize_t yellow_carp_get_gpu_metrics (struct smu_context *smu, +void **table) +{ +struct smu_table_context *smu_table = &smu->smu_table; +struct gpu_metrics_v2_1 *gpu_metrics = + (struct gpu_metrics_v2_1 *)smu_table->gpu_metrics_table; +SmuMetrics_t metrics; +int ret =0 ; + + ret =smu_cmn_get_metrics_table (smu, &metrics, true); +if (ret) +return ret; + +smu_cmn_init_soft_gpu_metrics (gpu_metrics,2 ,1 ); + + gpu_metrics->temperature_gfx = metrics.GfxTemperature; + gpu_metrics->temperature_soc = metrics.SocTemperature; +memcpy (&gpu_metrics->temperature_core[0 ], + &metrics.CoreTemperature[0 ], +sizeof (uint16_t ) *8 ); + gpu_metrics->temperature_l3[0 ] = metrics.L3Temperature; + + gpu_metrics->average_gfx_activity = metrics.GfxActivity; + gpu_metrics->average_mm_activity = metrics.UvdActivity; + + gpu_metrics->average_socket_power = metrics.CurrentSocketPower; + gpu_metrics->average_gfx_power = metrics.Power[0 ]; + gpu_metrics->average_soc_power = metrics.Power[1 ]; +memcpy (&gpu_metrics->average_core_power[0 ], + &metrics.CorePower[0 ], +sizeof (uint16_t ) *8 ); + + gpu_metrics->average_gfxclk_frequency = metrics.GfxclkFrequency; + gpu_metrics->average_socclk_frequency = metrics.SocclkFrequency; + gpu_metrics->average_uclk_frequency = metrics.MemclkFrequency; + gpu_metrics->average_fclk_frequency = metrics.MemclkFrequency; + gpu_metrics->average_vclk_frequency = metrics.VclkFrequency; + gpu_metrics->average_dclk_frequency = metrics.DclkFrequency; + +memcpy (&gpu_metrics->current_coreclk[0 ], + &metrics.CoreFrequency[0 ], +sizeof (uint16_t ) *8 ); + gpu_metrics->current_l3clk[0 ] = metrics.L3Frequency; + + gpu_metrics->throttle_status = metrics.ThrottlerStatus; + + gpu_metrics->system_clock_counter =ktime_get_boottime_ns (); + + *table = (void *)gpu_metrics; + +return sizeof (struct gpu_metrics_v2_1 ); +} +static int yellow_carp_od_edit_dpm_table (struct smu_context *smu,enum PP_OD_DPM_TABLE_COMMAND type,long input[],uint32_t size) {
@@ -1025,6 +1078,7 @@ static const struct pptable_funcs yellow_carp_ppt_funcs = { .set_watermarks_table = yellow_carp_set_watermarks_table, .get_power_profile_mode = yellow_carp_get_power_profile_mode, .set_power_profile_mode = yellow_carp_set_power_profile_mode, + .get_gpu_metrics = yellow_carp_get_gpu_metrics, .get_enabled_mask = smu_cmn_get_enabled_32_bits_mask, .get_pp_feature_mask = smu_cmn_get_pp_feature_mask, .set_driver_table_location = smu_v13_0_1_set_driver_table_location,
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 63/89 drm/amdgpu: add gpu harvest support for yellow carp (v2)
In reply to Alex DeucherFrom: Xiaomeng Hou <[email protected]>
Register callback in gfxhub functions to program the bypass groups in gc_utcl2 corresponding to harvested SA.
v2: update comments (Alex)
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gfxhub.h | 1 + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 40 ++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 7 ++++ 3 files changed, 48 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_gfxhub.h +1 -0
@@ -34,6 +34,7 @@ struct amdgpu_gfxhub_funcs {void (*set_fault_enable_default)(struct amdgpu_device *adev,bool value);void (*init)(struct amdgpu_device *adev);int (*get_xgmi_info)(struct amdgpu_device *adev); +void (*utcl2_harvest)(struct amdgpu_device *adev); };struct amdgpu_gfxhub {
drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c +40 -0
@@ -31,6 +31,9 @@#include "soc15_common.h" +#define mmGCUTCL2_HARVEST_BYPASS_GROUPS_YELLOW_CARP 0x16f8 +#define mmGCUTCL2_HARVEST_BYPASS_GROUPS_YELLOW_CARP_BASE_IDX 0 +static const char *gfxhub_client_ids[] = {"CB/DB" ,"Reserved" ,
@@ -531,6 +534,42 @@ static int gfxhub_v2_1_get_xgmi_info(struct amdgpu_device *adev)return 0 ; } +static void gfxhub_v2_1_utcl2_harvest (struct amdgpu_device *adev) +{ +int i; +u32 tmp =0 , disabled_sa =0 ; +u32 efuse_setting, vbios_setting; + +u32 max_sa_mask =amdgpu_gfx_create_bitmask ( + adev->gfx.config.max_sh_per_se * + adev->gfx.config.max_shader_engines); + +if (adev->asic_type ==CHIP_YELLOW_CARP ) { +/* Get SA disabled bitmap from eFuse setting */ + efuse_setting =RREG32_SOC15 (GC ,0 , mmCC_GC_SA_UNIT_DISABLE); + efuse_setting &=CC_GC_SA_UNIT_DISABLE__SA_DISABLE_MASK ; + efuse_setting >>=CC_GC_SA_UNIT_DISABLE__SA_DISABLE__SHIFT ; + +/* Get SA disabled bitmap from VBIOS setting */ + vbios_setting =RREG32_SOC15 (GC ,0 , mmGC_USER_SA_UNIT_DISABLE); + vbios_setting &=GC_USER_SA_UNIT_DISABLE__SA_DISABLE_MASK ; + vbios_setting >>=GC_USER_SA_UNIT_DISABLE__SA_DISABLE__SHIFT ; + + disabled_sa |= efuse_setting | vbios_setting; +/* Make sure not to report harvested SAs beyond the max SA count */ + disabled_sa &= max_sa_mask; + +for (i =0 ; disabled_sa >0 ; i++) { +if (disabled_sa &1 ) + tmp |=0x3 << (i *2 ); + disabled_sa >>=1 ; + } + disabled_sa = tmp; + +WREG32_SOC15 (GC ,0 , mmGCUTCL2_HARVEST_BYPASS_GROUPS_YELLOW_CARP, disabled_sa); + } +} +const struct amdgpu_gfxhub_funcs gfxhub_v2_1_funcs = { .get_fb_location = gfxhub_v2_1_get_fb_location, .get_mc_fb_offset = gfxhub_v2_1_get_mc_fb_offset,
@@ -540,4 +579,5 @@ const struct amdgpu_gfxhub_funcs gfxhub_v2_1_funcs = { .set_fault_enable_default = gfxhub_v2_1_set_fault_enable_default, .init = gfxhub_v2_1_init, .get_xgmi_info = gfxhub_v2_1_get_xgmi_info, + .utcl2_harvest = gfxhub_v2_1_utcl2_harvest, };
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +7 -0
@@ -1060,6 +1060,13 @@ static int gmc_v10_0_hw_init(void *handle)/* The sequence of these two function calls matters.*/ gmc_v10_0_init_golden_registers (adev); +/* +* harvestable groups in gc_utcl2 need to be programmed before any GFX block +* register setup within GMC, or else system hang when harvesting SA. +*/ +if (adev->gfxhub.funcs && adev->gfxhub.funcs->utcl2_harvest) + adev->gfxhub.funcs->utcl2_harvest (adev); + r =gmc_v10_0_gart_enable (adev);if (r)return r;
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 64/89 drm/amdgpu: correct the cu and rb info for yellow carp
In reply to Alex DeucherFrom: Xiaomeng Hou <[email protected]>
Skip disabled sa to correct the cu_info and active_rbs for yellow carp.
--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +4 -2
@@ -4944,7 +4944,8 @@ static void gfx_v10_0_setup_rb(struct amdgpu_device *adev)for (i =0 ; i < adev->gfx.config.max_shader_engines; i++) {for (j =0 ; j < adev->gfx.config.max_sh_per_se; j++) { bitmap = i * adev->gfx.config.max_sh_per_se + j; -if ((adev->asic_type ==CHIP_SIENNA_CICHLID ) && +if (((adev->asic_type ==CHIP_SIENNA_CICHLID ) || + (adev->asic_type ==CHIP_YELLOW_CARP )) && ((gfx_v10_3_get_disabled_sa (adev) >> bitmap) &1 ))continue ;gfx_v10_0_select_se_sh (adev, i, j,0xffffffff );
@@ -9358,7 +9359,8 @@ static int gfx_v10_0_get_cu_info(struct amdgpu_device *adev,for (i =0 ; i < adev->gfx.config.max_shader_engines; i++) {for (j =0 ; j < adev->gfx.config.max_sh_per_se; j++) { bitmap = i * adev->gfx.config.max_sh_per_se + j; -if ((adev->asic_type ==CHIP_SIENNA_CICHLID ) && +if (((adev->asic_type ==CHIP_SIENNA_CICHLID ) || + (adev->asic_type ==CHIP_YELLOW_CARP )) && ((gfx_v10_3_get_disabled_sa (adev) >> bitmap) &1 ))continue ; mask =1 ;
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 65/89 drm/amd/pm: add set_performance_level function for yellow carp
In reply to Alex DeucherFrom: Xiaomeng Hou <[email protected]>
This patch enables editing sysfs file power_dpm_force_performance_level for yellow carp. User could thus adjust the dpm forced level.
v2: enable fine grain control of GFXCLK only when in manual performance level mode. In other mode, the min/max range of GFXCLK will be reset to corresponding values.
Ex: To enable min 300MHz / max 600MHz gfx clocks
1) echo manual > /sys/bus/pci/devices/.../power_dpm_force_performance_level
2) echo s 0 300 > /sys/bus/pci/devices/.../pp_od_clk_voltage
3) echo s 1 600 > /sys/bus/pci/devices/.../pp_od_clk_voltage
4) echo c > /sys/bus/pci/devices/.../pp_od_clk_voltage
--- .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 84 +++++++++++++++++++ 1 file changed, 84 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +84 -0
@@ -602,8 +602,13 @@ static ssize_t yellow_carp_get_gpu_metrics(struct smu_context *smu,static int yellow_carp_od_edit_dpm_table (struct smu_context *smu,enum PP_OD_DPM_TABLE_COMMAND type,long input[],uint32_t size) { +struct smu_dpm_context *smu_dpm = &(smu->smu_dpm);int ret =0 ; +/* Only allowed in manual mode */ +if (smu_dpm->dpm_level !=AMD_DPM_FORCED_LEVEL_MANUAL ) +return -EINVAL ; +switch (type) {case PP_OD_EDIT_SCLK_VDDC_TABLE :if (size !=2 ) {
@@ -1049,6 +1054,84 @@ static int yellow_carp_force_clk_levels(struct smu_context *smu,return ret; } +static int yellow_carp_set_performance_level (struct smu_context *smu, +enum amd_dpm_forced_level level) +{ +struct amdgpu_device *adev = smu->adev; +uint32_t sclk_min =0 , sclk_max =0 ; +uint32_t mclk_min =0 , mclk_max =0 ; +uint32_t socclk_min =0 , socclk_max =0 ; +int ret =0 ; + +switch (level) { +case AMD_DPM_FORCED_LEVEL_HIGH : +yellow_carp_get_dpm_ultimate_freq (smu,SMU_SCLK ,NULL , &sclk_max); +yellow_carp_get_dpm_ultimate_freq (smu,SMU_MCLK ,NULL , &mclk_max); +yellow_carp_get_dpm_ultimate_freq (smu,SMU_SOCCLK ,NULL , &socclk_max); + sclk_min = sclk_max; + mclk_min = mclk_max; + socclk_min = socclk_max; +break ; +case AMD_DPM_FORCED_LEVEL_LOW : +yellow_carp_get_dpm_ultimate_freq (smu,SMU_SCLK , &sclk_min,NULL ); +yellow_carp_get_dpm_ultimate_freq (smu,SMU_MCLK , &mclk_min,NULL ); +yellow_carp_get_dpm_ultimate_freq (smu,SMU_SOCCLK , &socclk_min,NULL ); + sclk_max = sclk_min; + mclk_max = mclk_min; + socclk_max = socclk_min; +break ; +case AMD_DPM_FORCED_LEVEL_AUTO : +yellow_carp_get_dpm_ultimate_freq (smu,SMU_SCLK , &sclk_min, &sclk_max); +yellow_carp_get_dpm_ultimate_freq (smu,SMU_MCLK , &mclk_min, &mclk_max); +yellow_carp_get_dpm_ultimate_freq (smu,SMU_SOCCLK , &socclk_min, &socclk_max); +break ; +case AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD : +case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK : +case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK : +case AMD_DPM_FORCED_LEVEL_PROFILE_PEAK : +/* Temporarily do nothing since the optimal clocks haven't been provided yet */ +break ; +case AMD_DPM_FORCED_LEVEL_MANUAL : +case AMD_DPM_FORCED_LEVEL_PROFILE_EXIT : +return 0 ; +default : +dev_err (adev->dev,"Invalid performance level %d\n" , level); +return -EINVAL ; + } + +if (sclk_min && sclk_max) { + ret =yellow_carp_set_soft_freq_limited_range (smu, +SMU_SCLK , + sclk_min, + sclk_max); +if (ret) +return ret; + + smu->gfx_actual_hard_min_freq = sclk_min; + smu->gfx_actual_soft_max_freq = sclk_max; + } + +if (mclk_min && mclk_max) { + ret =yellow_carp_set_soft_freq_limited_range (smu, +SMU_MCLK , + mclk_min, + mclk_max); +if (ret) +return ret; + } + +if (socclk_min && socclk_max) { + ret =yellow_carp_set_soft_freq_limited_range (smu, +SMU_SOCCLK , + socclk_min, + socclk_max); +if (ret) +return ret; + } + +return ret; +} +static int yellow_carp_set_fine_grain_gfx_freq_parameters (struct smu_context *smu) {DpmClocks_t *clk_table = smu->smu_table.clocks_table;
@@ -1088,6 +1171,7 @@ static const struct pptable_funcs yellow_carp_ppt_funcs = { .od_edit_dpm_table = yellow_carp_od_edit_dpm_table, .print_clk_levels = yellow_carp_print_clk_levels, .force_clk_levels = yellow_carp_force_clk_levels, + .set_performance_level = yellow_carp_set_performance_level, .set_fine_grain_gfx_freq_parameters = yellow_carp_set_fine_grain_gfx_freq_parameters, };
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 66/89 drm/amdgpu: add mode2 reset support for yellow carp
In reply to Alex DeucherFrom: Aaron Liu <[email protected]>
This patch adds mode2 reset support for yellow carp.
--- drivers/gpu/drm/amd/amdgpu/nv.c | 1 + .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+)
drivers/gpu/drm/amd/amdgpu/nv.c +1 -0
@@ -633,6 +633,7 @@ nv_asic_reset_method(struct amdgpu_device *adev)switch (adev->asic_type) {case CHIP_VANGOGH : +case CHIP_YELLOW_CARP :return AMD_RESET_METHOD_MODE2 ;case CHIP_SIENNA_CICHLID :case CHIP_NAVY_FLOUNDER :
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +26 -0
@@ -272,6 +272,31 @@ static int yellow_carp_post_smu_init(struct smu_context *smu)return ret; } +static int yellow_carp_mode_reset (struct smu_context *smu,int type) +{ +int ret =0 , index =0 ; + + index =smu_cmn_to_asic_specific_index (smu,CMN2ASIC_MAPPING_MSG , + SMU_MSG_GfxDeviceDriverReset); +if (index <0 ) +return index == -EACCES ?0 : index; + +mutex_lock (&smu->message_lock); + + ret =smu_cmn_send_msg_without_waiting (smu, (uint16_t )index, type); + +mutex_unlock (&smu->message_lock); + +mdelay (10 ); + +return ret; +} + +static int yellow_carp_mode2_reset (struct smu_context *smu) +{ +return yellow_carp_mode_reset (smu,SMU_RESET_MODE_2 ); +} +static int yellow_carp_get_smu_metrics_data (struct smu_context *smu,MetricsMember_t member,uint32_t *value)
@@ -1167,6 +1192,7 @@ static const struct pptable_funcs yellow_carp_ppt_funcs = { .set_driver_table_location = smu_v13_0_1_set_driver_table_location, .gfx_off_control = smu_v13_0_1_gfx_off_control, .post_init = yellow_carp_post_smu_init, + .mode2_reset = yellow_carp_mode2_reset, .get_dpm_ultimate_freq = yellow_carp_get_dpm_ultimate_freq, .od_edit_dpm_table = yellow_carp_od_edit_dpm_table, .print_clk_levels = yellow_carp_print_clk_levels,
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 67/89 drm/amd/pm: disable manually setting MCLK power level on yellow carp
In reply to Alex DeucherFrom: Xiaomeng Hou <[email protected]>
PMFW provides specific messages for setting fclk freq range thus adjust the power level. There's misusing of these messages when setting dpm mclk. Since actually mclk could adjust automatically complying with fclk, remove standalone support for mclk dpm level setting.
--- .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +10 -12
@@ -964,7 +964,6 @@ static int yellow_carp_set_soft_freq_limited_range(struct smu_context *smu, msg_set_max = SMU_MSG_SetSoftMaxGfxClk;break ;case SMU_FCLK : -case SMU_MCLK : msg_set_min = SMU_MSG_SetHardMinFclkByFreq; msg_set_max = SMU_MSG_SetSoftMaxFclkByFreq;break ;
@@ -1054,7 +1053,6 @@ static int yellow_carp_force_clk_levels(struct smu_context *smu,switch (clk_type) {case SMU_SOCCLK : -case SMU_MCLK :case SMU_FCLK :case SMU_VCLK :case SMU_DCLK :
@@ -1084,30 +1082,30 @@ static int yellow_carp_set_performance_level(struct smu_context *smu, {struct amdgpu_device *adev = smu->adev;uint32_t sclk_min =0 , sclk_max =0 ; -uint32_t mclk_min =0 , mclk_max =0 ; +uint32_t fclk_min =0 , fclk_max =0 ;uint32_t socclk_min =0 , socclk_max =0 ;int ret =0 ;switch (level) {case AMD_DPM_FORCED_LEVEL_HIGH :yellow_carp_get_dpm_ultimate_freq (smu,SMU_SCLK ,NULL , &sclk_max); -yellow_carp_get_dpm_ultimate_freq (smu,SMU_MCLK ,NULL , &mclk_max); +yellow_carp_get_dpm_ultimate_freq (smu,SMU_FCLK ,NULL , &fclk_max);yellow_carp_get_dpm_ultimate_freq (smu,SMU_SOCCLK ,NULL , &socclk_max); sclk_min = sclk_max; - mclk_min = mclk_max; + fclk_min = fclk_max; socclk_min = socclk_max;break ;case AMD_DPM_FORCED_LEVEL_LOW :yellow_carp_get_dpm_ultimate_freq (smu,SMU_SCLK , &sclk_min,NULL ); -yellow_carp_get_dpm_ultimate_freq (smu,SMU_MCLK , &mclk_min,NULL ); +yellow_carp_get_dpm_ultimate_freq (smu,SMU_FCLK , &fclk_min,NULL );yellow_carp_get_dpm_ultimate_freq (smu,SMU_SOCCLK , &socclk_min,NULL ); sclk_max = sclk_min; - mclk_max = mclk_min; + fclk_max = fclk_min; socclk_max = socclk_min;break ;case AMD_DPM_FORCED_LEVEL_AUTO :yellow_carp_get_dpm_ultimate_freq (smu,SMU_SCLK , &sclk_min, &sclk_max); -yellow_carp_get_dpm_ultimate_freq (smu,SMU_MCLK , &mclk_min, &mclk_max); +yellow_carp_get_dpm_ultimate_freq (smu,SMU_FCLK , &fclk_min, &fclk_max);yellow_carp_get_dpm_ultimate_freq (smu,SMU_SOCCLK , &socclk_min, &socclk_max);break ;case AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD :
@@ -1136,11 +1134,11 @@ static int yellow_carp_set_performance_level(struct smu_context *smu, smu->gfx_actual_soft_max_freq = sclk_max; } -if (mclk_min && mclk_max) { +if (fclk_min && fclk_max) { ret =yellow_carp_set_soft_freq_limited_range (smu, -SMU_MCLK , - mclk_min, - mclk_max); +SMU_FCLK , + fclk_min, + fclk_max);if (ret)return ret; }
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 68/89 drm/amdgpu: add video_codecs query support for yellow carp
In reply to Alex DeucherFrom: James Zhu <[email protected]>
Add video_codecs query support for yellow carp.
--- drivers/gpu/drm/amd/amdgpu/nv.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/nv.c +1 -0
@@ -329,6 +329,7 @@ static int nv_query_video_codecs(struct amdgpu_device *adev, bool encode,case CHIP_NAVY_FLOUNDER :case CHIP_DIMGREY_CAVEFISH :case CHIP_VANGOGH : +case CHIP_YELLOW_CARP :if (encode) *codecs = &nv_video_codecs_encode;else
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 69/89 drm/amdgpu: Update atomfirmware for DCN3.1 phy tuning and eDP caps
In reply to Alex DeucherFrom: Nicholas Kazlauskas <[email protected]>
[Why & How]
We'll need these in driver for phy tuning in DCN3.1.
Multiple eDP support also requires understanding which LCD the backlight curve in atombios is for.
--- drivers/gpu/drm/amd/include/atomfirmware.h | 56 +++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/include/atomfirmware.h +55 -1
@@ -883,7 +883,8 @@ struct atom_bracket_layout_record };enum atom_display_device_tag_def { -ATOM_DISPLAY_LCD1_SUPPORT =0x0002 ,//an embedded display is either an LVDS or eDP signal type of display +ATOM_DISPLAY_LCD1_SUPPORT =0x0002 ,//an embedded display is either an LVDS or eDP signal type of display +ATOM_DISPLAY_LCD2_SUPPORT =0x0020 ,//second edp device tag 0x0020 for backward compability ATOM_DISPLAY_DFP1_SUPPORT =0x0008 ,ATOM_DISPLAY_DFP2_SUPPORT =0x0080 ,ATOM_DISPLAY_DFP3_SUPPORT =0x0200 ,
@@ -1413,6 +1414,59 @@ struct atom_integrated_system_info_v2_1 }; +struct atom_n6_display_phy_tuning_set { +uint8_t display_signal_type; +uint8_t phy_sel; +uint8_t preset_level; +uint8_t reserved1; +uint32_t reserved2; +uint32_t speed_upto; +uint8_t tx_vboost_level; +uint8_t tx_vreg_v2i; +uint8_t tx_vregdrv_byp; +uint8_t tx_term_cntl; +uint8_t tx_peak_level; +uint8_t tx_slew_en; +uint8_t tx_eq_pre; +uint8_t tx_eq_main; +uint8_t tx_eq_post; +uint8_t tx_en_inv_pre; +uint8_t tx_en_inv_post; +uint8_t reserved3; +uint32_t reserved4; +uint32_t reserved5; +uint32_t reserved6; +}; + +struct atom_display_phy_tuning_info { +struct atom_common_table_header table_header; +struct atom_n6_display_phy_tuning_set disp_phy_tuning[1 ]; +}; + +struct atom_integrated_system_info_v2_2 +{ +struct atom_common_table_header table_header; +uint32_t vbios_misc;//enum of atom_system_vbiosmisc_def +uint32_t gpucapinfo;//enum of atom_system_gpucapinf_def +uint32_t system_config; +uint32_t cpucapinfo; +uint16_t gpuclk_ss_percentage;//unit of 0.001%, 1000 mean 1% +uint16_t gpuclk_ss_type; +uint16_t dpphy_override;// bit vector, enum of atom_sysinfo_dpphy_override_def +uint8_t memorytype;// enum of atom_dmi_t17_mem_type_def, APU memory type indication. +uint8_t umachannelnumber;// number of memory channels +uint8_t htc_hyst_limit; +uint8_t htc_tmp_limit; +uint8_t reserved1; +uint8_t reserved2; +struct edp_info_table edp1_info; +struct edp_info_table edp2_info; +uint32_t reserved3[8 ]; +struct atom_external_display_connection_info extdispconninfo; + +uint32_t reserved4[189 ]; +}; +// system_config enum atom_system_vbiosmisc_def {INTEGRATED_SYSTEM_INFO__GET_EDID_CALLBACK_FUNC_SUPPORT =0x01 ,
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 70/89 drm/amd/display: Add DCN3.1 yellow carp asic family IDs
In reply to Alex DeucherFrom: Nicholas Kazlauskas <[email protected]>
[Why & How]
To determine whether the chip is yellow carp or not and which revision it is.
--- drivers/gpu/drm/amd/display/include/dal_asic_id.h | 13 +++++++++++++ drivers/gpu/drm/amd/display/include/dal_types.h | 3 +++ 2 files changed, 16 insertions(+)
drivers/gpu/drm/amd/display/include/dal_asic_id.h +13 -0
@@ -224,6 +224,19 @@ enum {#define ASICREV_IS_GREEN_SARDINE (eChipRev) ((eChipRev >= GREEN_SARDINE_A0) && (eChipRev < 0xFF))#endif +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +#define FAMILY_YELLOW_CARP 146 + +#define YELLOW_CARP_A0 0x01 +#define YELLOW_CARP_B0 0x02 // TODO: DCN31 - update with correct B0 ID +#define YELLOW_CARP_UNKNOWN 0xFF + +#ifndef ASICREV_IS_YELLOW_CARP +#define ASICREV_IS_YELLOW_CARP (eChipRev) ((eChipRev >= YELLOW_CARP_A0) && (eChipRev < YELLOW_CARP_UNKNOWN)) +#endif +#endif + +/* * ASIC chip ID */
drivers/gpu/drm/amd/display/include/dal_types.h +3 -0
@@ -55,6 +55,9 @@ enum dce_version { DCN_VERSION_3_01,DCN_VERSION_3_02 ,DCN_VERSION_3_03 , +#if defined(CONFIG_DRM_AMD_DC_DCN3_1) +DCN_VERSION_3_1 , +#endifDCN_VERSION_MAX };
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 71/89 drm/amd/display: Add DCN3.1 clock manager support
In reply to Alex DeucherFrom: Nicholas Kazlauskas <[email protected]>
Adds support for clock requests for the various parts of the DCN3.1 IP and the interfaces and definitions for sending messages to SMU/PMFW.
Includes new support for z9/10, detecting SMU timeout and p-state support enablement.
--- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 6 + .../gpu/drm/amd/display/dc/clk_mgr/Makefile | 11 + .../gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 30 + .../display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 4 + .../display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 673 ++++++++++++++++++ .../display/dc/clk_mgr/dcn31/dcn31_clk_mgr.h | 103 +++ .../amd/display/dc/clk_mgr/dcn31/dcn31_smu.c | 333 +++++++++ .../amd/display/dc/clk_mgr/dcn31/dcn31_smu.h | 271 +++++++ drivers/gpu/drm/amd/display/dc/dc.h | 14 + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 6 + .../gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 3 + 11 files changed, 1454 insertions(+) create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.h create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.h
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +6 -0
@@ -655,6 +655,12 @@ void dm_set_dcn_clocks(struct dc_context *ctx, struct dc_clocks *clks)/* TODO: something */ } +void dm_helpers_smu_timeout (struct dc_context *ctx,unsigned int msg_id,unsigned int param,unsigned int timeout_us) +{ +// TODO: +//amdgpu_device_gpu_recover(dc_context->driver-context, NULL); +} + void *dm_helpers_allocate_gpu_mem( struct dc_context *ctx, enum dc_gpu_mem_alloc_type type,
drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile +11 -0
@@ -136,3 +136,14 @@ AMD_DAL_CLK_MGR_DCN301 = $(addprefix $(AMDDALPATH)/dc/clk_mgr/dcn301/,$(CLK_MGR_ AMD_DISPLAY_FILES += $(AMD_DAL_CLK_MGR_DCN301) endif + +ifdef CONFIG_DRM_AMD_DC_DCN3_1 +############################################################################### +# DCN31 +############################################################################### +CLK_MGR_DCN31 = dcn31_smu.o dcn31_clk_mgr.o + +AMD_DAL_CLK_MGR_DCN31 = $(addprefix $(AMDDALPATH)/dc/clk_mgr/dcn31/,$(CLK_MGR_DCN31)) + +AMD_DISPLAY_FILES += $(AMD_DAL_CLK_MGR_DCN31) +endif
drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c +30 -0
@@ -41,6 +41,9 @@#include "dcn21/rn_clk_mgr.h" #include "dcn30/dcn30_clk_mgr.h" #include "dcn301/vg_clk_mgr.h" +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +#include "dcn31/dcn31_clk_mgr.h" +#endif int clk_mgr_helper_get_active_display_cnt(
@@ -261,6 +264,26 @@ struct clk_mgr *dc_clk_mgr_create(struct dc_context *ctx, struct pp_smu_funcs *p }break ;#endif + +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +case FAMILY_YELLOW_CARP : { +struct clk_mgr_dcn31 *clk_mgr =kzalloc (sizeof (*clk_mgr),GFP_KERNEL ); + +if (clk_mgr ==NULL ) { +BREAK_TO_DEBUGGER (); +return NULL ; + } +if (ASICREV_IS_YELLOW_CARP (asic_id.hw_internal_rev)) { +/* TODO: to add DCN31 clk_mgr support, once CLK IP header files are available, +* for now use DCN3.0 clk mgr. +*/ +dcn31_clk_mgr_construct (ctx, clk_mgr, pp_smu, dccg); +return &clk_mgr->base.base; + } +return &clk_mgr->base.base; + } +#endif +default :ASSERT (0 );/* Unknown Asic */ break ;
@@ -292,6 +315,13 @@ void dc_destroy_clk_mgr(struct clk_mgr *clk_mgr_base)vg_clk_mgr_destroy (clk_mgr);break ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +case FAMILY_YELLOW_CARP : +if (ASICREV_IS_YELLOW_CARP (clk_mgr_base->ctx->asic_id.hw_internal_rev)) +dcn31_clk_mgr_destroy (clk_mgr); +break ; +#endif +default :break ; }
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c +4 -0
@@ -324,6 +324,10 @@ void dcn2_update_clocks_fpga(struct clk_mgr *clk_mgr,// Both fclk and ref_dppclk run on the same scemi clock. clk_mgr_int->dccg->ref_dppclk = clk_mgr->clks.fclk_khz; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +/* TODO: set dtbclk in correct place */ + clk_mgr->clks.dtbclk_en = false; +#endif dm_set_dcn_clocks (clk_mgr->ctx, &clk_mgr->clks); }
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c new file +673 -0
673 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.h new file +103 -0
103 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c new file +333 -0
333 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.h new file +271 -0
271 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dc.h +14 -0
@@ -350,6 +350,13 @@ enum dcn_pwr_state { DCN_PWR_STATE_LOW_POWER = 3, }; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +enum dcn_z9_support_state { +DCN_Z9_SUPPORT_UNKNOWN , +DCN_Z9_SUPPORT_ALLOW , +DCN_Z9_SUPPORT_DISALLOW , +}; +#endif /* * For any clocks that may differ per pipe * only the max is stored in this structure
@@ -367,6 +374,10 @@ struct dc_clocks {int phyclk_khz;int dramclk_khz;bool p_state_change_support; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +enum dcn_z9_support_state z9_support; +bool dtbclk_en; +#endif enum dcn_pwr_state pwr_state;/* * Elements below are not compared for the purposes of
@@ -487,6 +498,9 @@ struct dc_debug_options {bool disable_pplib_clock_request;bool disable_clock_gate;bool disable_mem_low_power; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +bool pstate_enabled; +#endif bool disable_dmcu;bool disable_psr;bool force_abm_enable;
drivers/gpu/drm/amd/display/dc/dm_helpers.h +6 -0
@@ -162,6 +162,12 @@ void dm_set_dcn_clocks(bool dm_helpers_dmub_outbox_interrupt_control (struct dc_context *ctx,bool enable); +void dm_helpers_smu_timeout (struct dc_context *ctx,unsigned int msg_id,unsigned int param,unsigned int timeout_us); + +// 0x1 = Result_OK, 0xFE = Result_UnkmownCmd +#define IS_SMU_TIMEOUT (result) \ + (!(result == 0x1 || result == 0xFE)) + int dm_helper_dmub_aux_transfer_sync( struct dc_context *ctx, const struct dc_link *link,
drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h +3 -0
@@ -91,6 +91,9 @@ struct clk_limit_table_entry {unsigned int dispclk_mhz;unsigned int dppclk_mhz;unsigned int phyclk_mhz; +#ifdef CONFIG_DRM_AMD_DC_DCN3_1 +unsigned int wck_ratio; +#endif };/* This table is contiguous */
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 72/89 drm/amd/display: Add DCN3.1 DCCG
In reply to Alex DeucherFrom: Nicholas Kazlauskas <[email protected]>
Add programming of the DCCG (Display Controller Clock Generator) block:
HW Blocks:
+--------+
| DCCG |
+--------+--- .../gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 54 ++++ .../gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 279 ++++++++++++++++++ .../gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h | 147 +++++++++ drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 56 ++++ 4 files changed, 536 insertions(+) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h +54 -0
@@ -84,14 +84,53 @@type PHYCSYMCLK_FORCE_EN ;\type PHYCSYMCLK_FORCE_SRC_SEL ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +#define DCCG31_REG_FIELD_LIST (type) \ + type PHYDSYMCLK_FORCE_EN;\ + type PHYDSYMCLK_FORCE_SRC_SEL;\ + type PHYESYMCLK_FORCE_EN;\ + type PHYESYMCLK_FORCE_SRC_SEL;\ + type DPSTREAMCLK_PIPE0_EN;\ + type DPSTREAMCLK_PIPE1_EN;\ + type DPSTREAMCLK_PIPE2_EN;\ + type DPSTREAMCLK_PIPE3_EN;\ + type HDMISTREAMCLK0_SRC_SEL;\ + type HDMISTREAMCLK0_DTO_FORCE_DIS;\ + type SYMCLK32_SE0_SRC_SEL;\ + type SYMCLK32_SE1_SRC_SEL;\ + type SYMCLK32_SE2_SRC_SEL;\ + type SYMCLK32_SE3_SRC_SEL;\ + type SYMCLK32_SE0_EN;\ + type SYMCLK32_SE1_EN;\ + type SYMCLK32_SE2_EN;\ + type SYMCLK32_SE3_EN;\ + type SYMCLK32_LE0_SRC_SEL;\ + type SYMCLK32_LE1_SRC_SEL;\ + type SYMCLK32_LE0_EN;\ + type SYMCLK32_LE1_EN;\ + type DTBCLK_DTO_ENABLE[MAX_PIPES];\ + type DTBCLKDTO_ENABLE_STATUS[MAX_PIPES];\ + type PIPE_DTO_SRC_SEL[MAX_PIPES];\ + type DTBCLK_DTO_DIV[MAX_PIPES];\ + type DCCG_AUDIO_DTO_SEL;\ + type DCCG_AUDIO_DTO0_SOURCE_SEL;\ + type DENTIST_DISPCLK_CHG_MODE; +#endif +struct dccg_shift {DCCG_REG_FIELD_LIST (uint8_t ) DCCG3_REG_FIELD_LIST(uint8_t) +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) + DCCG31_REG_FIELD_LIST(uint8_t) +#endif };struct dccg_mask {DCCG_REG_FIELD_LIST (uint32_t ) DCCG3_REG_FIELD_LIST(uint32_t) +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) + DCCG31_REG_FIELD_LIST(uint32_t) +#endif };struct dccg_registers {
@@ -102,6 +141,21 @@ struct dccg_registers {uint32_t PHYASYMCLK_CLOCK_CNTL ;uint32_t PHYBSYMCLK_CLOCK_CNTL ;uint32_t PHYCSYMCLK_CLOCK_CNTL ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +uint32_t PHYDSYMCLK_CLOCK_CNTL ; +uint32_t PHYESYMCLK_CLOCK_CNTL ; +uint32_t OTG_PIXEL_RATE_CNTL [MAX_PIPES ]; +uint32_t DTBCLK_DTO_MODULO [MAX_PIPES ]; +uint32_t DTBCLK_DTO_PHASE [MAX_PIPES ]; +uint32_t DCCG_AUDIO_DTBCLK_DTO_MODULO ; +uint32_t DCCG_AUDIO_DTBCLK_DTO_PHASE ; +uint32_t DCCG_AUDIO_DTO_SOURCE ; +uint32_t DPSTREAMCLK_CNTL ; +uint32_t HDMISTREAMCLK_CNTL ; +uint32_t SYMCLK32_SE_CNTL ; +uint32_t SYMCLK32_LE_CNTL ; +uint32_t DENTIST_DISPCLK_CNTL ; +#endif };struct dcn_dccg {
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c new file +279 -0
279 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h new file +147 -0
147 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h +56 -0
73 lines not on this page · raw message
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 73/89 drm/amd/display: Add DCN3.1 DIO
In reply to Alex DeucherFrom: Nicholas Kazlauskas <[email protected]>
Add support for the DIO (Display IO) block of DCN3.1 which controls legacy HDMI/DP stream/link encoding.
HW Blocks:
+--------+ +--------+
| DIO | | DCCG |
+--------+ +--------+Includes some updates to core logic for link encoder assignment and future support for new high bandwidth output.
--- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 14 + .../gpu/drm/amd/display/dc/core/dc_resource.c | 10 + .../amd/display/dc/dcn10/dcn10_link_encoder.h | 20 + .../display/dc/dcn31/dcn31_dio_link_encoder.c | 412 ++++++++++++++++++ .../display/dc/dcn31/dcn31_dio_link_encoder.h | 246 +++++++++++ .../drm/amd/display/dc/inc/hw/link_encoder.h | 14 + 6 files changed, 716 insertions(+) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dio_link_encoder.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dio_link_encoder.h
drivers/gpu/drm/amd/display/dc/core/dc_link.c +14 -0
@@ -2875,8 +2875,16 @@ bool dc_link_setup_psr(struct dc_link *link, psr_context->psr_level.u32all =0 ;/*skip power down the single pipe since it blocks the cstate*/ +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +if (link->ctx->asic_id.chip_family >=FAMILY_RV ) { + psr_context->psr_level.bits.SKIP_CRTC_DISABLE = true; +if (link->ctx->asic_id.chip_family ==FAMILY_YELLOW_CARP && !dc->debug.disable_z10) + psr_context->psr_level.bits.SKIP_CRTC_DISABLE = false; + } +#else if (link->ctx->asic_id.chip_family >=FAMILY_RV ) psr_context->psr_level.bits.SKIP_CRTC_DISABLE = true; +#endif /* SMU will perform additional powerdown sequence. * For unsupported ASICs, set psr_level flag to skip PSR
@@ -3208,8 +3216,14 @@ static void update_psp_stream_config(struct pipe_ctx *pipe_ctx, bool dpms_off)dp_get_panel_mode (pipe_ctx->stream->link); config.otg_inst = (uint8_t ) pipe_ctx->stream_res.tg->inst; +/*stream_enc_inst*/ config.dig_fe = (uint8_t ) pipe_ctx->stream_res.stream_enc->stream_enc_inst; config.dig_be = pipe_ctx->stream->link->link_enc_hw_inst; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) + config.stream_enc_idx = pipe_ctx->stream_res.stream_enc->id -ENGINE_ID_DIGA ; + config.link_enc_idx = pipe_ctx->stream->link->link_enc->transmitter -TRANSMITTER_UNIPHY_A ; + config.phy_idx = pipe_ctx->stream->link->link_enc->transmitter -TRANSMITTER_UNIPHY_A ; +#endif config.dpms_off = dpms_off; config.dm_stream_ctx = pipe_ctx->stream->dm_stream_context; config.assr_enabled = (panel_mode ==DP_PANEL_MODE_EDP );
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +10 -0
@@ -2114,6 +2114,16 @@ enum dc_status dc_validate_global_state(if (!new_ctx)return DC_ERROR_UNEXPECTED ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) + +/* +* Update link encoder to stream assignment. +* TODO: Split out reason allocation from validation. +*/ +if (dc->res_pool->funcs->link_encs_assign) + dc->res_pool->funcs->link_encs_assign ( + dc, new_ctx, new_ctx->streams, new_ctx->stream_count); +#endif if (dc->res_pool->funcs->validate_global) { result = dc->res_pool->funcs->validate_global (dc, new_ctx);
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_link_encoder.h +20 -0
@@ -160,6 +160,14 @@ struct dcn10_link_enc_registers {uint32_t PHYA_LINK_CNTL2 ;uint32_t PHYB_LINK_CNTL2 ;uint32_t PHYC_LINK_CNTL2 ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +uint32_t DIO_LINKA_CNTL ; +uint32_t DIO_LINKB_CNTL ; +uint32_t DIO_LINKC_CNTL ; +uint32_t DIO_LINKD_CNTL ; +uint32_t DIO_LINKE_CNTL ; +uint32_t DIO_LINKF_CNTL ; +#endif };#define LE_SF (reg_name, field_name, post_fix)\
@@ -459,17 +467,29 @@ struct dcn10_link_enc_registers {type DPCS_TX_DATA_SWAP_10_BIT ;\type DPCS_TX_DATA_ORDER_INVERT_18_BIT ;\ type RDPCS_TX_CLK_EN +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +#define DCN31_LINK_ENCODER_REG_FIELD_LIST (type) \ + type ENC_TYPE_SEL;\ + type HPO_DP_ENC_SEL;\ + type HPO_HDMI_ENC_SEL +#endif struct dcn10_link_enc_shift {DCN_LINK_ENCODER_REG_FIELD_LIST (uint8_t );DCN20_LINK_ENCODER_REG_FIELD_LIST (uint8_t );DCN30_LINK_ENCODER_REG_FIELD_LIST (uint8_t ); +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +DCN31_LINK_ENCODER_REG_FIELD_LIST (uint8_t ); +#endif };struct dcn10_link_enc_mask {DCN_LINK_ENCODER_REG_FIELD_LIST (uint32_t );DCN20_LINK_ENCODER_REG_FIELD_LIST (uint32_t );DCN30_LINK_ENCODER_REG_FIELD_LIST (uint32_t ); +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +DCN31_LINK_ENCODER_REG_FIELD_LIST (uint32_t ); +#endif };struct dcn10_link_encoder {
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dio_link_encoder.c new file +412 -0
412 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dio_link_encoder.h new file +246 -0
246 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h +14 -0
@@ -127,6 +127,14 @@ struct link_enc_state { }; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +enum encoder_type_select { +ENCODER_TYPE_DIG =0 , +ENCODER_TYPE_HDMI_FRL =1 , +ENCODER_TYPE_DP_128B132B =2 + }; +#endif +struct link_encoder_funcs {void (*read_state)(struct link_encoder *enc,struct link_enc_state *s);
@@ -185,6 +193,12 @@ struct link_encoder_funcs {enum signal_type (*get_dig_mode)(struct link_encoder *enc); +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +void (*set_dio_phy_mux)( +struct link_encoder *enc, +enum encoder_type_select sel, +uint32_t hpo_inst); +#endif };/*
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 74/89 drm/amd/display: Add DCN3.1 OPTC
In reply to Alex DeucherFrom: Nicholas Kazlauskas <[email protected]>
Add support for programming the DCN3.1 OPTC (Output Timing Controller)
HW Blocks:
+--------+
| MPC |
+--------+
|
v
+-------+
| OPP |
+-------+
|
v
+--------+
| OPTC |
+--------+
|
v
+--------+ +--------+
| DIO | | DCCG |
+--------+ +--------+There are no changes to OPP or MPC for DCN3.1, so the diagram will include them in this patch.
--- .../gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 11 + .../gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 2 + .../gpu/drm/amd/display/dc/dcn31/dcn31_optc.c | 287 ++++++++++++++++++ .../gpu/drm/amd/display/dc/dcn31/dcn31_optc.h | 259 ++++++++++++++++ .../amd/display/dc/inc/hw/timing_generator.h | 4 + 5 files changed, 563 insertions(+) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.h
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c +11 -0
@@ -968,6 +968,17 @@ void optc1_set_drr( } } +void optc1_set_vtotal_min_max (struct timing_generator *optc,int vtotal_min,int vtotal_max) +{ +struct optc *optc1 =DCN10TG_FROM_TG (optc); + +REG_SET (OTG_V_TOTAL_MAX ,0 , +OTG_V_TOTAL_MAX , vtotal_max); + +REG_SET (OTG_V_TOTAL_MIN ,0 , +OTG_V_TOTAL_MIN , vtotal_min); +} + static void optc1_set_test_pattern( struct timing_generator *optc,/* TODO: replace 'controller_dp_test_pattern' by 'test_pattern_mode'
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h +2 -0
@@ -666,6 +666,8 @@ void optc1_set_drr(struct timing_generator *optc, const struct drr_params *params); +void optc1_set_vtotal_min_max (struct timing_generator *optc,int vtotal_min,int vtotal_max); + void optc1_set_static_screen_control( struct timing_generator *optc, uint32_t event_triggers,
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c new file +287 -0
287 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.h new file +259 -0
259 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h +4 -0
@@ -173,6 +173,9 @@ struct timing_generator_funcs {bool (*enable_crtc)(struct timing_generator *tg);bool (*disable_crtc)(struct timing_generator *tg); +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +bool (*immediate_disable_crtc)(struct timing_generator *tg); +#endif bool (*is_counter_moving)(struct timing_generator *tg);void (*get_position)(struct timing_generator *tg,struct crtc_position *position);
@@ -223,6 +226,7 @@ struct timing_generator_funcs {void (*enable_advanced_request)(struct timing_generator *tg,bool enable,const struct dc_crtc_timing *timing);void (*set_drr)(struct timing_generator *tg,const struct drr_params *params); +void (*set_vtotal_min_max)(struct timing_generator *optc,int vtotal_min,int vtotal_max);void (*set_static_screen_control)(struct timing_generator *tg,uint32_t event_triggers,uint32_t num_frames);
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 75/89 drm/amd/display: Add DCN3.1 DCHHUB
In reply to Alex DeucherFrom: Nicholas Kazlauskas <[email protected]>
Adds DCN3.1 DCHHUB programming and modifies DCN20/DCN30 shared hardware sequencer helpers to use these hooks.
HW Blocks:
+--------++------+ +----------+
|DCHUBBUB|| HUBP | <-- | MMHUBBUB |
+--------++------+ +----------+
| ^
v |
+--------+ +--------+
| DPP | <---------> | DWB |
+--------+ +--------+
| ^
v |
+--------+ |
| MPC | |
+--------+ |
| |
v |
+-------+ |
| OPP | |
+-------+ |
| |
v |
+--------+ /
| OPTC | --------------
+--------+
|
v
+--------+ +--------+
| DIO | | DCCG |
+--------+ +--------+No changes to MMHUBBUB or DWB programming, added to diagram for clarity.
--- .../drm/amd/display/dc/dcn10/dcn10_hubbub.h | 48 + .../drm/amd/display/dc/dcn20/dcn20_hubbub.h | 9 + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 16 + .../drm/amd/display/dc/dcn20/dcn20_hwseq.c | 37 + .../drm/amd/display/dc/dcn30/dcn30_hwseq.c | 5 + .../drm/amd/display/dc/dcn31/dcn31_hubbub.c | 956 ++++++++++++++++++ .../drm/amd/display/dc/dcn31/dcn31_hubbub.h | 122 +++ .../gpu/drm/amd/display/dc/dcn31/dcn31_hubp.c | 103 ++ .../gpu/drm/amd/display/dc/dcn31/dcn31_hubp.h | 246 +++++ .../gpu/drm/amd/display/dc/inc/core_types.h | 10 + .../gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 5 + .../gpu/drm/amd/display/dc/inc/hw/mem_input.h | 4 + 12 files changed, 1561 insertions(+) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.h
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h +48 -0
@@ -139,6 +139,23 @@ struct dcn_hubbub_registers {uint32_t DCHVM_CLK_CTRL ;uint32_t DCHVM_RIOMMU_CTRL0 ;uint32_t DCHVM_RIOMMU_STAT0 ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +uint32_t DCHUBBUB_DET0_CTRL ; +uint32_t DCHUBBUB_DET1_CTRL ; +uint32_t DCHUBBUB_DET2_CTRL ; +uint32_t DCHUBBUB_DET3_CTRL ; +uint32_t DCHUBBUB_COMPBUF_CTRL ; +uint32_t COMPBUF_RESERVED_SPACE ; +uint32_t DCHUBBUB_DEBUG_CTRL_0 ; +uint32_t DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_Z8_A ; +uint32_t DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_Z8_A ; +uint32_t DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_Z8_B ; +uint32_t DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_Z8_B ; +uint32_t DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_Z8_C ; +uint32_t DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_Z8_C ; +uint32_t DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_Z8_D ; +uint32_t DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_Z8_D ; +#endif };/* set field name */
@@ -275,17 +292,48 @@ struct dcn_hubbub_registers {type HOSTVM_POWERSTATUS ; \type RIOMMU_ACTIVE ; \ type HOSTVM_PREFETCH_DONE +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +#define HUBBUB_RET_REG_FIELD_LIST (type) \ + type DET_DEPTH;\ + type DET0_SIZE;\ + type DET1_SIZE;\ + type DET2_SIZE;\ + type DET3_SIZE;\ + type DET0_SIZE_CURRENT;\ + type DET1_SIZE_CURRENT;\ + type DET2_SIZE_CURRENT;\ + type DET3_SIZE_CURRENT;\ + type COMPBUF_SIZE;\ + type COMPBUF_SIZE_CURRENT;\ + type COMPBUF_RESERVED_SPACE_64B;\ + type COMPBUF_RESERVED_SPACE_ZS;\ + type DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_Z8_A;\ + type DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_Z8_A;\ + type DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_Z8_B;\ + type DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_Z8_B;\ + type DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_Z8_C;\ + type DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_Z8_C;\ + type DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_Z8_D;\ + type DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_Z8_D +#endif +struct dcn_hubbub_shift {DCN_HUBBUB_REG_FIELD_LIST (uint8_t );HUBBUB_STUTTER_REG_FIELD_LIST (uint8_t );HUBBUB_HVM_REG_FIELD_LIST (uint8_t ); +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +HUBBUB_RET_REG_FIELD_LIST (uint8_t ); +#endif };struct dcn_hubbub_mask {DCN_HUBBUB_REG_FIELD_LIST (uint32_t );HUBBUB_STUTTER_REG_FIELD_LIST (uint32_t );HUBBUB_HVM_REG_FIELD_LIST (uint32_t ); +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +HUBBUB_RET_REG_FIELD_LIST (uint32_t ); +#endif };struct dc ;
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.h +9 -0
@@ -83,6 +83,15 @@ struct dcn20_hubbub {int num_vmid;struct dcn20_vmid vmid[16 ];unsigned int detile_buf_size; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +unsigned int crb_size_segs; +unsigned int compbuf_size_segments; +unsigned int pixel_chunk_size; +unsigned int det0_size; +unsigned int det1_size; +unsigned int det2_size; +unsigned int det3_size; +#endif }; void hubbub2_construct(struct dcn20_hubbub *hubbub,
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h +16 -0
@@ -216,16 +216,32 @@type ROW_TTU_MODE ; \ type NUM_PKRS +#ifdef CONFIG_DRM_AMD_DC_DCN3_1 +#define DCN31_HUBP_REG_FIELD_VARIABLE_LIST (type) \ + DCN30_HUBP_REG_FIELD_VARIABLE_LIST(type);\ + type HUBP_UNBOUNDED_REQ_MODE;\ + type CURSOR_REQ_MODE;\ + type HUBP_SOFT_RESET +#endif +struct dcn_hubp2_registers {DCN30_HUBP_REG_COMMON_VARIABLE_LIST ; };struct dcn_hubp2_shift { +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +DCN31_HUBP_REG_FIELD_VARIABLE_LIST (uint8_t ); +#else DCN30_HUBP_REG_FIELD_VARIABLE_LIST (uint8_t ); +#endif };struct dcn_hubp2_mask { +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +DCN31_HUBP_REG_FIELD_VARIABLE_LIST (uint32_t ); +#else DCN30_HUBP_REG_FIELD_VARIABLE_LIST (uint32_t ); +#endif };struct dcn20_hubp {
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +37 -0
@@ -1269,6 +1269,9 @@ static void dcn20_detect_pipe_changes(struct pipe_ctx *old_pipe, struct pipe_ctx new_pipe->update_flags.bits.gamut_remap =1 ; new_pipe->update_flags.bits.scaler =1 ; new_pipe->update_flags.bits.viewport =1 ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) + new_pipe->update_flags.bits.det_size =1 ; +#endif if (!new_pipe->top_pipe && !new_pipe->prev_odm_pipe) { new_pipe->update_flags.bits.odm =1 ; new_pipe->update_flags.bits.global_sync =1 ;
@@ -1303,6 +1306,10 @@ static void dcn20_detect_pipe_changes(struct pipe_ctx *old_pipe, struct pipe_ctx new_pipe->update_flags.bits.global_sync =1 ; } +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +if (old_pipe->det_buffer_size_kb != new_pipe->det_buffer_size_kb) + new_pipe->update_flags.bits.det_size =1 ; +#endif /* * Detect opp / tg change, only set on change, not on enable * Assume mpcc inst = pipe index, if not this code needs to be updated
@@ -1418,6 +1425,10 @@ static void dcn20_update_dchubp_dpp( &pipe_ctx->ttu_regs, &pipe_ctx->rq_regs, &pipe_ctx->pipe_dlg_param); +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +if (hubp->funcs->set_unbounded_requesting) + hubp->funcs->set_unbounded_requesting (hubp, pipe_ctx->unbounded_req); +#endif }if (pipe_ctx->update_flags.bits.hubp_interdependent) hubp->funcs->hubp_setup_interdependent(
@@ -1597,6 +1608,12 @@ static void dcn20_program_pipe( dc->res_pool->hubbub->funcs->force_wm_propagate_to_pipes (dc->res_pool->hubbub); } +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +if (dc->res_pool->hubbub->funcs->program_det_size && pipe_ctx->update_flags.bits.det_size) + dc->res_pool->hubbub->funcs->program_det_size ( + dc->res_pool->hubbub, pipe_ctx->plane_res.hubp->inst, pipe_ctx->det_buffer_size_kb); +#endif +if (pipe_ctx->update_flags.raw || pipe_ctx->plane_state->update_flags.raw || pipe_ctx->stream->update_flags.raw)dcn20_update_dchubp_dpp (dc, pipe_ctx, context);
@@ -1687,6 +1704,12 @@ void dcn20_program_front_end_for_ctx(for (i =0 ; i < dc->res_pool->pipe_count; i++)if (context->res_ctx.pipe_ctx[i].update_flags.bits.disable || context->res_ctx.pipe_ctx[i].update_flags.bits.opp_changed) { +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +struct hubbub *hubbub = dc->res_pool->hubbub; + +if (hubbub->funcs->program_det_size && context->res_ctx.pipe_ctx[i].update_flags.bits.disable) + hubbub->funcs->program_det_size (hubbub, dc->current_state->res_ctx.pipe_ctx[i].plane_res.hubp->inst,0 ); +#endif hws->funcs.plane_atomic_disconnect (dc, &dc->current_state->res_ctx.pipe_ctx[i]);DC_LOG_DC ("Reset mpcc for pipe %d\n" , dc->current_state->res_ctx.pipe_ctx[i].pipe_idx); }
@@ -1804,6 +1827,11 @@ void dcn20_prepare_bandwidth( &context->bw_ctx.bw.dcn.watermarks, dc->res_pool->ref_clocks.dchub_ref_clock_inKhz /1000 , false); +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +/* decrease compbuf size */ +if (hubbub->funcs->program_compbuf_size) + hubbub->funcs->program_compbuf_size (hubbub, context->bw_ctx.bw.dcn.compbuf_size_kb, false); +#endif } void dcn20_optimize_bandwidth(
@@ -1822,6 +1850,11 @@ void dcn20_optimize_bandwidth( dc->clk_mgr, context, true); +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +/* increase compbuf size */ +if (hubbub->funcs->program_compbuf_size) + hubbub->funcs->program_compbuf_size (hubbub, context->bw_ctx.bw.dcn.compbuf_size_kb, true); +#endif } bool dcn20_update_bandwidth(
@@ -2539,6 +2572,10 @@ void dcn20_fpga_init_hw(struct dc *dc) tg->funcs->tg_init (tg); } +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +if (dc->res_pool->hubbub->funcs->init_crb) + dc->res_pool->hubbub->funcs->init_crb (dc->res_pool->hubbub); +#endif }#ifndef TRIM_FSFT bool dcn20_optimize_timing_for_fsft(struct dc *dc,
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c +5 -0
@@ -651,6 +651,11 @@ void dcn30_init_hw(struct dc *dc)if (dc->res_pool->hubbub->funcs->force_pstate_change_control) dc->res_pool->hubbub->funcs->force_pstate_change_control ( dc->res_pool->hubbub, false, false); +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +if (dc->res_pool->hubbub->funcs->init_crb) + dc->res_pool->hubbub->funcs->init_crb (dc->res_pool->hubbub); +#endif + }void dcn30_set_avmute (struct pipe_ctx *pipe_ctx,bool enable)
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c new file +956 -0
956 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.h new file +122 -0
122 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.c new file +103 -0
103 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.h new file +246 -0
246 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/inc/core_types.h +10 -0
@@ -338,6 +338,9 @@ union pipe_update_flags { uint32_t scaler : 1; uint32_t viewport : 1; uint32_t plane_changed : 1; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) + uint32_t det_size : 1; +#endif } bits;uint32_t raw; };
@@ -365,6 +368,10 @@ struct pipe_ctx {struct _vcs_dpi_display_ttu_regs_st ttu_regs;struct _vcs_dpi_display_rq_regs_st rq_regs;struct _vcs_dpi_display_pipe_dest_params_st pipe_dlg_param; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +int det_buffer_size_kb; +bool unbounded_req; +#endif #endif union pipe_update_flags update_flags;struct dwbc *dwbc;
@@ -415,6 +422,9 @@ struct dcn_bw_output {struct dc_clocks clk;struct dcn_watermark_set watermarks;struct dcn_bw_writeback bw_writeback; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +int compbuf_size_kb; +#endif };union bw_output {
drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h +5 -0
@@ -152,6 +152,11 @@ struct hubbub_funcs {void (*force_pstate_change_control)(struct hubbub *hubbub,bool force,bool allow);void (*init_watermarks)(struct hubbub *hubbub); +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +void (*program_det_size)(struct hubbub *hubbub,int hubp_inst,unsigned det_buffer_size_in_kbyte); +void (*program_compbuf_size)(struct hubbub *hubbub,unsigned compbuf_size_kb,bool safe_to_increase); +void (*init_crb)(struct hubbub *hubbub); +#endif };struct hubbub {
drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h +4 -0
@@ -33,6 +33,10 @@struct dchub_init_data ;struct cstate_pstate_watermarks_st {uint32_t cstate_exit_ns; +#ifdef CONFIG_DRM_AMD_DC_DCN3_1 +uint32_t cstate_exit_z8_ns; +uint32_t cstate_enter_plus_exit_z8_ns; +#endif uint32_t cstate_enter_plus_exit_ns;uint32_t pstate_change_ns; };
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 76/89 drm/amd/display: Add DCN3.1 DML calculation support
In reply to Alex DeucherFrom: Nicholas Kazlauskas <[email protected]>
DML (Display mode library) is used for calculating watermarks, bandwidth and for validating display configurations.
--- .../drm/amd/display/dc/dcn20/dcn20_resource.c | 39 + drivers/gpu/drm/amd/display/dc/dml/Makefile | 11 + .../dc/dml/dcn31/display_mode_vba_31.c | 7506 +++++++++++++++++ .../dc/dml/dcn31/display_mode_vba_31.h | 43 + .../dc/dml/dcn31/display_rq_dlg_calc_31.c | 1727 ++++ .../dc/dml/dcn31/display_rq_dlg_calc_31.h | 69 + .../drm/amd/display/dc/dml/display_mode_lib.c | 18 + .../drm/amd/display/dc/dml/display_mode_lib.h | 4 + .../amd/display/dc/dml/display_mode_structs.h | 12 + .../drm/amd/display/dc/dml/display_mode_vba.c | 42 + .../drm/amd/display/dc/dml/display_mode_vba.h | 52 + 11 files changed, 9523 insertions(+) create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.h create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.c create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.h
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +39 -0
@@ -3070,6 +3070,18 @@ static void dcn20_calculate_wm( context->bw_ctx.bw.dcn.watermarks.a.frac_urg_bw_flip =get_fraction_of_urgent_bandwidth_imm_flip (&context->bw_ctx.dml, pipes, pipe_cnt) *1000 ; } +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +static bool is_dtbclk_required (struct dc *dc,struct dc_state *context) +{ +int i; +for (i =0 ; i < dc->res_pool->pipe_count; i++) { +if (!context->res_ctx.pipe_ctx[i].stream) +continue ; + } +return false; +} +#endif + void dcn20_calculate_dlg_params( struct dc *dc, struct dc_state *context, display_e2e_pipe_params_st *pipes,
@@ -3077,6 +3089,9 @@ void dcn20_calculate_dlg_params( int vlevel) {int i, pipe_idx; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +int plane_count; +#endif /* Writeback MCIF_WB arbitration parameters */ dc->res_pool->funcs->set_mcif_arb_params (dc, context, pipes, pipe_cnt);
@@ -3091,6 +3106,21 @@ void dcn20_calculate_dlg_params( context->bw_ctx.dml.vba.DRAMClockChangeSupport[vlevel][context->bw_ctx.dml.vba.maxMpcComb] != dm_dram_clock_change_unsupported; context->bw_ctx.bw.dcn.clk.dppclk_khz =0 ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) + context->bw_ctx.bw.dcn.clk.z9_support = (context->bw_ctx.dml.vba.StutterPeriod >5000.0 ) ? +DCN_Z9_SUPPORT_ALLOW :DCN_Z9_SUPPORT_DISALLOW ; + + plane_count =0 ; +for (i =0 ; i < dc->res_pool->pipe_count; i++) { +if (context->res_ctx.pipe_ctx[i].plane_state) + plane_count++; + } + +if (plane_count ==0 ) + context->bw_ctx.bw.dcn.clk.z9_support =DCN_Z9_SUPPORT_ALLOW ; + + context->bw_ctx.bw.dcn.clk.dtbclk_en =is_dtbclk_required (dc, context); +#endif if (context->bw_ctx.bw.dcn.clk.dispclk_khz < dc->debug.min_disp_clk_khz) context->bw_ctx.bw.dcn.clk.dispclk_khz = dc->debug.min_disp_clk_khz;
@@ -3102,6 +3132,10 @@ void dcn20_calculate_dlg_params( pipes[pipe_idx].pipe.dest.vupdate_offset =get_vupdate_offset (&context->bw_ctx.dml, pipes, pipe_cnt, pipe_idx); pipes[pipe_idx].pipe.dest.vupdate_width =get_vupdate_width (&context->bw_ctx.dml, pipes, pipe_cnt, pipe_idx); pipes[pipe_idx].pipe.dest.vready_offset =get_vready_offset (&context->bw_ctx.dml, pipes, pipe_cnt, pipe_idx); +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) + context->res_ctx.pipe_ctx[i].det_buffer_size_kb = context->bw_ctx.dml.ip.det_buffer_size_kbytes; + context->res_ctx.pipe_ctx[i].unbounded_req = pipes[pipe_idx].pipe.src.unbounded_req_mode; +#endif if (context->bw_ctx.bw.dcn.clk.dppclk_khz < pipes[pipe_idx].clks_cfg.dppclk_mhz *1000 ) context->bw_ctx.bw.dcn.clk.dppclk_khz = pipes[pipe_idx].clks_cfg.dppclk_mhz *1000 ; context->res_ctx.pipe_ctx[i].plane_res.bw.dppclk_khz =
@@ -3115,6 +3149,11 @@ void dcn20_calculate_dlg_params( context->bw_ctx.bw.dcn.clk.max_supported_dppclk_khz = context->bw_ctx.dml.soc.clock_limits[vlevel].dppclk_mhz *1000 ; context->bw_ctx.bw.dcn.clk.max_supported_dispclk_khz = context->bw_ctx.dml.soc.clock_limits[vlevel].dispclk_mhz *1000 ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) + context->bw_ctx.bw.dcn.compbuf_size_kb = context->bw_ctx.dml.ip.config_return_buffer_size_in_kbytes + - context->bw_ctx.dml.ip.det_buffer_size_kbytes * pipe_idx; +#endif +for (i =0 , pipe_idx =0 ; i < dc->res_pool->pipe_count; i++) {bool cstate_en = context->bw_ctx.dml.vba.PrefetchMode[vlevel][context->bw_ctx.dml.vba.maxMpcComb] !=2 ;
drivers/gpu/drm/amd/display/dc/dml/Makefile +11 -0
@@ -62,6 +62,10 @@ CFLAGS_$(AMDDALPATH)/dc/dml/dcn21/display_mode_vba_21.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn21/display_rq_dlg_calc_21.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn30/display_mode_vba_30.o := $(dml_ccflags) -Wframe-larger-than=2048 CFLAGS_$(AMDDALPATH)/dc/dml/dcn30/display_rq_dlg_calc_30.o := $(dml_ccflags) +ifdef CONFIG_DRM_AMD_DC_DCN3_1 +CFLAGS_$(AMDDALPATH)/dc/dml/dcn31/display_mode_vba_31.o := $(dml_ccflags) -Wframe-larger-than=2048 +CFLAGS_$(AMDDALPATH)/dc/dml/dcn31/display_rq_dlg_calc_31.o := $(dml_ccflags) +endif CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_lib.o := $(dml_ccflags) CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_mode_vba.o := $(dml_rcflags) CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20.o := $(dml_rcflags)
@@ -72,6 +76,10 @@ CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn21/display_mode_vba_21.o := $(dml_rcflags) CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn21/display_rq_dlg_calc_21.o := $(dml_rcflags) CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn30/display_mode_vba_30.o := $(dml_rcflags) CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn30/display_rq_dlg_calc_30.o := $(dml_rcflags) +ifdef CONFIG_DRM_AMD_DC_DCN3_1 +CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn31/display_mode_vba_31.o := $(dml_rcflags) +CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn31/display_rq_dlg_calc_31.o := $(dml_rcflags) +endif CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_mode_lib.o := $(dml_rcflags) endif CFLAGS_$(AMDDALPATH)/dc/dml/dml1_display_rq_dlg_calc.o := $(dml_ccflags)
@@ -86,6 +94,9 @@ DML += display_mode_vba.o dcn20/display_rq_dlg_calc_20.o dcn20/display_mode_vba_ DML += dcn20/display_rq_dlg_calc_20v2.o dcn20/display_mode_vba_20v2.o DML += dcn21/display_rq_dlg_calc_21.o dcn21/display_mode_vba_21.o DML += dcn30/display_mode_vba_30.o dcn30/display_rq_dlg_calc_30.o +ifdef CONFIG_DRM_AMD_DC_DCN3_1 +DML += dcn31/display_mode_vba_31.o dcn31/display_rq_dlg_calc_31.o +endif endif AMD_DAL_DML = $(addprefix $(AMDDALPATH)/dc/dml/,$(DML))
drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c new file +7506 -0
2,902 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.h new file +43 -0
43 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.c new file +1727 -0
1,727 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.h new file +69 -0
69 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.c +18 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.h +4 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/dml/display_mode_structs.h +12 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c +42 -0
42 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h +52 -0
52 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Part of the diff is not shown here. View the raw message.
Alex Deucher
maintainerPATCH 77/89 drm/amd/display: Add DCN3.1 IRQ manager
In reply to Alex DeucherFrom: Nicholas Kazlauskas <[email protected]>
Add IRQ services for DCN3.1 to handle hardware generated interrupts.
--- drivers/gpu/drm/amd/display/dc/irq/Makefile | 11 + .../display/dc/irq/dcn31/irq_service_dcn31.c | 432 ++++++++++++++++++ .../display/dc/irq/dcn31/irq_service_dcn31.h | 37 ++ 3 files changed, 480 insertions(+) create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn31/irq_service_dcn31.c create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn31/irq_service_dcn31.h
drivers/gpu/drm/amd/display/dc/irq/Makefile +11 -0
@@ -118,3 +118,14 @@ AMD_DAL_IRQ_DCN3_03 = $(addprefix $(AMDDALPATH)/dc/irq/dcn303/,$(IRQ_DCN3_03)) AMD_DISPLAY_FILES += $(AMD_DAL_IRQ_DCN3_03) endif + +ifdef CONFIG_DRM_AMD_DC_DCN3_1 +############################################################################### +# DCN 31 +############################################################################### +IRQ_DCN31 = irq_service_dcn31.o + +AMD_DAL_IRQ_DCN31= $(addprefix $(AMDDALPATH)/dc/irq/dcn31/,$(IRQ_DCN31)) + +AMD_DISPLAY_FILES += $(AMD_DAL_IRQ_DCN31) +endif
drivers/gpu/drm/amd/display/dc/irq/dcn31/irq_service_dcn31.c new file +432 -0
432 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/irq/dcn31/irq_service_dcn31.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. +* +* Authors: AMD +* +*/ + +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) + +#ifndef __DAL_IRQ_SERVICE_DCN31_H__ +#define __DAL_IRQ_SERVICE_DCN31_H__ + +#include "../irq_service.h" + +struct irq_service *dal_irq_service_dcn31_create ( +struct irq_service_init_data *init_data); + +#endif /* __DAL_IRQ_SERVICE_DCN31_H__ */ +#endif /* CONFIG_DRM_AMD_DC_DCN3_1 */
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 78/89 drm/amd/display: Add DCN3.1 GPIO support
In reply to Alex DeucherFrom: Nicholas Kazlauskas <[email protected]>
Extends off of DCN3.
--- drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 3 +++ drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 3 +++ 2 files changed, 6 insertions(+)
drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c +3 -0
@@ -112,6 +112,9 @@ bool dal_hw_factory_init(case DCN_VERSION_3_01 :case DCN_VERSION_3_02 :case DCN_VERSION_3_03 : +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +case DCN_VERSION_3_1 : +#endif dal_hw_factory_dcn30_init (factory);return true;#endif
drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c +3 -0
@@ -107,6 +107,9 @@ bool dal_hw_translate_init(case DCN_VERSION_3_01 :case DCN_VERSION_3_02 :case DCN_VERSION_3_03 : +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +case DCN_VERSION_3_1 : +#endif dal_hw_translate_dcn30_init (translate);return true;#endif
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 79/89 drm/amd/display: Add DCN3.1 DMCUB
In reply to Alex DeucherFrom: Nicholas Kazlauskas <[email protected]>
DMCU-B (Display Micro-Controller Unit B) is a display microcontroller used for shared display functionality with BIOS and for advanced power saving display features.
Extends the command header to include new DCN3.1 functionality.
Adds new interfaces to DC dmub interface as well for z-state support.
--- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 23 ++ drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 3 + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 12 + .../gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 118 ++++++ drivers/gpu/drm/amd/display/dmub/src/Makefile | 3 + .../gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 354 ++++++++++++++++++ .../gpu/drm/amd/display/dmub/src/dmub_dcn31.h | 230 ++++++++++++ .../gpu/drm/amd/display/dmub/src/dmub_srv.c | 37 ++ 8 files changed, 780 insertions(+) create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.h
drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c +23 -0
@@ -180,6 +180,29 @@ bool dc_dmub_srv_notify_stream_mask(struct dc_dmub_srv *dc_dmub_srv, dmub,DMUB_GPINT__IDLE_OPT_NOTIFY_STREAM_MASK , stream_mask, timeout) == DMUB_STATUS_OK; } +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +bool dc_dmub_srv_is_restore_required (struct dc_dmub_srv *dc_dmub_srv) +{ +struct dmub_srv *dmub; +struct dc_context *dc_ctx; +union dmub_fw_boot_status boot_status; +enum dmub_status status; + +if (!dc_dmub_srv || !dc_dmub_srv->dmub) +return false; + + dmub = dc_dmub_srv->dmub; + dc_ctx = dc_dmub_srv->ctx; + + status =dmub_srv_get_fw_boot_status (dmub, &boot_status); +if (status !=DMUB_STATUS_OK ) { +DC_ERROR ("Error querying DMUB boot status: error=%d\n" , status); +return false; + } + +return boot_status.bits.restore_required; +} +#endif bool dc_dmub_srv_get_dmub_outbox0_msg (const struct dc *dc,struct dmcub_trace_buf_entry *entry) {
drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h +3 -0
@@ -62,6 +62,9 @@ bool dc_dmub_srv_cmd_with_reply_data(struct dc_dmub_srv *dc_dmub_srv, union dmubbool dc_dmub_srv_notify_stream_mask (struct dc_dmub_srv *dc_dmub_srv,unsigned int stream_mask); +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +bool dc_dmub_srv_is_restore_required (struct dc_dmub_srv *dc_dmub_srv); +#endif bool dc_dmub_srv_get_dmub_outbox0_msg (const struct dc *dc,struct dmcub_trace_buf_entry *entry);void dc_dmub_trace_event_control (struct dc *dc,bool enable);
drivers/gpu/drm/amd/display/dmub/dmub_srv.h +12 -0
@@ -73,6 +73,9 @@ extern "C" {/* Forward declarations */ struct dmub_srv ;struct dmub_srv_common_regs ; +#ifdef CONFIG_DRM_AMD_DC_DCN3_1 +struct dmub_srv_dcn31_regs ; +#endif struct dmcub_trace_buf_entry ;
@@ -94,6 +97,9 @@ enum dmub_asic {DMUB_ASIC_DCN301 ,DMUB_ASIC_DCN302 ,DMUB_ASIC_DCN303 , +#ifdef CONFIG_DRM_AMD_DC_DCN3_1 +DMUB_ASIC_DCN31 , +#endif DMUB_ASIC_MAX, };
@@ -232,6 +238,9 @@ struct dmub_srv_hw_params {uint32_t psp_version;bool load_inst_const;bool skip_panel_power_sequence; +#ifdef CONFIG_DRM_AMD_DC_DCN3_1 +bool disable_z10; +#endif };/**
@@ -364,6 +373,9 @@ struct dmub_srv {/* private: internal use only */ const struct dmub_srv_common_regs *regs; +#ifdef CONFIG_DRM_AMD_DC_DCN3_1 +const struct dmub_srv_dcn31_regs *regs_dcn31; +#endif struct dmub_srv_base_funcs funcs;struct dmub_srv_hw_funcs hw_funcs;
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h +118 -0
149 lines not on this page · raw message
drivers/gpu/drm/amd/display/dmub/src/Makefile +3 -0
@@ -24,6 +24,9 @@ DMUB = dmub_srv.o dmub_srv_stat.o dmub_reg.o dmub_dcn20.o dmub_dcn21.o DMUB += dmub_dcn30.o dmub_dcn301.o DMUB += dmub_dcn302.o DMUB += dmub_dcn303.o +ifdef CONFIG_DRM_AMD_DC_DCN3_1 +DMUB += dmub_dcn31.o +endif AMD_DAL_DMUB = $(addprefix $(AMDDALPATH)/dmub/src/,$(DMUB))
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c new file +354 -0
354 lines not on this page · raw message
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.h new file +230 -0
230 lines not on this page · raw message
drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c +37 -0
@@ -31,6 +31,9 @@#include "dmub_dcn301.h" #include "dmub_dcn302.h" #include "dmub_dcn303.h" +#ifdef CONFIG_DRM_AMD_DC_DCN3_1 +#include "dmub_dcn31.h" +#endif #include "os_types.h" /* * Note: the DMUB service is standalone. No additional headers should be
@@ -203,6 +206,40 @@ static bool dmub_srv_hw_setup(struct dmub_srv *dmub, enum dmub_asic asic) funcs->setup_windows = dmub_dcn30_setup_windows; }break ; +#ifdef CONFIG_DRM_AMD_DC_DCN3_1 + +case DMUB_ASIC_DCN31 : + funcs->reset = dmub_dcn31_reset; + funcs->reset_release = dmub_dcn31_reset_release; + funcs->backdoor_load = dmub_dcn31_backdoor_load; + funcs->setup_windows = dmub_dcn31_setup_windows; + funcs->setup_mailbox = dmub_dcn31_setup_mailbox; + funcs->get_inbox1_rptr = dmub_dcn31_get_inbox1_rptr; + funcs->set_inbox1_wptr = dmub_dcn31_set_inbox1_wptr; + funcs->setup_out_mailbox = dmub_dcn31_setup_out_mailbox; + funcs->get_outbox1_wptr = dmub_dcn31_get_outbox1_wptr; + funcs->set_outbox1_rptr = dmub_dcn31_set_outbox1_rptr; + funcs->is_supported = dmub_dcn31_is_supported; + funcs->is_hw_init = dmub_dcn31_is_hw_init; + funcs->set_gpint = dmub_dcn31_set_gpint; + funcs->is_gpint_acked = dmub_dcn31_is_gpint_acked; + funcs->get_gpint_response = dmub_dcn31_get_gpint_response; + funcs->get_fw_status = dmub_dcn31_get_fw_boot_status; + funcs->enable_dmub_boot_options = dmub_dcn31_enable_dmub_boot_options; + funcs->skip_dmub_panel_power_sequence = dmub_dcn31_skip_dmub_panel_power_sequence; +//outbox0 call stacks + funcs->setup_outbox0 = dmub_dcn31_setup_outbox0; + funcs->get_outbox0_wptr = dmub_dcn31_get_outbox0_wptr; + funcs->set_outbox0_rptr = dmub_dcn31_set_outbox0_rptr; + +if (asic ==DMUB_ASIC_DCN31 ) { + dmub->regs_dcn31 = &dmub_srv_dcn31_regs; + } + + funcs->get_current_time = dmub_dcn31_get_current_time; + +break ; +#endif default :return false;
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 80/89 drm/amd/display: Add DCN3.1 PANEL
In reply to Alex DeucherFrom: Nicholas Kazlauskas <[email protected]>
The PANEL block handles embedded panel power and backlight programming.
This programming and sequencing is now owned by DMCUB and driver will call into the interface for backlight status and programming.
--- .../amd/display/dc/dcn31/dcn31_panel_cntl.c | 157 ++++++++++++++++++ .../amd/display/dc/dcn31/dcn31_panel_cntl.h | 40 +++++ 2 files changed, 197 insertions(+) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_panel_cntl.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_panel_cntl.h
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_panel_cntl.c new file +157 -0
@@ -0,0 +1,157 @@ +/* +* Copyright 2021 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. +* +* Authors: AMD +* +*/ + +#include "reg_helper.h" +#include "core_types.h" +#include "dc_dmub_srv.h" +#include "dcn31_panel_cntl.h" +#include "atom.h" + +#define TO_DCN31_PANEL_CNTL (panel_cntl)\ + container_of(panel_cntl, struct dcn31_panel_cntl, base) + +#define CTX \ + dcn31_panel_cntl->base.ctx + +#define DC_LOGGER \ + dcn31_panel_cntl->base.ctx->logger + +static bool dcn31_query_backlight_info (struct panel_cntl *panel_cntl,union dmub_rb_cmd *cmd) +{ +struct dcn31_panel_cntl *dcn31_panel_cntl =TO_DCN31_PANEL_CNTL (panel_cntl); +struct dc_dmub_srv *dc_dmub_srv = panel_cntl->ctx->dmub_srv; + +if (!dc_dmub_srv) +return false; + +memset (cmd,0 ,sizeof (*cmd)); + cmd->panel_cntl.header.type =DMUB_CMD__PANEL_CNTL ; + cmd->panel_cntl.header.sub_type =DMUB_CMD__PANEL_CNTL_QUERY_BACKLIGHT_INFO ; + cmd->panel_cntl.header.payload_bytes =sizeof (cmd->panel_cntl.data); + cmd->panel_cntl.data.inst = dcn31_panel_cntl->base.inst; + +return dc_dmub_srv_cmd_with_reply_data (dc_dmub_srv, cmd); +} + +static uint32_t dcn31_get_16_bit_backlight_from_pwm (struct panel_cntl *panel_cntl) +{ +union dmub_rb_cmd cmd; + +if (!dcn31_query_backlight_info (panel_cntl, &cmd)) +return 0 ; + +return cmd.panel_cntl.data.current_backlight; +} + +uint32_t dcn31_panel_cntl_hw_init (struct panel_cntl *panel_cntl) +{ +struct dcn31_panel_cntl *dcn31_panel_cntl =TO_DCN31_PANEL_CNTL (panel_cntl); +struct dc_dmub_srv *dc_dmub_srv = panel_cntl->ctx->dmub_srv; +union dmub_rb_cmd cmd; + +if (!dc_dmub_srv) +return 0 ; + +memset (&cmd,0 ,sizeof (cmd)); + cmd.panel_cntl.header.type =DMUB_CMD__PANEL_CNTL ; + cmd.panel_cntl.header.sub_type =DMUB_CMD__PANEL_CNTL_HW_INIT ; + cmd.panel_cntl.header.payload_bytes =sizeof (cmd.panel_cntl.data); + cmd.panel_cntl.data.inst = dcn31_panel_cntl->base.inst; + cmd.panel_cntl.data.bl_pwm_cntl = panel_cntl->stored_backlight_registers.BL_PWM_CNTL; + cmd.panel_cntl.data.bl_pwm_period_cntl = panel_cntl->stored_backlight_registers.BL_PWM_PERIOD_CNTL; + cmd.panel_cntl.data.bl_pwm_ref_div1 = + panel_cntl->stored_backlight_registers.LVTMA_PWRSEQ_REF_DIV_BL_PWM_REF_DIV; + +if (!dc_dmub_srv_cmd_with_reply_data (dc_dmub_srv, &cmd)) +return 0 ; + + panel_cntl->stored_backlight_registers.BL_PWM_CNTL = cmd.panel_cntl.data.bl_pwm_cntl; + panel_cntl->stored_backlight_registers.BL_PWM_CNTL2 =0 ;/* unused */ + panel_cntl->stored_backlight_registers.BL_PWM_PERIOD_CNTL = cmd.panel_cntl.data.bl_pwm_period_cntl; + panel_cntl->stored_backlight_registers.LVTMA_PWRSEQ_REF_DIV_BL_PWM_REF_DIV = + cmd.panel_cntl.data.bl_pwm_ref_div1; + +return cmd.panel_cntl.data.current_backlight; +} + +void dcn31_panel_cntl_destroy (struct panel_cntl **panel_cntl) +{ +struct dcn31_panel_cntl *dcn31_panel_cntl =TO_DCN31_PANEL_CNTL (*panel_cntl); + +kfree (dcn31_panel_cntl); + *panel_cntl =NULL ; +} + +bool dcn31_is_panel_backlight_on (struct panel_cntl *panel_cntl) +{ +union dmub_rb_cmd cmd; + +if (!dcn31_query_backlight_info (panel_cntl, &cmd)) +return 0 ; + +return cmd.panel_cntl.data.is_backlight_on; +} + +bool dcn31_is_panel_powered_on (struct panel_cntl *panel_cntl) +{ +union dmub_rb_cmd cmd; + +if (!dcn31_query_backlight_info (panel_cntl, &cmd)) +return 0 ; + +return cmd.panel_cntl.data.is_powered_on; +} + +void dcn31_store_backlight_level (struct panel_cntl *panel_cntl) +{ +union dmub_rb_cmd cmd; + +if (!dcn31_query_backlight_info (panel_cntl, &cmd)) +return ; + + panel_cntl->stored_backlight_registers.BL_PWM_CNTL = cmd.panel_cntl.data.bl_pwm_cntl; + panel_cntl->stored_backlight_registers.BL_PWM_CNTL2 =0 ;/* unused */ + panel_cntl->stored_backlight_registers.BL_PWM_PERIOD_CNTL = cmd.panel_cntl.data.bl_pwm_period_cntl; + panel_cntl->stored_backlight_registers.LVTMA_PWRSEQ_REF_DIV_BL_PWM_REF_DIV = + cmd.panel_cntl.data.bl_pwm_ref_div1; +} + +static const struct panel_cntl_funcs dcn31_link_panel_cntl_funcs = { + .destroy = dcn31_panel_cntl_destroy, + .hw_init = dcn31_panel_cntl_hw_init, + .is_panel_backlight_on = dcn31_is_panel_backlight_on, + .is_panel_powered_on = dcn31_is_panel_powered_on, + .store_backlight_level = dcn31_store_backlight_level, + .get_current_backlight = dcn31_get_16_bit_backlight_from_pwm, +}; + +void dcn31_panel_cntl_construct ( +struct dcn31_panel_cntl *dcn31_panel_cntl, +const struct panel_cntl_init_data *init_data) +{ + dcn31_panel_cntl->base.funcs = &dcn31_link_panel_cntl_funcs; + dcn31_panel_cntl->base.ctx = init_data->ctx; + dcn31_panel_cntl->base.inst = init_data->inst; +}
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_panel_cntl.h new file +40 -0
@@ -0,0 +1,40 @@ +/* +* Copyright 2012-15 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. +* +* Authors: AMD +* +*/ + +#ifndef __DC_PANEL_CNTL__DCN31_H__ +#define __DC_PANEL_CNTL__DCN31_H__ + +#include "panel_cntl.h" +#include "dce/dce_panel_cntl.h" + +struct dcn31_panel_cntl { +struct panel_cntl base; +}; + +void dcn31_panel_cntl_construct ( +struct dcn31_panel_cntl *dcn31_panel_cntl, +const struct panel_cntl_init_data *init_data); + +#endif /* __DC_PANEL_CNTL__DCN31_H__ */
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 81/89 drm/amd/display: Add DCN3.1 HDCP support
In reply to Alex DeucherFrom: Nicholas Kazlauskas <[email protected]>
New DTM interface is V3 and we need to extend our existing support to enable HDCP on DCN3.1.
Version the helpers and fallback to the older versions on failure in the new interfaces.
--- .../amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 13 ++ drivers/gpu/drm/amd/display/dc/dm_cp_psp.h | 5 + .../drm/amd/display/modules/hdcp/hdcp_log.c | 4 + .../drm/amd/display/modules/hdcp/hdcp_psp.c | 135 +++++++++++++++++- .../drm/amd/display/modules/hdcp/hdcp_psp.h | 38 +++++ .../drm/amd/display/modules/inc/mod_hdcp.h | 23 ++- 6 files changed, 214 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c +13 -0
@@ -454,6 +454,13 @@ static void update_config(void *handle, struct cp_psp_stream_config *config) display->dig_fe = config->dig_fe; link->dig_be = config->dig_be; link->ddc_line = aconnector->dc_link->ddc_hw_inst +1 ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) + display->stream_enc_idx = config->stream_enc_idx; + link->link_enc_idx = config->link_enc_idx; + link->phy_idx = config->phy_idx; + link->hdcp_supported_informational =dc_link_is_hdcp14 (aconnector->dc_link, + aconnector->dc_sink->sink_signal) ?1 :0 ; +#endif link->dp.rev = aconnector->dc_link->dpcd_caps.dpcd_rev.raw; link->dp.assr_enabled = config->assr_enabled; link->dp.mst_enabled = config->mst_enabled;
@@ -637,6 +644,12 @@ struct hdcp_workqueue *hdcp_create_workqueue(struct amdgpu_device *adev, structINIT_DELAYED_WORK (&hdcp_work[i].property_validate_dwork, event_property_validate); hdcp_work[i].hdcp.config.psp.handle = &adev->psp; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +if (dc->ctx->dce_version ==DCN_VERSION_3_1 ) { + hdcp_work[i].hdcp.config.psp.caps.dtm_v3_supported =1 ; + hdcp_work[i].hdcp.config.psp.caps.opm_state_query_supported = false; + } +#endif hdcp_work[i].hdcp.config.ddc.handle =dc_get_link_at_index (dc, i); hdcp_work[i].hdcp.config.ddc.funcs.write_i2c = lp_write_i2c; hdcp_work[i].hdcp.config.ddc.funcs.read_i2c = lp_read_i2c;
drivers/gpu/drm/amd/display/dc/dm_cp_psp.h +5 -0
@@ -32,6 +32,11 @@ struct cp_psp_stream_config {uint8_t otg_inst;uint8_t dig_be;uint8_t dig_fe; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +uint8_t link_enc_idx; +uint8_t stream_enc_idx; +uint8_t phy_idx; +#endif uint8_t assr_enabled;uint8_t mst_enabled;void *dm_stream_ctx;
drivers/gpu/drm/amd/display/modules/hdcp/hdcp_log.c +4 -0
@@ -172,6 +172,10 @@ char *mod_hdcp_status_to_str(int32_t status)return "MOD_HDCP_STATUS_HDCP2_REAUTH_LINK_INTEGRITY_FAILURE" ;case MOD_HDCP_STATUS_HDCP2_DEVICE_COUNT_MISMATCH_FAILURE :return "MOD_HDCP_STATUS_HDCP2_DEVICE_COUNT_MISMATCH_FAILURE" ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +case MOD_HDCP_STATUS_UNSUPPORTED_PSP_VER_FAILURE : +return "MOD_HDCP_STATUS_UNSUPPORTED_PSP_VER_FAILURE" ; +#endif default :return "MOD_HDCP_STATUS_UNKNOWN" ; }
drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c +132 -3
157 lines not on this page · raw message
drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.h +38 -0
@@ -44,7 +44,12 @@ enum bgd_security_hdcp2_content_type {enum ta_dtm_command {TA_DTM_COMMAND__UNUSED_1 =1 ,TA_DTM_COMMAND__TOPOLOGY_UPDATE_V2 , +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) + TA_DTM_COMMAND__TOPOLOGY_ASSR_ENABLE, + TA_DTM_COMMAND__TOPOLOGY_UPDATE_V3 +#else TA_DTM_COMMAND__TOPOLOGY_ASSR_ENABLE +#endif };/* DTM related enumerations */
@@ -86,6 +91,33 @@ struct ta_dtm_topology_update_input_v2 {uint32_t max_hdcp_supported_version; }; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +/* For security reason/HW may change value, these encoder type enum values are not HW register values */ +/* Security code will check real HW register values and these SW enum values */ +enum ta_dtm_encoder_type { +TA_DTM_ENCODER_TYPE__INVALID =0 , +TA_DTM_ENCODER_TYPE__DIG =0x10 +}; + +struct ta_dtm_topology_update_input_v3 { +/* display handle is unique across the driver and is used to identify a display */ +/* for all security interfaces which reference displays such as HDCP */ +/* link_hdcp_cap means link is HDCP-capable for audio HDCP capable property(informational), not for other logic(e.g. Crossbar) */ +uint32_t display_handle; +uint32_t is_active; +uint32_t is_miracast; +uint32_t controller; +uint32_t ddc_line; +uint32_t link_enc; +uint32_t stream_enc; +uint32_t dp_mst_vcid; +uint32_t is_assr; +uint32_t max_hdcp_supported_version; +enum ta_dtm_encoder_type encoder_type; +uint32_t phy_id; +uint32_t link_hdcp_cap; +}; +#endif struct ta_dtm_topology_assr_enable {uint32_t display_topology_dig_be_index; };
@@ -99,6 +131,9 @@ struct ta_dtm_topology_assr_enable {union ta_dtm_cmd_input {struct ta_dtm_topology_update_input_v2 topology_update_v2;struct ta_dtm_topology_assr_enable topology_assr_enable; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +struct ta_dtm_topology_update_input_v3 topology_update_v3; +#endif };union ta_dtm_cmd_output {
@@ -278,6 +313,9 @@ enum ta_hdcp2_version { TA_HDCP2_VERSION_UNKNOWN = 0, TA_HDCP2_VERSION_2_0 = 20, TA_HDCP2_VERSION_2_1 = 21, +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +TA_HDCP2_VERSION_2_3 =23 , +#endifTA_HDCP2_VERSION_2_2 =22 };
drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h +22 -1
@@ -1,5 +1,5 @@/* -* Copyright 2019 Advanced Micro Devices, Inc. +* Copyright 2018 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"),
@@ -97,6 +97,9 @@ enum mod_hdcp_status {MOD_HDCP_STATUS_HDCP2_REAUTH_REQUEST ,MOD_HDCP_STATUS_HDCP2_REAUTH_LINK_INTEGRITY_FAILURE ,MOD_HDCP_STATUS_HDCP2_DEVICE_COUNT_MISMATCH_FAILURE , +#if defined(CONFIG_DRM_AMD_DC_DCN3_1) + MOD_HDCP_STATUS_UNSUPPORTED_PSP_VER_FAILURE, +#endif }; struct mod_hdcp_displayport {
@@ -120,6 +123,13 @@ enum mod_hdcp_display_state {MOD_HDCP_DISPLAY_ENCRYPTION_ENABLED }; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +struct mod_hdcp_psp_caps { +uint8_t dtm_v3_supported; +uint8_t opm_state_query_supported; +}; + +#endif enum mod_hdcp_display_disable_option {MOD_HDCP_DISPLAY_NOT_DISABLE =0 ,MOD_HDCP_DISPLAY_DISABLE_AUTHENTICATION ,
@@ -152,6 +162,9 @@ struct mod_hdcp_ddc {struct mod_hdcp_psp {void *handle;void *funcs; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +struct mod_hdcp_psp_caps caps; +#endif };struct mod_hdcp_display_adjustment {
@@ -227,6 +240,9 @@ struct mod_hdcp_display {uint8_t index;uint8_t controller;uint8_t dig_fe; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +uint8_t stream_enc_idx; +#endif union {uint8_t vc_id; };
@@ -239,6 +255,11 @@ struct mod_hdcp_link {enum mod_hdcp_operation_mode mode;uint8_t dig_be;uint8_t ddc_line; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +uint8_t link_enc_idx; +uint8_t phy_idx; +uint8_t hdcp_supported_informational; +#endif union {struct mod_hdcp_displayport dp;struct mod_hdcp_hdmi hdmi;
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 82/89 drm/amd/display: Add DCN3.1 BIOS parser support
In reply to Alex DeucherFrom: Nicholas Kazlauskas <[email protected]>
Updated interfaces for multiple eDP backlight caps.
Added support for interpreting the new BIOS command tables on DCN3.1.
--- .../drm/amd/display/dc/bios/bios_parser2.c | 113 ++++++++++++++++++ .../display/dc/bios/command_table_helper2.c | 5 + 2 files changed, 118 insertions(+)
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c +113 -0
@@ -576,6 +576,13 @@ static struct device_id device_type_from_device_id(uint16_t device_id) result_device_id.device_type =DEVICE_TYPE_LCD ; result_device_id.enum_id =1 ;break ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) + +case ATOM_DISPLAY_LCD2_SUPPORT : + result_device_id.device_type =DEVICE_TYPE_LCD ; + result_device_id.enum_id =2 ; +break ; +#endif case ATOM_DISPLAY_DFP1_SUPPORT : result_device_id.device_type =DEVICE_TYPE_DFP ;
@@ -2155,6 +2162,107 @@ static enum bp_result get_integrated_info_v2_1(return BP_RESULT_OK ; } +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +static enum bp_result get_integrated_info_v2_2 ( +struct bios_parser *bp, +struct integrated_info *info) +{ +struct atom_integrated_system_info_v2_2 *info_v2_2; +uint32_t i; + + info_v2_2 = GET_IMAGE(struct atom_integrated_system_info_v2_2, +DATA_TABLES (integratedsysteminfo)); + +if (info_v2_2 ==NULL ) +return BP_RESULT_BADBIOSTABLE ; + + info->gpu_cap_info = +le32_to_cpu (info_v2_2->gpucapinfo); +/* +* system_config: Bit[0] = 0 : PCIE power gating disabled +* = 1 : PCIE power gating enabled +* Bit[1] = 0 : DDR-PLL shut down disabled +* = 1 : DDR-PLL shut down enabled +* Bit[2] = 0 : DDR-PLL power down disabled +* = 1 : DDR-PLL power down enabled +*/ + info->system_config =le32_to_cpu (info_v2_2->system_config); + info->cpu_cap_info =le32_to_cpu (info_v2_2->cpucapinfo); + info->memory_type = info_v2_2->memorytype; + info->ma_channel_number = info_v2_2->umachannelnumber; + info->dp_ss_control = +le16_to_cpu (info_v2_2->reserved1); + +for (i =0 ; i <NUMBER_OF_UCHAR_FOR_GUID ; ++i) { + info->ext_disp_conn_info.gu_id[i] = + info_v2_2->extdispconninfo.guid[i]; + } + +for (i =0 ; i <MAX_NUMBER_OF_EXT_DISPLAY_PATH ; ++i) { + info->ext_disp_conn_info.path[i].device_connector_id = +object_id_from_bios_object_id ( +le16_to_cpu (info_v2_2->extdispconninfo.path[i].connectorobjid)); + + info->ext_disp_conn_info.path[i].ext_encoder_obj_id = +object_id_from_bios_object_id ( +le16_to_cpu ( + info_v2_2->extdispconninfo.path[i].ext_encoder_objid)); + + info->ext_disp_conn_info.path[i].device_tag = +le16_to_cpu ( + info_v2_2->extdispconninfo.path[i].device_tag); + info->ext_disp_conn_info.path[i].device_acpi_enum = +le16_to_cpu ( + info_v2_2->extdispconninfo.path[i].device_acpi_enum); + info->ext_disp_conn_info.path[i].ext_aux_ddc_lut_index = + info_v2_2->extdispconninfo.path[i].auxddclut_index; + info->ext_disp_conn_info.path[i].ext_hpd_pin_lut_index = + info_v2_2->extdispconninfo.path[i].hpdlut_index; + info->ext_disp_conn_info.path[i].channel_mapping.raw = + info_v2_2->extdispconninfo.path[i].channelmapping; + info->ext_disp_conn_info.path[i].caps = +le16_to_cpu (info_v2_2->extdispconninfo.path[i].caps); + } + + info->ext_disp_conn_info.checksum = + info_v2_2->extdispconninfo.checksum; + + info->edp1_info.edp_backlight_pwm_hz = +le16_to_cpu (info_v2_2->edp1_info.edp_backlight_pwm_hz); + info->edp1_info.edp_ss_percentage = +le16_to_cpu (info_v2_2->edp1_info.edp_ss_percentage); + info->edp1_info.edp_ss_rate_10hz = +le16_to_cpu (info_v2_2->edp1_info.edp_ss_rate_10hz); + info->edp1_info.edp_pwr_on_off_delay = + info_v2_2->edp1_info.edp_pwr_on_off_delay; + info->edp1_info.edp_pwr_on_vary_bl_to_blon = + info_v2_2->edp1_info.edp_pwr_on_vary_bl_to_blon; + info->edp1_info.edp_pwr_down_bloff_to_vary_bloff = + info_v2_2->edp1_info.edp_pwr_down_bloff_to_vary_bloff; + info->edp1_info.edp_panel_bpc = + info_v2_2->edp1_info.edp_panel_bpc; + info->edp1_info.edp_bootup_bl_level = + + info->edp2_info.edp_backlight_pwm_hz = +le16_to_cpu (info_v2_2->edp2_info.edp_backlight_pwm_hz); + info->edp2_info.edp_ss_percentage = +le16_to_cpu (info_v2_2->edp2_info.edp_ss_percentage); + info->edp2_info.edp_ss_rate_10hz = +le16_to_cpu (info_v2_2->edp2_info.edp_ss_rate_10hz); + info->edp2_info.edp_pwr_on_off_delay = + info_v2_2->edp2_info.edp_pwr_on_off_delay; + info->edp2_info.edp_pwr_on_vary_bl_to_blon = + info_v2_2->edp2_info.edp_pwr_on_vary_bl_to_blon; + info->edp2_info.edp_pwr_down_bloff_to_vary_bloff = + info_v2_2->edp2_info.edp_pwr_down_bloff_to_vary_bloff; + info->edp2_info.edp_panel_bpc = + info_v2_2->edp2_info.edp_panel_bpc; + info->edp2_info.edp_bootup_bl_level = + info_v2_2->edp2_info.edp_bootup_bl_level; + +return BP_RESULT_OK ; +} +#endif /* * construct_integrated_info *
@@ -2202,6 +2310,11 @@ static enum bp_result construct_integrated_info(case 1 : result =get_integrated_info_v2_1 (bp, info);break ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +case 2 : + result =get_integrated_info_v2_2 (bp, info); +break ; +#endif default :return result; }
drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c +5 -0
@@ -72,6 +72,11 @@ bool dal_bios_parser_init_cmd_tbl_helper2(case DCN_VERSION_2_1 :case DCN_VERSION_3_0 :case DCN_VERSION_3_01 : +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +case DCN_VERSION_3_1 : + *h =dal_cmd_tbl_helper_dce112_get_table2 (); +return true; +#endif case DCN_VERSION_3_02 :case DCN_VERSION_3_03 : *h =dal_cmd_tbl_helper_dce112_get_table2 ();
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 83/89 drm/amd/display: Add DCN3.1 HWSEQ
In reply to Alex DeucherFrom: Nicholas Kazlauskas <[email protected]>
Add DCN3.1 specific hardware sequence programming - extending off of our existing DCN3/DCN2 support.
Extend stream hardware sequencing to include new DCCG programming.
--- drivers/gpu/drm/amd/display/dc/dc.h | 4 + .../gpu/drm/amd/display/dc/dce/dce_hwseq.h | 21 +- .../display/dc/dce110/dce110_hw_sequencer.c | 23 + .../drm/amd/display/dc/dcn31/dcn31_hwseq.c | 598 ++++++++++++++++++ .../drm/amd/display/dc/dcn31/dcn31_hwseq.h | 56 ++ .../gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 151 +++++ .../gpu/drm/amd/display/dc/dcn31/dcn31_init.h | 33 + .../gpu/drm/amd/display/dc/inc/hw_sequencer.h | 4 + 8 files changed, 888 insertions(+), 2 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.h
drivers/gpu/drm/amd/display/dc/dc.h +4 -0
@@ -444,6 +444,7 @@ struct dc_bw_validation_profile {union mem_low_power_enable_options {struct { +bool vga:1 ;bool i2c:1 ;bool dmcu:1 ;bool dscl:1 ;
@@ -585,6 +586,9 @@ struct dc_phy_addr_space_config {uint64_t page_table_start_addr;uint64_t page_table_end_addr;uint64_t page_table_base_addr; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +bool base_addr_is_mc_addr; +#endif } gart_config;bool valid;
drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h +19 -2
@@ -635,6 +635,7 @@ struct dce_hwseq_registers {uint32_t HPO_TOP_CLOCK_CONTROL ;uint32_t ODM_MEM_PWR_CTRL3 ;uint32_t DMU_MEM_PWR_CNTL ; +uint32_t MMHUBBUB_MEM_PWR_CNTL ; };/* set field name */ #define HWS_SF (blk_name, reg_name, field_name, post_fix)\
@@ -875,7 +876,8 @@ struct dce_hwseq_registers { HWS_SF(, AZALIA_AUDIO_DTO, AZALIA_AUDIO_DTO_MODULE, mask_sh), \ HWS_SF(, ODM_MEM_PWR_CTRL3, ODM_MEM_UNASSIGNED_PWR_MODE, mask_sh), \ HWS_SF(, ODM_MEM_PWR_CTRL3, ODM_MEM_VBLANK_PWR_MODE, mask_sh), \ - HWS_SF(, DMU_MEM_PWR_CNTL, DMCU_ERAM_MEM_PWR_FORCE, mask_sh) + HWS_SF(, DMU_MEM_PWR_CNTL, DMCU_ERAM_MEM_PWR_FORCE, mask_sh), \ + HWS_SF(, MMHUBBUB_MEM_PWR_CNTL, VGA_MEM_PWR_FORCE, mask_sh)#define HWSEQ_DCN301_MASK_SH_LIST (mask_sh)\ HWSEQ_DCN_MASK_SH_LIST(mask_sh), \
@@ -1092,7 +1094,8 @@ struct dce_hwseq_registers {type AZALIA_AUDIO_DTO_MODULE ; \type ODM_MEM_UNASSIGNED_PWR_MODE ; \type ODM_MEM_VBLANK_PWR_MODE ; \ -type DMCU_ERAM_MEM_PWR_FORCE ; +type DMCU_ERAM_MEM_PWR_FORCE ; \ +type VGA_MEM_PWR_FORCE ;#define HWSEQ_DCN3_REG_FIELD_LIST (type) \ type HPO_HDMISTREAMCLK_GATE_DIS;
@@ -1103,11 +1106,22 @@ struct dce_hwseq_registers {type PANEL_DIGON_OVRD ;\type PANEL_PWRSEQ_TARGET_STATE_R ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +#define HWSEQ_DCN31_REG_FIELD_LIST (type) \ + type DOMAIN_POWER_FORCEON;\ + type DOMAIN_POWER_GATE;\ + type DOMAIN_PGFSM_PWR_STATUS;\ + type HPO_HDMISTREAMCLK_G_GATE_DIS; + +#endif struct dce_hwseq_shift {HWSEQ_REG_FIELD_LIST (uint8_t ) HWSEQ_DCN_REG_FIELD_LIST(uint8_t)HWSEQ_DCN3_REG_FIELD_LIST (uint8_t ) HWSEQ_DCN301_REG_FIELD_LIST(uint8_t) +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) + HWSEQ_DCN31_REG_FIELD_LIST(uint8_t) +#endif };struct dce_hwseq_mask {
@@ -1115,6 +1129,9 @@ struct dce_hwseq_mask { HWSEQ_DCN_REG_FIELD_LIST(uint32_t) HWSEQ_DCN3_REG_FIELD_LIST(uint32_t) HWSEQ_DCN301_REG_FIELD_LIST(uint32_t) +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) + HWSEQ_DCN31_REG_FIELD_LIST(uint32_t) +#endif };
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +23 -0
@@ -49,6 +49,9 @@#include "link_encoder.h" #include "link_hwss.h" #include "dc_link_dp.h" +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +#include "dccg.h" +#endif #include "clock_source.h" #include "clk_mgr.h" #include "abm.h"
@@ -2124,11 +2127,31 @@ static void dce110_setup_audio_dto(build_audio_output (context, pipe_ctx, &audio_output); +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +/* For DCN3.1, audio to HPO FRL encoder is using audio DTBCLK DTO */ +if (dc->res_pool->dccg && dc->res_pool->dccg->funcs->set_audio_dtbclk_dto) { +/* disable audio DTBCLK DTO */ + dc->res_pool->dccg->funcs->set_audio_dtbclk_dto ( + dc->res_pool->dccg,0 ); + + pipe_ctx->stream_res.audio->funcs->wall_dto_setup ( + pipe_ctx->stream_res.audio, + pipe_ctx->stream->signal, + &audio_output.crtc_info, + &audio_output.pll_info); + }else + pipe_ctx->stream_res.audio->funcs->wall_dto_setup ( + pipe_ctx->stream_res.audio, + pipe_ctx->stream->signal, + &audio_output.crtc_info, + &audio_output.pll_info); +#else pipe_ctx->stream_res.audio->funcs->wall_dto_setup ( pipe_ctx->stream_res.audio, pipe_ctx->stream->signal, &audio_output.crtc_info, &audio_output.pll_info); +#endif break ; } }
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c new file +598 -0
598 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.h new file +56 -0
56 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c new file +151 -0
151 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.h new file +33 -0
@@ -0,0 +1,33 @@ +/* +* Copyright 2016 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. +* +* Authors: AMD +* +*/ + +#ifndef __DC_DCN31_INIT_H__ +#define __DC_DCN31_INIT_H__ + +struct dc ; + +void dcn31_hw_sequencer_construct (struct dc *dc); + +#endif /* __DC_DCN31_INIT_H__ */
drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h +4 -0
@@ -235,6 +235,10 @@ struct hw_sequencer_funcs {enum dc_color_depth color_depth, const struct tg_color *solid_color, int width, int height, int offset); + +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +void (*z10_restore)(struct dc *dc); +#endif }; void color_space_to_black_color(
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 84/89 drm/amd/display: Add z10 restore checks for DC interfaces
In reply to Alex DeucherFrom: Nicholas Kazlauskas <[email protected]>
DMCUB has a deferred z10 restore process that needs signalling from driver to occur. This needs to be done on any interface that programs the hardware state or sequences where we expect to have the same hardware state as before.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 17 +++++++++++++++++ drivers/gpu/drm/amd/display/dc/core/dc_link.c | 4 ++++ drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 6 ++++++ drivers/gpu/drm/amd/display/dc/dc.h | 3 +++ 4 files changed, 30 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc.c +17 -0
@@ -1482,6 +1482,13 @@ static uint8_t get_stream_mask(struct dc *dc, struct dc_state *context)return stream_mask; } +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +void dc_z10_restore (struct dc *dc) +{ +if (dc->hwss.z10_restore) + dc->hwss.z10_restore (dc); +} +#endif /* * Applies given context to HW and copy it into current context. * It's up to the user to release the src context afterwards.
@@ -1495,6 +1502,9 @@ static enum dc_status dc_commit_state_no_check(struct dc *dc, struct dc_state *cstruct dc_stream_state *dc_streams[MAX_STREAMS ] = {0 };#if defined(CONFIG_DRM_AMD_DC_DCN ) +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +dc_z10_restore (dc); +#endif dc_allow_idle_optimizations (dc, false);#endif
@@ -2569,6 +2579,10 @@ static void commit_planes_for_stream(struct dc *dc,int i, j;struct pipe_ctx *top_pipe_to_program =NULL ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +dc_z10_restore (dc); +#endif +if (get_seamless_boot_stream_count (context) >0 && surface_count >0 ) {/* Optimize seamless boot flag keeps clocks and watermarks high until * first flip. After first flip, optimization is required to lower
@@ -3024,6 +3038,9 @@ void dc_set_power_state(case DC_ACPI_CM_POWER_STATE_D0 :dc_resource_state_construct (dc, dc->current_state); +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +dc_z10_restore (dc); +#endif if (dc->ctx->dmub_srv)dc_dmub_srv_wait_phy_init (dc->ctx->dmub_srv);
drivers/gpu/drm/amd/display/dc/core/dc_link.c +4 -0
@@ -2706,6 +2706,10 @@ bool dc_link_set_psr_allow_active(struct dc_link *link, bool allow_active,return false; link->psr_settings.psr_allow_active = allow_active; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +if (!allow_active) +dc_z10_restore (dc); +#endif if (psr !=NULL && link->psr_settings.psr_feature_enabled) {if (force_static && psr->funcs->psr_force_static)
drivers/gpu/drm/amd/display/dc/core/dc_stream.c +6 -0
@@ -294,6 +294,9 @@ bool dc_stream_set_cursor_attributes( stream->cursor_attributes = *attributes;#if defined(CONFIG_DRM_AMD_DC_DCN ) +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +dc_z10_restore (dc); +#endif /* disable idle optimizations while updating cursor */ if (dc->idle_optimizations_allowed) {dc_allow_idle_optimizations (dc, false);
@@ -355,6 +358,9 @@ bool dc_stream_set_cursor_position( dc = stream->ctx->dc; res_ctx = &dc->current_state->res_ctx;#if defined(CONFIG_DRM_AMD_DC_DCN ) +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +dc_z10_restore (dc); +#endif /* disable idle optimizations if enabling cursor */ if (dc->idle_optimizations_allowed && !stream->cursor_position.enable && position->enable) {
drivers/gpu/drm/amd/display/dc/dc.h +3 -0
@@ -1326,6 +1326,9 @@ void dc_hardware_release(struct dc *dc);#endif bool dc_set_psr_allow_active (struct dc *dc,bool enable); +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +void dc_z10_restore (struct dc *dc); +#endif bool dc_enable_dmub_notifications (struct dc *dc);
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 85/89 drm/amd/display: Add DCN3.1 Resource
In reply to Alex DeucherFrom: Nicholas Kazlauskas <[email protected]>
Container for hardware resources and blocks for DCN3.1, also adds new DC debug flags used with DCN3.1.
--- .../gpu/drm/amd/display/dc/core/dc_resource.c | 16 + drivers/gpu/drm/amd/display/dc/dc.h | 7 + .../drm/amd/display/dc/dcn31/dcn31_resource.c | 2180 +++++++++++++++++ .../drm/amd/display/dc/dcn31/dcn31_resource.h | 42 + 4 files changed, 2245 insertions(+) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.h
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +16 -0
@@ -58,6 +58,9 @@#include "dcn301/dcn301_resource.h" #include "dcn302/dcn302_resource.h" #include "dcn303/dcn303_resource.h" +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +#include "../dcn31/dcn31_resource.h" +#endif #endif #define DC_LOGGER_INIT (logger)
@@ -139,6 +142,14 @@ enum dce_version resource_parse_asic_id(struct hw_asic_id asic_id) dc_version =DCN_VERSION_3_01 ;break ;#endif + +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +case FAMILY_YELLOW_CARP : +if (ASICREV_IS_YELLOW_CARP (asic_id.hw_internal_rev)) + dc_version =DCN_VERSION_3_1 ; +break ; +#endif +default : dc_version =DCE_VERSION_UNKNOWN ;break ;
@@ -222,6 +233,11 @@ struct resource_pool *dc_create_resource_pool(struct dc *dc,case DCN_VERSION_3_03 : res_pool =dcn303_create_resource_pool (init_data, dc);break ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +case DCN_VERSION_3_1 : + res_pool =dcn31_create_resource_pool (init_data, dc); +break ; +#endif #endif default :break ;
drivers/gpu/drm/amd/display/dc/dc.h +7 -0
@@ -520,6 +520,9 @@ struct dc_debug_options {unsigned int force_odm_combine;//bit vector based on otg inst #if defined(CONFIG_DRM_AMD_DC_DCN )unsigned int force_odm_combine_4to1;//bit vector based on otg inst +#endif +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +bool disable_z9_mpc;#endif unsigned int force_fclk_khz;bool enable_tri_buf;
@@ -562,6 +565,10 @@ struct dc_debug_options {bool force_enable_edp_fec;/* FEC/PSR1 sequence enable delay in 100us */ uint8_t fec_enable_delay_in100us; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +bool disable_z10; +bool enable_sw_cntl_psr; +#endif };struct dc_debug_data {
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c new file +2180 -0
2,180 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.h new file +42 -0
42 lines not on this page · raw message
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 86/89 drm/amd/display: Add DCN3.1 blocks to the DC Makefile
In reply to Alex DeucherFrom: Nicholas Kazlauskas <[email protected]>
Preparation for compiling DCN3.1 support.
--- drivers/gpu/drm/amd/display/dc/Makefile | 3 ++ drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 35 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/Makefile
drivers/gpu/drm/amd/display/dc/Makefile +3 -0
@@ -34,6 +34,9 @@ DC_LIBS += dcn30 DC_LIBS += dcn301 DC_LIBS += dcn302 DC_LIBS += dcn303 +ifdef CONFIG_DRM_AMD_DC_DCN3_1 +DC_LIBS += dcn31 +endif endif DC_LIBS += dce120
drivers/gpu/drm/amd/display/dc/dcn31/Makefile new file +35 -0
@@ -0,0 +1,35 @@ +# +# (c) Copyright 2020 Advanced Micro Devices, Inc. All the rights reserved +# +# All rights reserved. This notice is intended as a precaution against +# inadvertent publication and does not imply publication or any waiver +# of confidentiality. The year included in the foregoing notice is the +# year of creation of the work. +# +# Authors: AMD +# +# Makefile for dcn31. + +DCN31 = dcn31_resource.o dcn31_hubbub.o dcn31_hwseq.o dcn31_init.o dcn31_hubp.o \ + dcn31_dccg.o dcn31_optc.o dcn31_dio_link_encoder.o dcn31_panel_cntl.o + +CFLAGS_$(AMDDALPATH)/dc/dcn31/dcn31_resource.o := -mhard-float -msse + +ifdef CONFIG_CC_IS_GCC +ifeq ($(call cc-ifversion, -lt, 0701, y), y) +IS_OLD_GCC = 1 +endif +endif + +ifdef IS_OLD_GCC +# Stack alignment mismatch, proceed with caution. +# GCC < 7.1 cannot compile code using `double` and -mpreferred-stack-boundary=3 +# (8B stack alignment). +CFLAGS_$(AMDDALPATH)/dc/dcn31/dcn31_resource.o += -mpreferred-stack-boundary=4 +else +CFLAGS_$(AMDDALPATH)/dc/dcn31/dcn31_resource.o += -msse2 +endif + +AMD_DAL_DCN31 = $(addprefix $(AMDDALPATH)/dc/dcn31/,$(DCN31)) + +AMD_DISPLAY_FILES += $(AMD_DAL_DCN31)
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 87/89 drm/amd/display: Add DCN3.1 Yellow Carp support to DM
In reply to Alex DeucherFrom: Nicholas Kazlauskas <[email protected]>
To detect DCN3.1 ASICs and to enable the appropriate number of CRTCs, pick the right validation paths for display formats and to use the right DC interfaces.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +44 -0
@@ -109,6 +109,10 @@ MODULE_FIRMWARE(FIRMWARE_VANGOGH_DMUB);MODULE_FIRMWARE (FIRMWARE_DIMGREY_CAVEFISH_DMUB );#define FIRMWARE_BEIGE_GOBY_DMUB "amdgpu/beige_goby_dmcub.bin"MODULE_FIRMWARE (FIRMWARE_BEIGE_GOBY_DMUB ); +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +#define FIRMWARE_YELLOW_CARP_DMUB "amdgpu/yellow_carp_dmcub.bin" +MODULE_FIRMWARE (FIRMWARE_YELLOW_CARP_DMUB ); +#endif #define FIRMWARE_RAVEN_DMCU "amdgpu/raven_dmcu.bin"MODULE_FIRMWARE (FIRMWARE_RAVEN_DMCU );
@@ -1151,6 +1155,11 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)case CHIP_VANGOGH : init_data.flags.gpu_vm_support = true;break ; +#endif +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +case CHIP_YELLOW_CARP : + init_data.flags.gpu_vm_support = true; +break ;#endif default :break ;
@@ -1401,6 +1410,9 @@ static int load_dmcu_fw(struct amdgpu_device *adev)case CHIP_DIMGREY_CAVEFISH :case CHIP_BEIGE_GOBY :case CHIP_VANGOGH : +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +case CHIP_YELLOW_CARP : +#endif return 0 ;case CHIP_NAVI12 : fw_name_dmcu =FIRMWARE_NAVI12_DMCU ;
@@ -1519,6 +1531,12 @@ static int dm_dmub_sw_init(struct amdgpu_device *adev) dmub_asic =DMUB_ASIC_DCN303 ; fw_name_dmub =FIRMWARE_BEIGE_GOBY_DMUB ;break ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +case CHIP_YELLOW_CARP : + dmub_asic =DMUB_ASIC_DCN31 ; + fw_name_dmub =FIRMWARE_YELLOW_CARP_DMUB ; +break ; +#endif default :/* ASIC doesn't support DMUB. */
@@ -2213,6 +2231,15 @@ static int dm_resume(void *handle) = 0xffffffff; } } +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +/* +* Resource allocation happens for link encoders for newer ASIC in +* dc_validate_global_state, so we need to revalidate it. +* +* This shouldn't fail (it passed once before), so warn if it does. +*/ +WARN_ON (dc_validate_global_state (dm->dc, dc_state, false) !=DC_OK ); +#endif WARN_ON (!dc_commit_state (dm->dc, dc_state));
@@ -3757,6 +3784,9 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)switch (adev->asic_type) {case CHIP_SIENNA_CICHLID :case CHIP_NAVY_FLOUNDER : +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +case CHIP_YELLOW_CARP : +#endif case CHIP_RENOIR :if (register_outbox_irq_handlers (dm->adev)) {DRM_ERROR ("DM: Failed to initialize IRQ\n" );
@@ -3861,6 +3891,9 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)case CHIP_DIMGREY_CAVEFISH :case CHIP_BEIGE_GOBY :case CHIP_VANGOGH : +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +case CHIP_YELLOW_CARP : +#endif if (dcn10_register_irq_handlers (dm->adev)) {DRM_ERROR ("DM: Failed to initialize IRQ\n" ); goto fail;
@@ -4106,6 +4139,13 @@ static int dm_early_init(void *handle) adev->mode_info.num_hpd =6 ; adev->mode_info.num_dig =6 ;break ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) +case CHIP_YELLOW_CARP : + adev->mode_info.num_crtc =4 ; + adev->mode_info.num_hpd =4 ; + adev->mode_info.num_dig =4 ; +break ; +#endif case CHIP_NAVI14 :case CHIP_DIMGREY_CAVEFISH : adev->mode_info.num_crtc =5 ;
@@ -4343,6 +4383,9 @@ fill_gfx9_tiling_info_from_device(const struct amdgpu_device *adev, adev->asic_type == CHIP_NAVY_FLOUNDER || adev->asic_type == CHIP_DIMGREY_CAVEFISH || adev->asic_type == CHIP_BEIGE_GOBY || +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) + adev->asic_type ==CHIP_YELLOW_CARP || +#endif adev->asic_type == CHIP_VANGOGH) tiling_info->gfx9.num_pkrs = adev->gfx.config.gb_addr_config_fields.num_pkrs; }
@@ -4762,6 +4805,7 @@ get_plane_modifiers(const struct amdgpu_device *adev, unsigned int plane_type, ubreak ;case AMDGPU_FAMILY_NV :case AMDGPU_FAMILY_VGH : +case AMDGPU_FAMILY_YC :if (adev->asic_type >=CHIP_SIENNA_CICHLID )add_gfx10_3_modifiers (adev, mods, &size, &capacity);else
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 88/89 drm/amd/display: Add DC DCN3.1 support to Kconfig
In reply to Alex DeucherFrom: Nicholas Kazlauskas <[email protected]>
To enable compiling and using DCN3.1 ASICs with physical output.
--- drivers/gpu/drm/amd/display/Kconfig | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/amd/display/Kconfig +7 -0
@@ -31,6 +31,13 @@ config DRM_AMD_DC_SI by default. This includes Tahiti, Pitcairn, Cape Verde, Oland. Hainan is not supported by AMD DC and it has no physical DCE6. +config DRM_AMD_DC_DCN3_1 + bool "DCN 3.1 family" + depends on DRM_AMD_DC_DCN + help + Choose this option if you want to have + DCN3.1 family support for display engine + config DEBUG_KERNEL_DC bool "Enable kgdb break in DC" depends on DRM_AMD_DC
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
maintainerPATCH 89/89 drm/amdgpu: Add DC support and display block for Yellow Carp
In reply to Alex DeucherFrom: Nicholas Kazlauskas <[email protected]>
To enable output on real display instead of virtual.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 + drivers/gpu/drm/amd/amdgpu/nv.c | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -0
@@ -3125,6 +3125,7 @@ bool amdgpu_device_asic_has_dc_support(enum amd_asic_type asic_type)case CHIP_DIMGREY_CAVEFISH :case CHIP_BEIGE_GOBY :case CHIP_VANGOGH : +case CHIP_YELLOW_CARP :#endif return amdgpu_dc !=0 ;#endif
drivers/gpu/drm/amd/amdgpu/nv.c +6 -1
@@ -1001,7 +1001,12 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block);amdgpu_device_ip_block_add (adev, &gfx_v10_0_ip_block);amdgpu_device_ip_block_add (adev, &sdma_v5_2_ip_block); - +if (adev->enable_virtual_display ||amdgpu_sriov_vf (adev)) +amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +#if defined(CONFIG_DRM_AMD_DC ) + else if (amdgpu_device_has_dc_support(adev)) + amdgpu_device_ip_block_add(adev, &dm_ip_block); +#endif amdgpu_device_ip_block_add (adev, &vcn_v3_0_ip_block);amdgpu_device_ip_block_add (adev, &jpeg_v3_0_ip_block);break ;
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 2 lines · Alex Deucher
This patch set adds initial support for Yellow Carp, a new GPU from AMD.
Always happy to see the new GPU support. :-)
Series are Acked-by: Huang Rui <[email protected]>
Quoted 290 lines
I did not send out patch 1 due to its size (new register headers), but you can view the entire patch set here:
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitlab.freedesktop.org%2Fagd5f%2Flinux%2F-%2Fcommits%2Fyellow_carp&data=04%7C01%7Cray.huang%40amd.com%7C1937eee84d9c4cb003d008d925e66f99%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637582493915660523%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=7JQvLB%2FCIkDRV5jpSn27hq9hxtdHnmDyDmGJr3bzuis%3D&reserved=0Aaron Liu (42):
drm/amdgpu: add yellow carp asic header files (v3) drm/amdgpu: add yellow carpasic_typeenum
drm/amdgpu: add uapi to define yellow carp series drm/amdgpu: add yellow carp support forgpu_infoand ip block setting drm/amdgpu: add nv common ip block support for yellow carp drm/amdgpu: add yellow carp support for ih block drm/amdgpu: add gmc v10 supports for yellow carp drm/amdgpu: support fw load type for yellow carp drm/amdgpu: add gfx support for yellow carp
drm/amdgpu: add sdma support for yellow carp
drm/amdgpu: set ip blocks for yellow carp
drm/amdkfd: add yellow carp KFD support
drm/amdgpu: supportnbio_7_2_1for yellow carp drm/admgpu/pm: add smu v13 driver interface header for yellow carp(v3)drm/amdgpu/pm: add smu v13.0.1 firmware header for yellow carp (V4) drm/amdgpu/pm: add smu v13.0.1 smc header for yellow carp (v2) drm/amd/pm: add smu13 ip support for moment(V3) drm/amd/pm: add
yellow_carp_pptimplementation(V3) drm/amd/pm: partially enable swsmu for yellow carp(V2) drm/amdgpu: add smu ip block for yellow carp(V3) drm/amdgpu: add gfx golden settings for yellow carp (v3) drm/amdgpu: reserved buffer is not needed with ip discovery enabled drm/amdgpu: addpsp_v13support for yellow carp drm/amdgpu: enablepsp_v13for yellow carp
drm/amdgpu/pm:set_pp_featureis unsupport for yellow carp drm/amdgpu/pm: addset_driver_table_locationimplementation for yellow
carp
drm/amdgpu: add GFX Clock Gating support for yellow carp drm/amdgpu: add MMHUB Clock Gating support for yellow carp drm/amdgpu: add GFX Power Gating support for yellow carp drm/amdgpu/pm: enablesmu_hw_initfor yellow carp drm/amdgpu/pm: addgfx_off_controlfor yellow carp drm/amdgpu/pm: enablegfx_offin yellow carp smu post init drm/amdgpu: add SDMA Clock Gating support for yellow carp drm/amdgpu: add HDP Clock Gating support for yellow carp drm/amdgpu: add ATHUB Clock Gating support for yellow carp drm/amdgpu: add IH Clock Gating support for yellow carp drm/amdgpu: enable VCN PG and CG for yellow carp drm/amdgpu/pm: supportsmu_post_initfor yellow carp drm/amdgpu: addRLC_PG_DELAY_3for yellow carp
drm/amdgpu: add timestamp counter query support for yellow carp drm/amd/pm: add PrepareMp1ForUnload support for yellow carp drm/amdgpu: add mode2 reset support for yellow carpAlex Deucher (2):
drm/amdgpu: addyellow_carp_reg_base_initfunction for yellow carp(v2)drm/amdgpu: add mmhub client support for yellow carp
Huang Rui (2):
drm/amdgpu: introduce a stolen reserved buffer to protect specific
buffer region (v2)
drm/amd/pm: add vcn/jepg enable functions for yellow carpJames Zhu (5):
drm/amdgpu/jpeg: Remove harvest checking onCHIP_YELLOW_CARPdrm/amdgpu/vcn: add vcn support for yellow carp drm/amdgpu: enable vcn/jpeg on yellow carp drm/amdgpu: enable vcn dpg mode on yellow carp drm/amdgpu: addvideo_codecsquery support for yellow carpNicholas Kazlauskas (22):
drm/amdgpu: Load TA firmware for yellow carp drm/amdgpu: Update atomfirmware for DCN3.1 phy tuning and eDP caps drm/amd/display: Add DCN3.1 yellow carp asic family IDs drm/amd/display: Add DCN3.1 clock manager support drm/amd/display: Add DCN3.1 DCCG
drm/amd/display: Add DCN3.1 DIO
drm/amd/display: Add DCN3.1 OPTC
drm/amd/display: Add DCN3.1 DCHHUB
drm/amd/display: Add DCN3.1 DML calculation support drm/amd/display: Add DCN3.1 IRQ manager drm/amd/display: Add DCN3.1 GPIO support drm/amd/display: Add DCN3.1 DMCUB
drm/amd/display: Add DCN3.1 PANEL
drm/amd/display: Add DCN3.1 HDCP support drm/amd/display: Add DCN3.1 BIOS parser support drm/amd/display: Add DCN3.1 HWSEQ
drm/amd/display: Add z10 restore checks for DC interfaces drm/amd/display: Add DCN3.1 Resource
drm/amd/display: Add DCN3.1 blocks to the DCMakefiledrm/amd/display: Add DCN3.1 Yellow Carp support to DM drm/amd/display: Add DC DCN3.1 support toKconfigdrm/amdgpu: Add DC support and display block for Yellow CarpXiaomeng Hou (16):
drm/amd/pm: addread_sensorfunction for yellow carp drm/amd/pm: addset_watermarks_tablefunction for yellow carp drm/amd/pm: add the fine grain tuning function for yellow carp drm/amd/pm: add support to get dpm clock value for yellow carp drm/amd/pm: add feature map for yellow carp
drm/amd/pm: implementis_dpm_running()callback for yellow carp drm/amd/pm: initialize feature_enabled/feature_support bitmap for
yellow carp
drm/amd/pm: add callbackforce_clk_levelsfor yellow carp drm/amd/pm: add callback to get bootup values for yellow carp drm/amd/pm: add callbackget_dpm_ultimate_freqfor yellow carp drm/amd/pm: add callbacks to read/write sysfs file
pp_power_profile_mode
drm/amd/pm: add the interface to dump smu metrics table for yellow
carp
drm/amdgpu: add gpu harvest support for yellow carp (v2) drm/amdgpu: correct the cu and rb info for yellow carp drm/amd/pm: addset_performance_levelfunction for yellow carp drm/amd/pm: disable manually setting MCLK power level on yellow carpdrivers/gpu/drm/amd/amdgpu/Makefile | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 9 + drivers/gpu/drm/amd/amdgpu/amdgpu_gfxhub.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 19 + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 4 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 10 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 4 + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 8 + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 83 +- drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 40 + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 17 +- drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 9 +- drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 1 + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 1 + drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 142 +- drivers/gpu/drm/amd/amdgpu/nv.c | 51 + drivers/gpu/drm/amd/amdgpu/nv.h | 2 + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 37 +- drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 7 + .../gpu/drm/amd/amdgpu/yellow_carp_reg_init.c | 51 + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 52 + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 19 + .../drm/amd/amdkfd/kfd_device_queue_manager.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 1 + .../gpu/drm/amd/amdkfd/kfd_packet_manager.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 1 + drivers/gpu/drm/amd/display/Kconfig | 7 + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 44 + .../amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 13 + .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 6 + drivers/gpu/drm/amd/display/dc/Makefile | 3 + .../drm/amd/display/dc/bios/bios_parser2.c | 113 + .../display/dc/bios/command_table_helper2.c | 5 + .../gpu/drm/amd/display/dc/clk_mgr/Makefile | 11 + .../gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 30 + .../display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 4 + .../display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 673 + .../display/dc/clk_mgr/dcn31/dcn31_clk_mgr.h | 103 + .../amd/display/dc/clk_mgr/dcn31/dcn31_smu.c | 333 + .../amd/display/dc/clk_mgr/dcn31/dcn31_smu.h | 271 + drivers/gpu/drm/amd/display/dc/core/dc.c | 17 + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 18 + .../gpu/drm/amd/display/dc/core/dc_resource.c | 26 + .../gpu/drm/amd/display/dc/core/dc_stream.c | 6 + drivers/gpu/drm/amd/display/dc/dc.h | 28 + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 23 + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 3 + .../gpu/drm/amd/display/dc/dce/dce_hwseq.h | 21 +- .../display/dc/dce110/dce110_hw_sequencer.c | 23 + .../drm/amd/display/dc/dcn10/dcn10_hubbub.h | 48 + .../amd/display/dc/dcn10/dcn10_link_encoder.h | 20 + .../gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 11 + .../gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 2 + .../gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 54 + .../drm/amd/display/dc/dcn20/dcn20_hubbub.h | 9 + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 16 + .../drm/amd/display/dc/dcn20/dcn20_hwseq.c | 37 + .../drm/amd/display/dc/dcn20/dcn20_resource.c | 39 + .../drm/amd/display/dc/dcn30/dcn30_hwseq.c | 5 + drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 35 + .../gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 279 + .../gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h | 147 + .../display/dc/dcn31/dcn31_dio_link_encoder.c | 412 + .../display/dc/dcn31/dcn31_dio_link_encoder.h | 246 + .../drm/amd/display/dc/dcn31/dcn31_hubbub.c | 956 + .../drm/amd/display/dc/dcn31/dcn31_hubbub.h | 122 + .../gpu/drm/amd/display/dc/dcn31/dcn31_hubp.c | 103 + .../gpu/drm/amd/display/dc/dcn31/dcn31_hubp.h | 246 + .../drm/amd/display/dc/dcn31/dcn31_hwseq.c | 598 + .../drm/amd/display/dc/dcn31/dcn31_hwseq.h | 56 + .../gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 151 + .../gpu/drm/amd/display/dc/dcn31/dcn31_init.h | 33 + .../gpu/drm/amd/display/dc/dcn31/dcn31_optc.c | 287 + .../gpu/drm/amd/display/dc/dcn31/dcn31_optc.h | 259 + .../amd/display/dc/dcn31/dcn31_panel_cntl.c | 157 + .../amd/display/dc/dcn31/dcn31_panel_cntl.h | 40 + .../drm/amd/display/dc/dcn31/dcn31_resource.c | 2180 + .../drm/amd/display/dc/dcn31/dcn31_resource.h | 42 + drivers/gpu/drm/amd/display/dc/dm_cp_psp.h | 5 + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 6 + drivers/gpu/drm/amd/display/dc/dml/Makefile | 11 + .../dc/dml/dcn31/display_mode_vba_31.c | 7506 ++ .../dc/dml/dcn31/display_mode_vba_31.h | 43 + .../dc/dml/dcn31/display_rq_dlg_calc_31.c | 1727 + .../dc/dml/dcn31/display_rq_dlg_calc_31.h | 69 + .../drm/amd/display/dc/dml/display_mode_lib.c | 18 + .../drm/amd/display/dc/dml/display_mode_lib.h | 4 + .../amd/display/dc/dml/display_mode_structs.h | 12 + .../drm/amd/display/dc/dml/display_mode_vba.c | 42 + .../drm/amd/display/dc/dml/display_mode_vba.h | 52 + .../gpu/drm/amd/display/dc/gpio/hw_factory.c | 3 + .../drm/amd/display/dc/gpio/hw_translate.c | 3 + .../gpu/drm/amd/display/dc/inc/core_types.h | 10 + .../gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 3 + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 56 + .../gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 5 + .../drm/amd/display/dc/inc/hw/link_encoder.h | 14 + .../gpu/drm/amd/display/dc/inc/hw/mem_input.h | 4 + .../amd/display/dc/inc/hw/timing_generator.h | 4 + .../gpu/drm/amd/display/dc/inc/hw_sequencer.h | 4 + drivers/gpu/drm/amd/display/dc/irq/Makefile | 11 + .../display/dc/irq/dcn31/irq_service_dcn31.c | 432 + .../display/dc/irq/dcn31/irq_service_dcn31.h | 37 + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 12 + .../gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 118 + drivers/gpu/drm/amd/display/dmub/src/Makefile | 3 + .../gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 354 + .../gpu/drm/amd/display/dmub/src/dmub_dcn31.h | 230 + .../gpu/drm/amd/display/dmub/src/dmub_srv.c | 37 + .../gpu/drm/amd/display/include/dal_asic_id.h | 13 + .../gpu/drm/amd/display/include/dal_types.h | 3 + .../drm/amd/display/modules/hdcp/hdcp_log.c | 4 + .../drm/amd/display/modules/hdcp/hdcp_psp.c | 135 +- .../drm/amd/display/modules/hdcp/hdcp_psp.h | 38 + .../drm/amd/display/modules/inc/mod_hdcp.h | 23 +- .../include/asic_reg/dcn/dcn_3_1_2_offset.h | 15083 +++ .../include/asic_reg/dcn/dcn_3_1_2_sh_mask.h | 60747 +++++++++ .../include/asic_reg/dpcs/dpcs_4_2_0_offset.h | 11936 ++ .../asic_reg/dpcs/dpcs_4_2_0_sh_mask.h | 103385 +++++++++++++++ .../include/asic_reg/mp/mp_13_0_1_offset.h | 355 + .../include/asic_reg/mp/mp_13_0_1_sh_mask.h | 531 + drivers/gpu/drm/amd/include/atomfirmware.h | 56 +- .../gpu/drm/amd/include/yellow_carp_offset.h | 1366 + .../amd/pm/inc/smu13_driver_if_yellow_carp.h | 222 + drivers/gpu/drm/amd/pm/inc/smu_v13_0_1.h | 57 + drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_pmfw.h | 139 + .../gpu/drm/amd/pm/inc/smu_v13_0_1_ppsmc.h | 97 + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 7 + drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile | 2 +- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_1.c | 311 + .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 1210 + .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.h | 28 + include/drm/amd_asic_type.h | 1 + include/uapi/drm/amdgpu_drm.h | 1 + 136 files changed, 215465 insertions(+), 66 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/yellow_carp_reg_init.c create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.h create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/Makefile create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dio_link_encoder.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dio_link_encoder.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_panel_cntl.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_panel_cntl.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.h create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.h create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.c create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.h create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn31/irq_service_dcn31.c create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn31/irq_service_dcn31.h create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_1_2_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_1_2_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_4_2_0_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_4_2_0_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_1_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_1_sh_mask.h
Quoted 16 lines
create mode 100644 drivers/gpu/drm/amd/include/yellow_carp_offset.h create mode 100644 drivers/gpu/drm/amd/pm/inc/smu13_driver_if_yellow_carp.h create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v13_0_1.h create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_pmfw.h create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_ppsmc.h create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_1.c create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.hSignature · 6 lines
2.31.1 _______________________________________________ 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%7Cray.huang%40amd.com%7C1937eee84d9c4cb003d008d925e66f99%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637582493915660523%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=Qmgz7X9ZWslau62%2B2oNUhPVJDIvvm9BQTsLLwlI18rI%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx