Add DP 2.0 SST Support
Subsystems (3)
v2 cover Add DP 2.0 SST Support
The patch series adds SST UHBR10 support
Fangzhi Zuo (6):
drm/amd/display: Add DP 2.0 Audio Package Generator drm/amd/display: Add DP 2.0 HPO Stream Encoder drm/amd/display: Add DP 2.0 HPO Link Encoder drm/amd/display: Add DP 2.0 DCCG drm/amd/display: Add DP 2.0 BIOS and DMUB Support drm/amd/display: Add DP 2.0 SST DC Support
.../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 6 + .../drm/amd/display/dc/bios/bios_parser2.c | 8 + .../drm/amd/display/dc/bios/command_table2.c | 6 + drivers/gpu/drm/amd/display/dc/core/dc.c | 17 + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 503 +++++++- .../gpu/drm/amd/display/dc/core/dc_link_dp.c | 1071 +++++++++++++++-- .../drm/amd/display/dc/core/dc_link_hwss.c | 291 ++++- .../gpu/drm/amd/display/dc/core/dc_resource.c | 104 ++ drivers/gpu/drm/amd/display/dc/dc.h | 17 +- drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 199 ++- drivers/gpu/drm/amd/display/dc/dc_link.h | 3 + drivers/gpu/drm/amd/display/dc/dc_types.h | 15 + .../display/dc/dce110/dce110_hw_sequencer.c | 86 +- .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 65 + .../amd/display/dc/dcn10/dcn10_link_encoder.c | 9 + .../drm/amd/display/dc/dcn20/dcn20_hwseq.c | 26 +- .../drm/amd/display/dc/dcn20/dcn20_resource.c | 4 + .../display/dc/dcn30/dcn30_dio_link_encoder.c | 4 + drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 3 +- .../gpu/drm/amd/display/dc/dcn31/dcn31_apg.c | 173 +++ .../gpu/drm/amd/display/dc/dcn31/dcn31_apg.h | 115 ++ .../gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 162 +++ .../gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h | 18 + .../display/dc/dcn31/dcn31_dio_link_encoder.c | 4 + .../dc/dcn31/dcn31_hpo_dp_link_encoder.c | 620 ++++++++++ .../dc/dcn31/dcn31_hpo_dp_link_encoder.h | 222 ++++ .../dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 749 ++++++++++++ .../dc/dcn31/dcn31_hpo_dp_stream_encoder.h | 241 ++++ .../drm/amd/display/dc/dcn31/dcn31_resource.c | 181 +++ drivers/gpu/drm/amd/display/dc/dm_cp_psp.h | 1 + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 2 + .../gpu/drm/amd/display/dc/inc/core_types.h | 6 + .../gpu/drm/amd/display/dc/inc/dc_link_dp.h | 22 + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 21 + .../gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 2 + .../drm/amd/display/dc/inc/hw/link_encoder.h | 89 ++ .../amd/display/dc/inc/hw/stream_encoder.h | 79 ++ .../amd/display/dc/inc/hw/timing_generator.h | 1 + .../amd/display/dc/inc/hw_sequencer_private.h | 1 + drivers/gpu/drm/amd/display/dc/inc/resource.h | 12 + .../gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 2 +- .../amd/display/include/bios_parser_types.h | 6 + .../gpu/drm/amd/display/include/dpcd_defs.h | 14 +- .../amd/display/include/grph_object_defs.h | 10 + .../drm/amd/display/include/grph_object_id.h | 6 + .../amd/display/include/link_service_types.h | 31 +- .../drm/amd/display/include/logger_types.h | 2 + drivers/gpu/drm/amd/include/atomfirmware.h | 4 + 48 files changed, 5006 insertions(+), 227 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_link_encoder.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_link_encoder.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.h
Signature · 1 line
2.25.1
PATCH v2 1/6 drm/amd/display: Add DP 2.0 Audio Package Generator
HW Blocks:
+-----+
| HDA |
+-----+
|
|
HPO ===============|=============
| v
| +-----+
| | APG |
v +-----+--- drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 3 +- .../gpu/drm/amd/display/dc/dcn31/dcn31_apg.c | 173 ++++++++++++++++++ .../gpu/drm/amd/display/dc/dcn31/dcn31_apg.h | 115 ++++++++++++ .../drm/amd/display/dc/dcn31/dcn31_resource.c | 38 ++++ 4 files changed, 328 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.h
drivers/gpu/drm/amd/display/dc/dcn31/Makefile +2 -1
@@ -11,7 +11,8 @@ # 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 + dcn31_dccg.o dcn31_optc.o dcn31_dio_link_encoder.o dcn31_panel_cntl.o \ + dcn31_apg.o ifdef CONFIG_X86 CFLAGS_$(AMDDALPATH)/dc/dcn31/dcn31_resource.o := -msse
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.c new file +173 -0
173 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.h new file +115 -0
115 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c +38 -0
@@ -52,6 +52,7 @@#include "dcn30/dcn30_vpg.h" #include "dcn30/dcn30_afmt.h" #include "dcn30/dcn30_dio_stream_encoder.h" +#include "dcn31/dcn31_apg.h" #include "dcn31/dcn31_dio_link_encoder.h" #include "dce/dce_clock_source.h" #include "dce/dce_audio.h"
@@ -457,6 +458,26 @@ static const struct dcn30_afmt_mask afmt_mask = {DCN3_AFMT_MASK_SH_LIST (_MASK) }; +#define apg_regs (id)\ +[id] = {\ + APG_DCN31_REG_LIST(id)\ +} + +static const struct dcn31_apg_registers apg_regs[] = { +apg_regs (0 ), +apg_regs (1 ), +apg_regs (2 ), +apg_regs (3 ) +}; + +static const struct dcn31_apg_shift apg_shift = { +DCN31_APG_MASK_SH_LIST (__SHIFT) +}; + +static const struct dcn31_apg_mask apg_mask = { +DCN31_APG_MASK_SH_LIST (_MASK) +}; +#define stream_enc_regs (id)\ [id] = {\ SE_DCN3_REG_LIST(id)\
@@ -1260,6 +1281,23 @@ static struct afmt *dcn31_afmt_create(return &afmt3->base; } +static struct apg *dcn31_apg_create ( +struct dc_context *ctx, +uint32_t inst) +{ +struct dcn31_apg *apg31 =kzalloc (sizeof (struct dcn31_apg ),GFP_KERNEL ); + +if (!apg31) +return NULL ; + +apg31_construct (apg31, ctx, inst, + &apg_regs[inst], + &apg_shift, + &apg_mask); + +return &apg31->base; +} +static struct stream_encoder *dcn31_stream_encoder_create (enum engine_id eng_id,struct dc_context *ctx)
Signature · 1 line
2.25.1
PATCH v2 2/6 drm/amd/display: Add DP 2.0 HPO Stream Encoder
In reply to Fangzhi ZuoHW Blocks:
+--------+ +-----+ +------+
| OPTC | | HDA | | HUBP |
+--------+ +-----+ +------+
| | |
| | |
HPO ====|==========|========|====
| | v |
| | +-----+ |
| | | APG | |
| | +-----+ |
| | | |
v v v v
+----------------------+
| HPO Stream Encoder |
+----------------------+--- .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 33 + drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 2 +- .../dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 749 ++++++++++++++++++ .../dc/dcn31/dcn31_hpo_dp_stream_encoder.h | 241 ++++++ .../drm/amd/display/dc/dcn31/dcn31_resource.c | 85 ++ .../gpu/drm/amd/display/dc/inc/core_types.h | 4 + .../gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 1 + .../amd/display/dc/inc/hw/stream_encoder.h | 79 ++ drivers/gpu/drm/amd/display/dc/inc/resource.h | 4 + .../amd/display/include/grph_object_defs.h | 10 + .../drm/amd/display/include/grph_object_id.h | 6 + 11 files changed, 1213 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.h
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +33 -0
@@ -466,6 +466,39 @@ void dcn10_log_hw_state(struct dc *dc,log_mpc_crc (dc, log_ctx); + { +int hpo_dp_link_enc_count =0 ; + +if (pool->hpo_dp_stream_enc_count >0 ) { +DTN_INFO ("DP HPO S_ENC: Enabled OTG Format Depth Vid SDP Compressed Link\n" ); +for (i =0 ; i < pool->hpo_dp_stream_enc_count; i++) { +struct hpo_dp_stream_encoder_state hpo_dp_se_state = {0 }; +struct hpo_dp_stream_encoder *hpo_dp_stream_enc = pool->hpo_dp_stream_enc[i]; + +if (hpo_dp_stream_enc && hpo_dp_stream_enc->funcs->read_state) { + hpo_dp_stream_enc->funcs->read_state (hpo_dp_stream_enc, &hpo_dp_se_state); + +DTN_INFO ("[%d]: %d %d %6s %d %d %d %d %d\n" , + hpo_dp_stream_enc->id -ENGINE_ID_HPO_DP_0 , + hpo_dp_se_state.stream_enc_enabled, + hpo_dp_se_state.otg_inst, + (hpo_dp_se_state.pixel_encoding ==0 ) ?"4:4:4" : + ((hpo_dp_se_state.pixel_encoding ==1 ) ?"4:2:2" : + (hpo_dp_se_state.pixel_encoding ==2 ) ?"4:2:0" :"Y-Only" ), + (hpo_dp_se_state.component_depth ==0 ) ?6 : + ((hpo_dp_se_state.component_depth ==1 ) ?8 : + (hpo_dp_se_state.component_depth ==2 ) ?10 :12 ), + hpo_dp_se_state.vid_stream_enabled, + hpo_dp_se_state.sdp_enabled, + hpo_dp_se_state.compressed_format, + hpo_dp_se_state.mapped_to_link_enc); + } + } + +DTN_INFO ("\n" ); + } + } +DTN_INFO_END (); }
drivers/gpu/drm/amd/display/dc/dcn31/Makefile +1 -1
@@ -12,7 +12,7 @@ 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 \ - dcn31_apg.o + dcn31_apg.o dcn31_hpo_dp_stream_encoder.o ifdef CONFIG_X86 CFLAGS_$(AMDDALPATH)/dc/dcn31/dcn31_resource.o := -msse
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c new file +749 -0
749 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.h new file +241 -0
241 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c +85 -0
127 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/inc/core_types.h +4 -0
@@ -246,6 +246,8 @@ struct resource_pool {*/ unsigned int dig_link_enc_count; +unsigned int hpo_dp_stream_enc_count; +struct hpo_dp_stream_encoder *hpo_dp_stream_enc[MAX_HPO_DP2_ENCODERS ];#if defined(CONFIG_DRM_AMD_DC_DCN )struct dc_3dlut *mpc_lut[MAX_PIPES ];struct dc_transfer_func *mpc_shaper[MAX_PIPES ];
@@ -298,6 +300,7 @@ struct stream_resource {struct display_stream_compressor *dsc;struct timing_generator *tg;struct stream_encoder *stream_enc; +struct hpo_dp_stream_encoder *hpo_dp_stream_enc;struct audio *audio;struct pixel_clk_params pix_clk_params;
@@ -388,6 +391,7 @@ struct resource_context {struct link_enc_assignment link_enc_assignments[MAX_PIPES ];/* List of available link encoders. Uses engine ID as encoder identifier. */ enum engine_id link_enc_avail[MAX_DIG_LINK_ENCODERS ]; +bool is_hpo_dp_stream_enc_acquired[MAX_HPO_DP2_ENCODERS ];#if defined(CONFIG_DRM_AMD_DC_DCN )bool is_mpc_3dlut_acquired[MAX_PIPES ];#endif
drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h +1 -0
@@ -38,6 +38,7 @@#define MAX_PIPES 6#define MAX_DIG_LINK_ENCODERS 7#define MAX_DWB_PIPES 1 +#define MAX_HPO_DP2_ENCODERS 4struct gamma_curve {uint32_t offset;
drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h +79 -0
83 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/inc/resource.h +4 -0
@@ -49,6 +49,7 @@ struct resource_caps {int num_vmid;int num_dsc;unsigned int num_dig_link_enc;// Total number of DIGs (digital encoders) in DIO (Display Input/Output). +int num_hpo_dp_stream_encoder;int num_mpc_3dlut; };
@@ -68,6 +69,9 @@ struct resource_create_funcs {struct stream_encoder *(*create_stream_encoder)(enum engine_id eng_id,struct dc_context *ctx); +struct hpo_dp_stream_encoder *(*create_hpo_dp_stream_encoder)( +enum engine_id eng_id,struct dc_context *ctx); +struct dce_hwseq *(*create_hwseq)(struct dc_context *ctx); };
drivers/gpu/drm/amd/display/include/grph_object_defs.h +10 -0
@@ -140,6 +140,16 @@ enum sync_source { SYNC_SOURCE_DUAL_GPU_PIN }; +enum tx_ffe_id { +TX_FFE0 =0 , +TX_FFE1 , +TX_FFE2 , +TX_FFE3 , + TX_FFE_DeEmphasis_Only, + TX_FFE_PreShoot_Only, + TX_FFE_No_FFE, +}; +/* connector sizes in millimeters - from BiosParserTypes.hpp */ #define CONNECTOR_SIZE_DVI 40#define CONNECTOR_SIZE_VGA 32
drivers/gpu/drm/amd/display/include/grph_object_id.h +6 -0
@@ -184,6 +184,12 @@ enum engine_id {ENGINE_ID_DACA ,ENGINE_ID_DACB ,ENGINE_ID_VCE ,/* wireless display pseudo-encoder */ +ENGINE_ID_HPO_0 , +ENGINE_ID_HPO_1 , +ENGINE_ID_HPO_DP_0 , +ENGINE_ID_HPO_DP_1 , +ENGINE_ID_HPO_DP_2 , +ENGINE_ID_HPO_DP_3 ,ENGINE_ID_VIRTUAL , ENGINE_ID_COUNT,
Signature · 1 line
2.25.1
PATCH v2 3/6 drm/amd/display: Add DP 2.0 HPO Link Encoder
In reply to Fangzhi ZuoHW Blocks:
+--------+ +-----+ +------+
| OPTC | | HDA | | HUBP |
+--------+ +-----+ +------+
| | |
| | |
HPO ====|==========|========|====
| | v |
| | +-----+ |
| | | APG | |
| | +-----+ |
| | | |
| v v v
| +---------------------+
| | HPO Stream Encoder |
| +---------------------+
| |
| v
| +--------------------+
| | HPO Link Encoder |
v +--------------------+--- drivers/gpu/drm/amd/display/dc/dc_link.h | 2 + .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 32 + drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 2 +- .../display/dc/dcn31/dcn31_dio_link_encoder.c | 4 + .../dc/dcn31/dcn31_hpo_dp_link_encoder.c | 620 ++++++++++++++++++ .../dc/dcn31/dcn31_hpo_dp_link_encoder.h | 222 +++++++ .../drm/amd/display/dc/dcn31/dcn31_resource.c | 50 ++ .../gpu/drm/amd/display/dc/inc/core_types.h | 2 + .../gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 1 + .../drm/amd/display/dc/inc/hw/link_encoder.h | 85 +++ drivers/gpu/drm/amd/display/dc/inc/resource.h | 5 + .../amd/display/include/link_service_types.h | 13 +- 12 files changed, 1036 insertions(+), 2 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_link_encoder.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_link_encoder.h
drivers/gpu/drm/amd/display/dc/dc_link.h +2 -0
@@ -45,6 +45,8 @@ struct dc_link_status {struct link_mst_stream_allocation {/* DIG front */ const struct stream_encoder *stream_enc; +/* HPO DP Stream Encoder */ +const struct hpo_dp_stream_encoder *hpo_dp_stream_enc;/* associate DRM payload table with DC stream encoder */ uint8_t vcp_id;/* number of slots required for the DP stream in transport packet */
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +32 -0
@@ -497,6 +497,38 @@ void dcn10_log_hw_state(struct dc *dc,DTN_INFO ("\n" ); } + +/* log DP HPO L_ENC section if any hpo_dp_link_enc exists */ +for (i =0 ; i < dc->link_count; i++) +if (dc->links[i]->hpo_dp_link_enc) + hpo_dp_link_enc_count++; + +if (hpo_dp_link_enc_count) { +DTN_INFO ("DP HPO L_ENC: Enabled Mode Lanes Stream Slots VC Rate X VC Rate Y\n" ); + +for (i =0 ; i < dc->link_count; i++) { +struct hpo_dp_link_encoder *hpo_dp_link_enc = dc->links[i]->hpo_dp_link_enc; +struct hpo_dp_link_enc_state hpo_dp_le_state = {0 }; + +if (hpo_dp_link_enc && hpo_dp_link_enc->funcs->read_state) { + hpo_dp_link_enc->funcs->read_state (hpo_dp_link_enc, &hpo_dp_le_state); +DTN_INFO ("[%d]: %d %6s %d %d %d %d %d\n" , + hpo_dp_link_enc->inst, + hpo_dp_le_state.link_enc_enabled, + (hpo_dp_le_state.link_mode ==0 ) ?"TPS1" : + (hpo_dp_le_state.link_mode ==1 ) ?"TPS2" : + (hpo_dp_le_state.link_mode ==2 ) ?"ACTIVE" :"TEST" , + hpo_dp_le_state.lane_count, + hpo_dp_le_state.stream_src[0 ], + hpo_dp_le_state.slot_count[0 ], + hpo_dp_le_state.vc_rate_x[0 ], + hpo_dp_le_state.vc_rate_y[0 ]); +DTN_INFO ("\n" ); + } + } + +DTN_INFO ("\n" ); + } }DTN_INFO_END ();
drivers/gpu/drm/amd/display/dc/dcn31/Makefile +1 -1
@@ -12,7 +12,7 @@ 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 \ - dcn31_apg.o dcn31_hpo_dp_stream_encoder.o + dcn31_apg.o dcn31_hpo_dp_stream_encoder.o dcn31_hpo_dp_link_encoder.o ifdef CONFIG_X86 CFLAGS_$(AMDDALPATH)/dc/dcn31/dcn31_resource.o := -msse
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dio_link_encoder.c +4 -0
@@ -320,6 +320,10 @@ void dcn31_link_encoder_construct( enc10->base.features.flags.bits.IS_HBR3_CAPABLE = bp_cap_info.DP_HBR3_EN; enc10->base.features.flags.bits.HDMI_6GB_EN = bp_cap_info.HDMI_6GB_EN; + enc10->base.features.flags.bits.IS_DP2_CAPABLE = bp_cap_info.IS_DP2_CAPABLE; + enc10->base.features.flags.bits.IS_UHBR10_CAPABLE = bp_cap_info.DP_UHBR10_EN; + enc10->base.features.flags.bits.IS_UHBR13_5_CAPABLE = bp_cap_info.DP_UHBR13_5_EN; + enc10->base.features.flags.bits.IS_UHBR20_CAPABLE = bp_cap_info.DP_UHBR20_EN; enc10->base.features.flags.bits.DP_IS_USB_C = bp_cap_info.DP_IS_USB_C; }else {
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_link_encoder.c new file +620 -0
620 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_link_encoder.h new file +222 -0
222 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c +50 -0
92 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/inc/core_types.h +2 -0
@@ -248,6 +248,8 @@ struct resource_pool {unsigned int hpo_dp_stream_enc_count;struct hpo_dp_stream_encoder *hpo_dp_stream_enc[MAX_HPO_DP2_ENCODERS ]; +unsigned int hpo_dp_link_enc_count; +struct hpo_dp_link_encoder *hpo_dp_link_enc[MAX_HPO_DP2_LINK_ENCODERS ];#if defined(CONFIG_DRM_AMD_DC_DCN )struct dc_3dlut *mpc_lut[MAX_PIPES ];struct dc_transfer_func *mpc_shaper[MAX_PIPES ];
drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h +1 -0
@@ -39,6 +39,7 @@#define MAX_DIG_LINK_ENCODERS 7#define MAX_DWB_PIPES 1#define MAX_HPO_DP2_ENCODERS 4 +#define MAX_HPO_DP2_LINK_ENCODERS 2struct gamma_curve {uint32_t offset;
drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h +85 -0
89 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/inc/resource.h +5 -0
@@ -50,6 +50,7 @@ struct resource_caps {int num_dsc;unsigned int num_dig_link_enc;// Total number of DIGs (digital encoders) in DIO (Display Input/Output). int num_hpo_dp_stream_encoder; +int num_hpo_dp_link_encoder;int num_mpc_3dlut; };
@@ -72,6 +73,10 @@ struct resource_create_funcs {struct hpo_dp_stream_encoder *(*create_hpo_dp_stream_encoder)(enum engine_id eng_id,struct dc_context *ctx); +struct hpo_dp_link_encoder *(*create_hpo_dp_link_encoder)( +uint8_t inst, +struct dc_context *ctx); +struct dce_hwseq *(*create_hwseq)(struct dc_context *ctx); };
drivers/gpu/drm/amd/display/include/link_service_types.h +12 -1
@@ -114,13 +114,24 @@ enum dp_test_pattern {DP_TEST_PATTERN_CP2520_2 ,DP_TEST_PATTERN_HBR2_COMPLIANCE_EYE =DP_TEST_PATTERN_CP2520_2 ,DP_TEST_PATTERN_CP2520_3 , + DP_TEST_PATTERN_128b_132b_TPS1, + DP_TEST_PATTERN_128b_132b_TPS2, +DP_TEST_PATTERN_PRBS9 , +DP_TEST_PATTERN_PRBS11 , +DP_TEST_PATTERN_PRBS15 , +DP_TEST_PATTERN_PRBS23 , +DP_TEST_PATTERN_PRBS31 , +DP_TEST_PATTERN_264BIT_CUSTOM , +DP_TEST_PATTERN_SQUARE_PULSE ,/* Link Training Patterns */ DP_TEST_PATTERN_TRAINING_PATTERN1 ,DP_TEST_PATTERN_TRAINING_PATTERN2 ,DP_TEST_PATTERN_TRAINING_PATTERN3 ,DP_TEST_PATTERN_TRAINING_PATTERN4 , -DP_TEST_PATTERN_PHY_PATTERN_END =DP_TEST_PATTERN_TRAINING_PATTERN4 , + DP_TEST_PATTERN_128b_132b_TPS1_TRAINING_MODE, + DP_TEST_PATTERN_128b_132b_TPS2_TRAINING_MODE, +DP_TEST_PATTERN_PHY_PATTERN_END = DP_TEST_PATTERN_128b_132b_TPS2_TRAINING_MODE,/* link test patterns*/ DP_TEST_PATTERN_COLOR_SQUARES,
Signature · 1 line
2.25.1
PATCH v2 4/6 drm/amd/display: Add DP 2.0 DCCG
In reply to Fangzhi ZuoHW Blocks:
+--------+ +-----+ +------+
| OPTC | | HDA | | HUBP |
+--------+ +-----+ +------+
| | |
| | |
HPO ====|==========|========|====
| | v |
| | +-----+ |
| | | APG | |
| | +-----+ |
| | | |
| v v v
| +---------------------+
| | HPO Stream Encoder |
| +---------------------+
| |
| v
| +--------------------+
| | HPO Link Encoder |
| +--------------------+
| |
v ===============|=============
v
+------------------+
| DIO Output Mux |
+------------------+
|
v
+-----+
| PHY |
+-----+
| PHYD32CLK[0]
v
+------+
| DCCG |
+------+
|
v
SYMCLK32--- .../gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 162 ++++++++++++++++++ .../gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h | 18 ++ drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 21 +++ .../amd/display/dc/inc/hw/timing_generator.h | 1 + 4 files changed, 202 insertions(+)
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c +162 -0
@@ -42,6 +42,155 @@#define DC_LOGGER \ dccg->ctx->logger +void dccg31_set_dpstreamclk ( +struct dccg *dccg, +enum hdmistreamclk_source src, +int otg_inst) +{ +struct dcn_dccg *dccg_dcn =TO_DCN_DCCG (dccg); + +/* enabled to select one of the DTBCLKs for pipe */ +switch (otg_inst) { +case 0 : +REG_UPDATE (DPSTREAMCLK_CNTL , +DPSTREAMCLK_PIPE0_EN , (src ==REFCLK ) ?0 :1 ); +break ; +case 1 : +REG_UPDATE (DPSTREAMCLK_CNTL , +DPSTREAMCLK_PIPE1_EN , (src ==REFCLK ) ?0 :1 ); +break ; +case 2 : +REG_UPDATE (DPSTREAMCLK_CNTL , +DPSTREAMCLK_PIPE2_EN , (src ==REFCLK ) ?0 :1 ); +break ; +case 3 : +REG_UPDATE (DPSTREAMCLK_CNTL , +DPSTREAMCLK_PIPE3_EN , (src ==REFCLK ) ?0 :1 ); +break ; +default : +BREAK_TO_DEBUGGER (); +return ; + } +} + +void dccg31_enable_symclk32_se ( +struct dccg *dccg, +int hpo_se_inst, +enum phyd32clk_clock_source phyd32clk) +{ +struct dcn_dccg *dccg_dcn =TO_DCN_DCCG (dccg); + +/* select one of the PHYD32CLKs as the source for symclk32_se */ +switch (hpo_se_inst) { +case 0 : +REG_UPDATE_2 (SYMCLK32_SE_CNTL , +SYMCLK32_SE0_SRC_SEL , phyd32clk, +SYMCLK32_SE0_EN ,1 ); +break ; +case 1 : +REG_UPDATE_2 (SYMCLK32_SE_CNTL , +SYMCLK32_SE1_SRC_SEL , phyd32clk, +SYMCLK32_SE1_EN ,1 ); +break ; +case 2 : +REG_UPDATE_2 (SYMCLK32_SE_CNTL , +SYMCLK32_SE2_SRC_SEL , phyd32clk, +SYMCLK32_SE2_EN ,1 ); +break ; +case 3 : +REG_UPDATE_2 (SYMCLK32_SE_CNTL , +SYMCLK32_SE3_SRC_SEL , phyd32clk, +SYMCLK32_SE3_EN ,1 ); +break ; +default : +BREAK_TO_DEBUGGER (); +return ; + } +} + +void dccg31_disable_symclk32_se ( +struct dccg *dccg, +int hpo_se_inst) +{ +struct dcn_dccg *dccg_dcn =TO_DCN_DCCG (dccg); + +/* set refclk as the source for symclk32_se */ +switch (hpo_se_inst) { +case 0 : +REG_UPDATE_2 (SYMCLK32_SE_CNTL , +SYMCLK32_SE0_SRC_SEL ,0 , +SYMCLK32_SE0_EN ,0 ); +break ; +case 1 : +REG_UPDATE_2 (SYMCLK32_SE_CNTL , +SYMCLK32_SE1_SRC_SEL ,0 , +SYMCLK32_SE1_EN ,0 ); +break ; +case 2 : +REG_UPDATE_2 (SYMCLK32_SE_CNTL , +SYMCLK32_SE2_SRC_SEL ,0 , +SYMCLK32_SE2_EN ,0 ); +break ; +case 3 : +REG_UPDATE_2 (SYMCLK32_SE_CNTL , +SYMCLK32_SE3_SRC_SEL ,0 , +SYMCLK32_SE3_EN ,0 ); +break ; +default : +BREAK_TO_DEBUGGER (); +return ; + } +} + +void dccg31_enable_symclk32_le ( +struct dccg *dccg, +int hpo_le_inst, +enum phyd32clk_clock_source phyd32clk) +{ +struct dcn_dccg *dccg_dcn =TO_DCN_DCCG (dccg); + +/* select one of the PHYD32CLKs as the source for symclk32_le */ +switch (hpo_le_inst) { +case 0 : +REG_UPDATE_2 (SYMCLK32_LE_CNTL , +SYMCLK32_LE0_SRC_SEL , phyd32clk, +SYMCLK32_LE0_EN ,1 ); +break ; +case 1 : +REG_UPDATE_2 (SYMCLK32_LE_CNTL , +SYMCLK32_LE1_SRC_SEL , phyd32clk, +SYMCLK32_LE1_EN ,1 ); +break ; +default : +BREAK_TO_DEBUGGER (); +return ; + } +} + +void dccg31_disable_symclk32_le ( +struct dccg *dccg, +int hpo_le_inst) +{ +struct dcn_dccg *dccg_dcn =TO_DCN_DCCG (dccg); + +/* set refclk as the source for symclk32_le */ +switch (hpo_le_inst) { +case 0 : +REG_UPDATE_2 (SYMCLK32_LE_CNTL , +SYMCLK32_LE0_SRC_SEL ,0 , +SYMCLK32_LE0_EN ,0 ); +break ; +case 1 : +REG_UPDATE_2 (SYMCLK32_LE_CNTL , +SYMCLK32_LE1_SRC_SEL ,0 , +SYMCLK32_LE1_EN ,0 ); +break ; +default : +BREAK_TO_DEBUGGER (); +return ; + } +} + void dccg31_set_physymclk( struct dccg *dccg, int phy_inst,
@@ -241,12 +390,25 @@ static void dccg31_set_dispclk_change_mode(void dccg31_init (struct dccg *dccg) { +/* Set HPO stream encoder to use refclk to avoid case where PHY is +* disabled and SYMCLK32 for HPO SE is sourced from PHYD32CLK which +* will cause DCN to hang. +*/ +dccg31_disable_symclk32_se (dccg,0 ); +dccg31_disable_symclk32_se (dccg,1 ); +dccg31_disable_symclk32_se (dccg,2 ); +dccg31_disable_symclk32_se (dccg,3 ); }static const struct dccg_funcs dccg31_funcs = { .update_dpp_dto = dccg2_update_dpp_dto, .get_dccg_ref_freq = dccg31_get_dccg_ref_freq, .dccg_init = dccg31_init, + .set_dpstreamclk = dccg31_set_dpstreamclk, + .enable_symclk32_se = dccg31_enable_symclk32_se, + .disable_symclk32_se = dccg31_disable_symclk32_se, + .enable_symclk32_le = dccg31_enable_symclk32_le, + .disable_symclk32_le = dccg31_disable_symclk32_le, .set_physymclk = dccg31_set_physymclk, .set_dtbclk_dto = dccg31_set_dtbclk_dto, .set_audio_dtbclk_dto = dccg31_set_audio_dtbclk_dto,
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h +18 -0
@@ -130,6 +130,24 @@ struct dccg *dccg31_create(void dccg31_init (struct dccg *dccg); +void dccg31_enable_symclk32_se ( +struct dccg *dccg, +int hpo_se_inst, +enum phyd32clk_clock_source phyd32clk); + +void dccg31_disable_symclk32_se ( +struct dccg *dccg, +int hpo_se_inst); + +void dccg31_enable_symclk32_le ( +struct dccg *dccg, +int hpo_le_inst, +enum phyd32clk_clock_source phyd32clk); + +void dccg31_disable_symclk32_le ( +struct dccg *dccg, +int hpo_le_inst); + void dccg31_set_physymclk( struct dccg *dccg, int phy_inst,
drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h +21 -0
@@ -79,7 +79,28 @@ struct dccg_funcs {void (*otg_drop_pixel)(struct dccg *dccg,uint32_t otg_inst);void (*dccg_init)(struct dccg *dccg); +void (*set_dpstreamclk)( +struct dccg *dccg, +enum hdmistreamclk_source src, +int otg_inst); + +void (*enable_symclk32_se)( +struct dccg *dccg, +int hpo_se_inst, +enum phyd32clk_clock_source phyd32clk); + +void (*disable_symclk32_se)( +struct dccg *dccg, +int hpo_se_inst); + +void (*enable_symclk32_le)( +struct dccg *dccg, +int hpo_le_inst, +enum phyd32clk_clock_source phyd32clk); +void (*disable_symclk32_le)( +struct dccg *dccg, +int hpo_le_inst); void (*set_physymclk)( struct dccg *dccg, int phy_inst,
drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h +1 -0
@@ -100,6 +100,7 @@ enum crc_selection {enum otg_out_mux_dest {OUT_MUX_DIO =0 , +OUT_MUX_HPO_DP =2 , };enum h_timing_div_mode {
Signature · 1 line
2.25.1
PATCH v2 5/6 drm/amd/display: Add DP 2.0 BIOS and DMUB Support
In reply to Fangzhi ZuoParse DP2 encoder caps and hpo instance from bios
--- drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 8 ++++++++ drivers/gpu/drm/amd/display/dc/bios/command_table2.c | 6 ++++++ .../gpu/drm/amd/display/dc/dcn30/dcn30_dio_link_encoder.c | 4 ++++ drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 4 ++++ drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 2 +- drivers/gpu/drm/amd/display/include/bios_parser_types.h | 6 ++++++ drivers/gpu/drm/amd/include/atomfirmware.h | 4 ++++ 7 files changed, 33 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c +8 -0
@@ -1604,6 +1604,14 @@ static enum bp_result bios_parser_get_encoder_cap_info( ATOM_ENCODER_CAP_RECORD_HBR3_EN) ? 1 : 0; info->HDMI_6GB_EN = (record->encodercaps & ATOM_ENCODER_CAP_RECORD_HDMI6Gbps_EN) ?1 :0 ; + info->IS_DP2_CAPABLE = (record->encodercaps & +ATOM_ENCODER_CAP_RECORD_DP2 ) ?1 :0 ; + info->DP_UHBR10_EN = (record->encodercaps & +ATOM_ENCODER_CAP_RECORD_UHBR10_EN ) ?1 :0 ; + info->DP_UHBR13_5_EN = (record->encodercaps & +ATOM_ENCODER_CAP_RECORD_UHBR13_5_EN ) ?1 :0 ; + info->DP_UHBR20_EN = (record->encodercaps & +ATOM_ENCODER_CAP_RECORD_UHBR20_EN ) ?1 :0 ; info->DP_IS_USB_C = (record->encodercaps &ATOM_ENCODER_CAP_RECORD_USB_C_TYPE ) ?1 :0 ;
drivers/gpu/drm/amd/display/dc/bios/command_table2.c +6 -0
@@ -340,6 +340,11 @@ static enum bp_result transmitter_control_v1_7(const struct command_table_helper *cmd = bp->cmd_helper;struct dmub_dig_transmitter_control_data_v1_7 dig_v1_7 = {0 }; +uint8_t hpo_instance = (uint8_t )cntl->hpo_engine_id -ENGINE_ID_HPO_0 ; + +if (dc_is_dp_signal (cntl->signal)) + hpo_instance = (uint8_t )cntl->hpo_engine_id -ENGINE_ID_HPO_DP_0 ; + dig_v1_7.phyid = cmd->phy_id_to_atom (cntl->transmitter); dig_v1_7.action = (uint8_t )cntl->action;
@@ -353,6 +358,7 @@ static enum bp_result transmitter_control_v1_7( dig_v1_7.hpdsel = cmd->hpd_sel_to_atom (cntl->hpd_sel); dig_v1_7.digfe_sel = cmd->dig_encoder_sel_to_atom (cntl->engine_id); dig_v1_7.connobj_id = (uint8_t )cntl->connector_obj_id.id; + dig_v1_7.HPO_instance = hpo_instance; dig_v1_7.symclk_units.symclk_10khz = cntl->pixel_clock/10 ; if (cntl->action == TRANSMITTER_CONTROL_ENABLE ||
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_link_encoder.c +4 -0
@@ -192,6 +192,10 @@ void dcn30_link_encoder_construct( enc10->base.features.flags.bits.IS_HBR3_CAPABLE = bp_cap_info.DP_HBR3_EN; enc10->base.features.flags.bits.HDMI_6GB_EN = bp_cap_info.HDMI_6GB_EN; + enc10->base.features.flags.bits.IS_DP2_CAPABLE = bp_cap_info.IS_DP2_CAPABLE; + enc10->base.features.flags.bits.IS_UHBR10_CAPABLE = bp_cap_info.DP_UHBR10_EN; + enc10->base.features.flags.bits.IS_UHBR13_5_CAPABLE = bp_cap_info.DP_UHBR13_5_EN; + enc10->base.features.flags.bits.IS_UHBR20_CAPABLE = bp_cap_info.DP_UHBR20_EN; enc10->base.features.flags.bits.DP_IS_USB_C = bp_cap_info.DP_IS_USB_C; }else {
drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h +4 -0
@@ -59,6 +59,10 @@ struct encoder_feature_support { uint32_t IS_TPS3_CAPABLE:1; uint32_t IS_TPS4_CAPABLE:1; uint32_t HDMI_6GB_EN:1; + uint32_t IS_DP2_CAPABLE:1; + uint32_t IS_UHBR10_CAPABLE:1; + uint32_t IS_UHBR13_5_CAPABLE:1; + uint32_t IS_UHBR20_CAPABLE:1; uint32_t DP_IS_USB_C:1; } bits;uint32_t raw;
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h +1 -1
@@ -959,7 +959,7 @@ struct dmub_dig_transmitter_control_data_v1_7 {uint8_t hpdsel;/**< =1: HPD1, =2: HPD2, ..., =6: HPD6, =0: HPD is not assigned */ uint8_t digfe_sel;/**< DIG front-end selection, bit0 means DIG0 FE is enabled */ uint8_t connobj_id;/**< Connector Object Id defined in ObjectId.h */ -uint8_t reserved0;/**< For future use */ +uint8_t HPO_instance;/**< HPO instance (0: inst0, 1: inst1) */ uint8_t reserved1;/**< For future use */ uint8_t reserved2[3 ];/**< For future use */ uint32_t reserved3[11 ];/**< For future use */
drivers/gpu/drm/amd/display/include/bios_parser_types.h +6 -0
@@ -152,6 +152,8 @@ struct bp_transmitter_control {enum signal_type signal;enum dc_color_depth color_depth;/* not used for DCE6.0 */ enum hpd_source_id hpd_sel;/* ucHPDSel, used for DCe6.0 */ +enum tx_ffe_id txffe_sel;/* used for DCN3 */ +enum engine_id hpo_engine_id;/* used for DCN3 */ struct graphics_object_id connector_obj_id;/* symClock; in 10kHz, pixel clock, in HDMI deep color mode, it should * be pixel clock * deep_color_ratio (in KHz)
@@ -319,6 +321,10 @@ struct bp_encoder_cap_info { uint32_t DP_HBR2_EN:1; uint32_t DP_HBR3_EN:1; uint32_t HDMI_6GB_EN:1; + uint32_t IS_DP2_CAPABLE:1; + uint32_t DP_UHBR10_EN:1; + uint32_t DP_UHBR13_5_EN:1; + uint32_t DP_UHBR20_EN:1; uint32_t DP_IS_USB_C:1; uint32_t RESERVED:27; };
drivers/gpu/drm/amd/include/atomfirmware.h +4 -0
@@ -768,6 +768,10 @@ enum atom_encoder_caps_defATOM_ENCODER_CAP_RECORD_HBR2_EN =0x02 ,// DP1.2 HBR2 setting is qualified and HBR2 can be enabled ATOM_ENCODER_CAP_RECORD_HDMI6Gbps_EN =0x04 ,// HDMI2.0 6Gbps enable or not. ATOM_ENCODER_CAP_RECORD_HBR3_EN =0x08 ,// DP1.3 HBR3 is supported by board. +ATOM_ENCODER_CAP_RECORD_DP2 =0x10 ,// DP2 is supported by ASIC/board. +ATOM_ENCODER_CAP_RECORD_UHBR10_EN =0x20 ,// DP2.0 UHBR10 settings is supported by board +ATOM_ENCODER_CAP_RECORD_UHBR13_5_EN =0x40 ,// DP2.0 UHBR13.5 settings is supported by board +ATOM_ENCODER_CAP_RECORD_UHBR20_EN =0x80 ,// DP2.0 UHBR20 settings is supported by board ATOM_ENCODER_CAP_RECORD_USB_C_TYPE =0x100, // the DP connector is a USB-C type. };
Signature · 1 line
2.25.1
PATCH v2 6/6 drm/amd/display: Add DP 2.0 SST DC Support
In reply to Fangzhi Zuo1. Retrieve 128/132b link cap.
2. 128/132b link training and payload allocation.
3. UHBR10 link rate support.
--- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 6 + drivers/gpu/drm/amd/display/dc/core/dc.c | 17 + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 503 +++++++- .../gpu/drm/amd/display/dc/core/dc_link_dp.c | 1071 +++++++++++++++-- .../drm/amd/display/dc/core/dc_link_hwss.c | 291 ++++- .../gpu/drm/amd/display/dc/core/dc_resource.c | 104 ++ drivers/gpu/drm/amd/display/dc/dc.h | 17 +- drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 199 ++- drivers/gpu/drm/amd/display/dc/dc_link.h | 1 + drivers/gpu/drm/amd/display/dc/dc_types.h | 15 + .../display/dc/dce110/dce110_hw_sequencer.c | 86 +- .../amd/display/dc/dcn10/dcn10_link_encoder.c | 9 + .../drm/amd/display/dc/dcn20/dcn20_hwseq.c | 26 +- .../drm/amd/display/dc/dcn20/dcn20_resource.c | 4 + .../drm/amd/display/dc/dcn31/dcn31_resource.c | 18 +- drivers/gpu/drm/amd/display/dc/dm_cp_psp.h | 1 + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 2 + .../gpu/drm/amd/display/dc/inc/dc_link_dp.h | 22 + .../amd/display/dc/inc/hw_sequencer_private.h | 1 + drivers/gpu/drm/amd/display/dc/inc/resource.h | 3 + .../gpu/drm/amd/display/include/dpcd_defs.h | 14 +- .../amd/display/include/link_service_types.h | 18 +- .../drm/amd/display/include/logger_types.h | 2 + 23 files changed, 2201 insertions(+), 229 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +6 -0
@@ -751,3 +751,9 @@ void dm_helpers_mst_enable_stream_features(const struct dc_stream_state *stream) &new_downspread.raw, sizeof(new_downspread)); } + +void dm_set_phyd32clk (struct dc_context *ctx,int freq_khz) +{ +// FPGA programming for this clock in diags framework that +// needs to go through dm layer, therefore leave dummy interace here +}
drivers/gpu/drm/amd/display/dc/core/dc.c +17 -0
@@ -186,6 +186,7 @@ static bool create_links(int i;int connectors_num;struct dc_bios *bios = dc->ctx->dc_bios; +int dp_hpo_link_count =0 ; dc->link_count =0 ;
@@ -255,6 +256,22 @@ static bool create_links( goto failed_alloc; } +if (IS_FPGA_MAXIMUS_DC (dc->ctx->dce_environment) && + dc->caps.dp_hpo && + link->dc->res_pool->res_cap->num_hpo_dp_link_encoder >0 ) { +/* FPGA case - Allocate HPO DP link encoder */ +if (i < link->dc->res_pool->res_cap->num_hpo_dp_link_encoder) { + link->hpo_dp_link_enc = link->dc->res_pool->hpo_dp_link_enc[i]; + +if (link->hpo_dp_link_enc ==NULL ) { +BREAK_TO_DEBUGGER (); + goto failed_alloc; + } + link->hpo_dp_link_enc->hpd_source = link->link_enc->hpd_source; + link->hpo_dp_link_enc->transmitter = link->link_enc->transmitter; + } + } + link->link_status.dpcd_caps = &link->dpcd_caps; enc_init.ctx = dc->ctx;
drivers/gpu/drm/amd/display/dc/core/dc_link.c +452 -51
657 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +964 -107
1,441 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c +261 -30
374 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +104 -0
149 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dc.h +15 -2
@@ -183,6 +183,7 @@ struct dc_caps {unsigned int cursor_cache_size;struct dc_plane_cap planes[MAX_PLANES ];struct dc_color_caps color; +bool dp_hpo;bool vbios_lttpr_aware;bool vbios_lttpr_enable; };
@@ -289,7 +290,13 @@ struct dc_cap_funcs {struct link_training_settings ; - +union allow_lttpr_non_transparent_mode { +struct { +bool DP1_4A :1 ; +bool DP2_0 :1 ; + } bits; +unsigned char raw; +};/* Structure to hold configuration flags set by dm at dc creation. */ struct dc_config {bool gpu_vm_support;
@@ -302,7 +309,7 @@ struct dc_config {bool edp_no_power_sequencing;bool force_enum_edp;bool forced_clocks; -bool allow_lttpr_non_transparent_mode; +union allow_lttpr_non_transparent_mode allow_lttpr_non_transparent_mode;bool multi_mon_pp_mclk_switch;bool disable_dmcu;bool enable_4to1MPC;
@@ -614,6 +621,8 @@ struct dc_debug_options {bool enable_dmcub_surface_flip;bool usbc_combo_phy_reset_wa;bool enable_dram_clock_change_one_display_vactive; +/* TODO - remove once tested */ +bool legacy_dp2_lt;union mem_low_power_enable_options enable_mem_low_power;bool force_vblank_alignment;
@@ -1146,6 +1155,10 @@ struct dpcd_caps {struct dc_lttpr_caps lttpr_caps;struct psr_caps psr_caps; +union dp_128b_132b_supported_link_rates dp_128b_132b_supported_link_rates; +union dp_main_line_channel_coding_cap channel_coding_cap; +union dp_sink_video_fallback_formats fallback_formats; +union dp_fec_capability1 fec_cap1; };union dpcd_sink_ext_caps {
drivers/gpu/drm/amd/display/dc/dc_dp_types.h +190 -9
278 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dc_link.h +1 -0
@@ -152,6 +152,7 @@ struct dc_link {struct panel_cntl *panel_cntl;struct link_encoder *link_enc; +struct hpo_dp_link_encoder *hpo_dp_link_enc;struct graphics_object_id link_id;/* Endpoint type distinguishes display endpoints which do not have entries * in the BIOS connector table from those that do. Helps when tracking link
drivers/gpu/drm/amd/display/dc/dc_types.h +15 -0
@@ -395,9 +395,23 @@ struct dc_lttpr_caps {uint8_t max_link_rate;uint8_t phy_repeater_cnt;uint8_t max_ext_timeout; +union dp_main_link_channel_coding_lttpr_cap main_link_channel_coding; +union dp_128b_132b_supported_lttpr_link_rates supported_128b_132b_rates;uint8_t aux_rd_interval[MAX_REPEATER_CNT -1 ]; };
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +67 -19
86 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_link_encoder.c +9 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +22 -4
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +4 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c +13 -5
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/dm_cp_psp.h +1 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/dm_helpers.h +2 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h +22 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/inc/hw_sequencer_private.h +1 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/inc/resource.h +3 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/include/dpcd_defs.h +13 -1
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/include/link_service_types.h +17 -1
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/include/logger_types.h +2 -0
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.25.1
Part of the diff is not shown here. View the raw message.