DC Patches June 10, 2021
Subsystems (5)
cover DC Patches June 10, 2021
This DC patchset brings improvements in multiple areas. In summary, we have:
* LTTPR improvements
* Backlight improvements
* eDP hotplug detection
*** BLURB HERE ***
Anthony Koo (1):
drm/amd/display: [FW Promotion] Release 0.0.70
Aric Cyr (1):
drm/amd/display: 3.2.140
Ashley Thomas (1):
drm/amd/display: add DMUB registers to crash dump diagnostic data.
David Galiffi (1):
drm/amd/display: Updated variable name.
Dmytro Laktyushkin (1):
drm/amd/display: Remove unnecessary blank lines
Josip Pavic (1):
drm/amd/display: tune backlight ramping profiles
Po-Ting Chen (1):
drm/amd/display: Change swizzle visual confirm reference pipe
Roman Li (1):
drm/amd/display: move psr dm interface to separate files
Wenjing Liu (1):
drm/amd/display: dp mst detection code refactor
Wesley Chalmers (14):
drm/amd/display: Read LTTPR caps first on hotplug drm/amd/display: Move LTTPR cap read into its own function drm/amd/display: Read LTTPR caps first on bootup drm/amd/display: Set LTTPR Transparent Mode after read link cap drm/amd/display: Always write repeater mode regardless of LTTPR drm/amd/display: Improve logic for is_lttpr_present drm/amd/display: Enforce DPCD Address ranges drm/amd/display: Rename constant
drm/amd/display: 7 retries + 50 ms timeout on AUX DEFER drm/amd/display: Do not count I2C DEFERs with AUX DEFERs drm/amd/display: Partition DPCD address space and break up
transactions
drm/amd/display: Add interface to get Calibrated Avg Level from FIFO drm/amd/display: Cover edge-case when changing DISPCLK WDIVIDER drm/amd/display: Extend AUX timeout for DP initial reads
Yi-Ling Chen (1):
drm/amd/display: add config option for eDP hotplug detection
.../gpu/drm/amd/display/amdgpu_dm/Makefile | 2 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 137 +---------- .../drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 166 +++++++++++++ .../drm/amd/display/amdgpu_dm/amdgpu_dm_psr.h | 37 +++ drivers/gpu/drm/amd/display/dc/Makefile | 2 +- .../display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 68 +++++- .../display/dc/clk_mgr/dcn20/dcn20_clk_mgr.h | 3 +- .../display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 4 +- .../drm/amd/display/dc/core/dc_hw_sequencer.c | 10 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 167 ++++++-------- .../gpu/drm/amd/display/dc/core/dc_link_dp.c | 170 +++++++------- .../drm/amd/display/dc/core/dc_link_dpcd.c | 218 ++++++++++++++++++ .../drm/amd/display/dc/core/dc_link_hwss.c | 31 +-- drivers/gpu/drm/amd/display/dc/dc.h | 3 +- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 100 +++++++- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 4 + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 23 +- .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 5 + .../display/dc/dcn10/dcn10_stream_encoder.h | 24 ++ .../display/dc/dcn20/dcn20_stream_encoder.c | 12 + .../display/dc/dcn20/dcn20_stream_encoder.h | 3 + .../dc/dcn30/dcn30_dio_stream_encoder.c | 2 + .../dc/dcn30/dcn30_dio_stream_encoder.h | 12 + .../drm/amd/display/dc/dcn30/dcn30_hwseq.c | 4 + .../drm/amd/display/dc/dcn31/dcn31_hwseq.c | 1 + .../drm/amd/display/dc/dml/display_mode_vba.c | 2 - .../gpu/drm/amd/display/dc/hdcp/hdcp_msg.c | 1 + .../gpu/drm/amd/display/dc/inc/dc_link_dp.h | 11 +- .../amd/display/dc/inc/hw/stream_encoder.h | 3 + .../gpu/drm/amd/display/dc/inc/link_dpcd.h | 18 ++ .../gpu/drm/amd/display/dc/inc/link_hwss.h | 14 -- drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 29 +++ .../gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 4 +- .../gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 65 +++++- .../gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 14 +- .../gpu/drm/amd/display/dmub/src/dmub_dcn21.c | 5 +- .../gpu/drm/amd/display/dmub/src/dmub_dcn30.c | 5 +- .../drm/amd/display/dmub/src/dmub_dcn301.c | 5 +- .../drm/amd/display/dmub/src/dmub_dcn302.c | 5 +- .../drm/amd/display/dmub/src/dmub_dcn303.c | 5 +- .../gpu/drm/amd/display/dmub/src/dmub_srv.c | 10 + .../amd/display/modules/power/power_helpers.c | 20 +- .../include/asic_reg/dcn/dcn_3_0_1_sh_mask.h | 2 + .../include/asic_reg/dcn/dcn_3_1_2_sh_mask.h | 2 + include/drm/drm_dp_helper.h | 17 ++ 45 files changed, 1042 insertions(+), 403 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.h create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_link_dpcd.c create mode 100644 drivers/gpu/drm/amd/display/dc/inc/link_dpcd.h
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 1/24 drm/amd/display: Remove unnecessary blank lines
From: Dmytro Laktyushkin <[email protected]>
cleanup
--- drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c +0 -2
@@ -159,7 +159,6 @@ dml_get_pipe_attr_func(refcyc_per_meta_chunk_vblank_l_in_us, mode_lib->vba.TimePdml_get_pipe_attr_func (refcyc_per_meta_chunk_vblank_c_in_us, mode_lib->vba.TimePerChromaMetaChunkVBlank);dml_get_pipe_attr_func (refcyc_per_meta_chunk_flip_l_in_us, mode_lib->vba.TimePerMetaChunkFlip);dml_get_pipe_attr_func (refcyc_per_meta_chunk_flip_c_in_us, mode_lib->vba.TimePerChromaMetaChunkFlip); -dml_get_pipe_attr_func (vstartup, mode_lib->vba.VStartup);dml_get_pipe_attr_func (vupdate_offset, mode_lib->vba.VUpdateOffsetPix);dml_get_pipe_attr_func (vupdate_width, mode_lib->vba.VUpdateWidthPix);
@@ -419,7 +418,6 @@ static void fetch_pipe_params(struct display_mode_lib *mode_lib) visited[j] = true; mode_lib->vba.pipe_plane[j] = mode_lib->vba.NumberOfActivePlanes; - mode_lib->vba.DPPPerPlane[mode_lib->vba.NumberOfActivePlanes] =1 ; mode_lib->vba.SourceScan[mode_lib->vba.NumberOfActivePlanes] = (enum scan_direction_class ) (src->source_scan);
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/24 drm/amd/display: add DMUB registers to crash dump diagnostic data.
In reply to Anson JacobFrom: Ashley Thomas <[email protected]>
[WHY]
Ability to triage DMCUB is improved with availability of certain dmub registers not currently captured in crash dump diagnostic data.
[HOW]
Add dmub registers to diagnostic data collection.
Thanks Nicholas Kazlauskas for awesome input on this!
--- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 100 +++++++++++++++++- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 4 + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 29 +++++ .../gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 65 +++++++++++- .../gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 14 ++- .../gpu/drm/amd/display/dmub/src/dmub_dcn21.c | 5 +- .../gpu/drm/amd/display/dmub/src/dmub_dcn30.c | 5 +- .../drm/amd/display/dmub/src/dmub_dcn301.c | 5 +- .../drm/amd/display/dmub/src/dmub_dcn302.c | 5 +- .../drm/amd/display/dmub/src/dmub_dcn303.c | 5 +- .../gpu/drm/amd/display/dmub/src/dmub_srv.c | 10 ++ 11 files changed, 238 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c +98 -2
@@ -86,6 +86,7 @@ void dc_dmub_srv_cmd_queue(struct dc_dmub_srv *dc_dmub_srv, error:DC_ERROR ("Error queuing DMUB command: status=%d\n" , status); +dc_dmub_srv_log_diagnostic_data (dc_dmub_srv); }void dc_dmub_srv_cmd_execute (struct dc_dmub_srv *dc_dmub_srv)
@@ -95,8 +96,10 @@ void dc_dmub_srv_cmd_execute(struct dc_dmub_srv *dc_dmub_srv)enum dmub_status status; status =dmub_srv_cmd_execute (dmub); -if (status !=DMUB_STATUS_OK ) +if (status !=DMUB_STATUS_OK ) {DC_ERROR ("Error starting DMUB execution: status=%d\n" , status); +dc_dmub_srv_log_diagnostic_data (dc_dmub_srv); + } }void dc_dmub_srv_wait_idle (struct dc_dmub_srv *dc_dmub_srv)
@@ -106,8 +109,10 @@ void dc_dmub_srv_wait_idle(struct dc_dmub_srv *dc_dmub_srv)enum dmub_status status; status =dmub_srv_wait_for_idle (dmub,100000 ); -if (status !=DMUB_STATUS_OK ) +if (status !=DMUB_STATUS_OK ) {DC_ERROR ("Error waiting for DMUB idle: status=%d\n" , status); +dc_dmub_srv_log_diagnostic_data (dc_dmub_srv); + } } void dc_dmub_srv_send_inbox0_cmd(struct dc_dmub_srv *dmub_srv,
@@ -214,3 +219,94 @@ void dc_dmub_trace_event_control(struct dc *dc, bool enable) {dm_helpers_dmub_outbox_interrupt_control (dc->ctx, enable); } + +bool dc_dmub_srv_get_diagnostic_data (struct dc_dmub_srv *dc_dmub_srv,struct dmub_diagnostic_data *diag_data) +{ +if (!dc_dmub_srv || !dc_dmub_srv->dmub || !diag_data) +return false; +return dmub_srv_get_diagnostic_data (dc_dmub_srv->dmub, diag_data); +} + +void dc_dmub_srv_log_diagnostic_data (struct dc_dmub_srv *dc_dmub_srv) +{ +struct dmub_diagnostic_data diag_data = {0 }; + +if (!dc_dmub_srv || !dc_dmub_srv->dmub) { +DC_LOG_ERROR ("%s: invalid parameters." , __func__); +return ; + } + +if (!dc_dmub_srv_get_diagnostic_data (dc_dmub_srv, &diag_data)) { +DC_LOG_ERROR ("%s: dc_dmub_srv_get_diagnostic_data failed." , __func__); +return ; + } + +DC_LOG_DEBUG ( +"DMCUB STATE\n" +" dmcub_version : %08x\n" +" scratch [0] : %08x\n" +" scratch [1] : %08x\n" +" scratch [2] : %08x\n" +" scratch [3] : %08x\n" +" scratch [4] : %08x\n" +" scratch [5] : %08x\n" +" scratch [6] : %08x\n" +" scratch [7] : %08x\n" +" scratch [8] : %08x\n" +" scratch [9] : %08x\n" +" scratch [10] : %08x\n" +" scratch [11] : %08x\n" +" scratch [12] : %08x\n" +" scratch [13] : %08x\n" +" scratch [14] : %08x\n" +" scratch [15] : %08x\n" +" pc : %08x\n" +" unk_fault_addr : %08x\n" +" inst_fault_addr : %08x\n" +" data_fault_addr : %08x\n" +" inbox1_rptr : %08x\n" +" inbox1_wptr : %08x\n" +" inbox1_size : %08x\n" +" inbox0_rptr : %08x\n" +" inbox0_wptr : %08x\n" +" inbox0_size : %08x\n" +" is_enabled : %d\n" +" is_soft_reset : %d\n" +" is_secure_reset : %d\n" +" is_traceport_en : %d\n" +" is_cw0_en : %d\n" +" is_cw6_en : %d\n" , + diag_data.dmcub_version, + diag_data.scratch[0 ], + diag_data.scratch[1 ], + diag_data.scratch[2 ], + diag_data.scratch[3 ], + diag_data.scratch[4 ], + diag_data.scratch[5 ], + diag_data.scratch[6 ], + diag_data.scratch[7 ], + diag_data.scratch[8 ], + diag_data.scratch[9 ], + diag_data.scratch[10 ], + diag_data.scratch[11 ], + diag_data.scratch[12 ], + diag_data.scratch[13 ], + diag_data.scratch[14 ], + diag_data.scratch[15 ], + diag_data.pc, + diag_data.undefined_address_fault_addr, + diag_data.inst_fetch_fault_addr, + diag_data.data_write_fault_addr, + diag_data.inbox1_rptr, + diag_data.inbox1_wptr, + diag_data.inbox1_size, + diag_data.inbox0_rptr, + diag_data.inbox0_wptr, + diag_data.inbox0_size, + diag_data.is_dmcub_enabled, + diag_data.is_dmcub_soft_reset, + diag_data.is_dmcub_secure_reset, + diag_data.is_traceport_en, + diag_data.is_cw0_enabled, + diag_data.is_cw6_enabled); +}
drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h +4 -0
@@ -71,4 +71,8 @@ void dc_dmub_trace_event_control(struct dc *dc, bool enable);void dc_dmub_srv_send_inbox0_cmd (struct dc_dmub_srv *dmub_srv,union dmub_inbox0_data_register data); +bool dc_dmub_srv_get_diagnostic_data (struct dc_dmub_srv *dc_dmub_srv,struct dmub_diagnostic_data *dmub_oca); + +void dc_dmub_srv_log_diagnostic_data (struct dc_dmub_srv *dc_dmub_srv); +#endif /* _DMUB_DC_SRV_H_ */
drivers/gpu/drm/amd/display/dmub/dmub_srv.h +29 -0
@@ -243,6 +243,31 @@ struct dmub_srv_hw_params {#endif }; +/** +* struct dmub_diagnostic_data - Diagnostic data retrieved from DMCUB for +* debugging purposes, including logging, crash analysis, etc. +*/ +struct dmub_diagnostic_data { +uint32_t dmcub_version; +uint32_t scratch[16 ]; +uint32_t pc; +uint32_t undefined_address_fault_addr; +uint32_t inst_fetch_fault_addr; +uint32_t data_write_fault_addr; +uint32_t inbox1_rptr; +uint32_t inbox1_wptr; +uint32_t inbox1_size; +uint32_t inbox0_rptr; +uint32_t inbox0_wptr; +uint32_t inbox0_size; +uint8_t is_dmcub_enabled :1 ; +uint8_t is_dmcub_soft_reset :1 ; +uint8_t is_dmcub_secure_reset :1 ; +uint8_t is_traceport_en :1 ; +uint8_t is_cw0_enabled :1 ; +uint8_t is_cw6_enabled :1 ; +}; +/** * struct dmub_srv_base_funcs - Driver specific base callbacks */
@@ -335,6 +360,8 @@ struct dmub_srv_hw_funcs {void (*send_inbox0_cmd)(struct dmub_srv *dmub,union dmub_inbox0_data_register data);uint32_t (*get_current_time)(struct dmub_srv *dmub); + +void (*get_diagnostic_data)(struct dmub_srv *dmub,struct dmub_diagnostic_data *dmub_oca); };/**
@@ -685,6 +712,8 @@ enum dmub_status dmub_srv_cmd_with_reply_data(struct dmub_srv *dmub,bool dmub_srv_get_outbox0_msg (struct dmub_srv *dmub,struct dmcub_trace_buf_entry *entry); +bool dmub_srv_get_diagnostic_data (struct dmub_srv *dmub,struct dmub_diagnostic_data *diag_data); +#if defined(__cplusplus) }#endif
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c +64 -1
74 lines not on this page · raw message
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h +13 -1
@@ -36,6 +36,9 @@ struct dmub_srv; DMUB_SR(DMCUB_CNTL) \ DMUB_SR(DMCUB_MEM_CNTL) \ DMUB_SR(DMCUB_SEC_CNTL) \ + DMUB_SR(DMCUB_INBOX0_SIZE) \ + DMUB_SR(DMCUB_INBOX0_RPTR) \ + DMUB_SR(DMCUB_INBOX0_WPTR) \ DMUB_SR(DMCUB_INBOX1_BASE_ADDRESS) \ DMUB_SR(DMCUB_INBOX1_SIZE) \ DMUB_SR(DMCUB_INBOX1_RPTR) \
@@ -108,7 +111,12 @@ struct dmub_srv; DMUB_SR(DCN_VM_FB_LOCATION_BASE) \ DMUB_SR(DCN_VM_FB_OFFSET) \ DMUB_SR(DMCUB_INTERRUPT_ACK) \ - DMUB_SR(DMCUB_TIMER_CURRENT) + DMUB_SR(DMCUB_TIMER_CURRENT) \ + DMUB_SR(DMCUB_INST_FETCH_FAULT_ADDR) \ + DMUB_SR(DMCUB_UNDEFINED_ADDRESS_FAULT_ADDR) \ + DMUB_SR(DMCUB_DATA_WRITE_FAULT_ADDR) + +#define DMCUB_INTERNAL_REGS() #define DMUB_COMMON_FIELDS() \ DMUB_SF(DMCUB_CNTL, DMCUB_ENABLE) \
@@ -118,6 +126,7 @@ struct dmub_srv; DMUB_SF(DMCUB_MEM_CNTL, DMCUB_MEM_WRITE_SPACE) \ DMUB_SF(DMCUB_SEC_CNTL, DMCUB_SEC_RESET) \ DMUB_SF(DMCUB_SEC_CNTL, DMCUB_MEM_UNIT_ID) \ + DMUB_SF(DMCUB_SEC_CNTL, DMCUB_SEC_RESET_STATUS) \ DMUB_SF(DMCUB_REGION3_CW0_TOP_ADDRESS, DMCUB_REGION3_CW0_TOP_ADDRESS) \ DMUB_SF(DMCUB_REGION3_CW0_TOP_ADDRESS, DMCUB_REGION3_CW0_ENABLE) \DMUB_SF (DMCUB_REGION3_CW1_TOP_ADDRESS ,DMCUB_REGION3_CW1_TOP_ADDRESS ) \
@@ -147,6 +156,7 @@ struct dmub_srv;struct dmub_srv_common_reg_offset {#define DMUB_SR (reg) uint32_t reg; DMUB_COMMON_REGS() + DMCUB_INTERNAL_REGS()#undef DMUB_SR };
@@ -234,4 +244,6 @@ bool dmub_dcn20_use_cached_trace_buffer(struct dmub_srv *dmub);uint32_t dmub_dcn20_get_current_time (struct dmub_srv *dmub); +void dmub_dcn20_get_diagnostic_data (struct dmub_srv *dmub,struct dmub_diagnostic_data *dmub_oca); +#endif /* _DMUB_DCN20_H_ */
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.c +4 -1
@@ -39,7 +39,10 @@const struct dmub_srv_common_regs dmub_srv_dcn21_regs = { #define DMUB_SR(reg) REG_OFFSET(reg), - {DMUB_COMMON_REGS () }, + { + DMUB_COMMON_REGS() +DMCUB_INTERNAL_REGS () + }, #undef DMUB_SR #define DMUB_SF(reg, field) FD_MASK(reg, field),
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c +4 -1
@@ -40,7 +40,10 @@const struct dmub_srv_common_regs dmub_srv_dcn30_regs = { #define DMUB_SR(reg) REG_OFFSET(reg), - {DMUB_COMMON_REGS () }, + { + DMUB_COMMON_REGS() +DMCUB_INTERNAL_REGS () + }, #undef DMUB_SR #define DMUB_SF(reg, field) FD_MASK(reg, field),
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn301.c +4 -1
@@ -39,7 +39,10 @@const struct dmub_srv_common_regs dmub_srv_dcn301_regs = { #define DMUB_SR(reg) REG_OFFSET(reg), - {DMUB_COMMON_REGS () }, + { + DMUB_COMMON_REGS() +DMCUB_INTERNAL_REGS () + }, #undef DMUB_SR #define DMUB_SF(reg, field) FD_MASK(reg, field),
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn302.c +4 -1
@@ -39,7 +39,10 @@const struct dmub_srv_common_regs dmub_srv_dcn302_regs = { #define DMUB_SR(reg) REG_OFFSET(reg), - {DMUB_COMMON_REGS () }, + { + DMUB_COMMON_REGS() +DMCUB_INTERNAL_REGS () + }, #undef DMUB_SR #define DMUB_SF(reg, field) FD_MASK(reg, field),
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn303.c +4 -1
@@ -21,7 +21,10 @@const struct dmub_srv_common_regs dmub_srv_dcn303_regs = { #define DMUB_SR(reg) REG_OFFSET(reg), - {DMUB_COMMON_REGS () }, + { + DMUB_COMMON_REGS() +DMCUB_INTERNAL_REGS () + }, #undef DMUB_SR #define DMUB_SF(reg, field) FD_MASK(reg, field),
drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c +10 -0
@@ -176,6 +176,8 @@ static bool dmub_srv_hw_setup(struct dmub_srv *dmub, enum dmub_asic asic) funcs->get_outbox0_wptr = dmub_dcn20_get_outbox0_wptr; funcs->set_outbox0_rptr = dmub_dcn20_set_outbox0_rptr; + funcs->get_diagnostic_data = dmub_dcn20_get_diagnostic_data; +if (asic ==DMUB_ASIC_DCN21 ) { dmub->regs = &dmub_srv_dcn21_regs;
@@ -794,3 +796,11 @@ bool dmub_srv_get_outbox0_msg(struct dmub_srv *dmub, struct dmcub_trace_buf_entrreturn dmub_rb_out_trace_buffer_front (&dmub->outbox0_rb, (void *)entry); } + +bool dmub_srv_get_diagnostic_data (struct dmub_srv *dmub,struct dmub_diagnostic_data *diag_data) +{ +if (!dmub || !dmub->hw_funcs.get_diagnostic_data || !diag_data) +return false; + dmub->hw_funcs.get_diagnostic_data (dmub, diag_data); +return true; +}
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/24 drm/amd/display: add config option for eDP hotplug detection
In reply to Anson JacobFrom: Yi-Ling Chen <[email protected]>
[Why]
Some custom platforms use eDP hotplug events to notify panel capability changes that should be reported
[How]
Add a DC config option that unblocks eDP hotplug events
--- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 10 ++++++---- drivers/gpu/drm/amd/display/dc/dc.h | 1 + 2 files changed, 7 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link.c +6 -4
@@ -904,9 +904,10 @@ static bool dc_link_detect_helper(struct dc_link *link,if (dc_is_virtual_signal (link->connector_signal))return false; -if ((link->connector_signal ==SIGNAL_TYPE_LVDS || - link->connector_signal ==SIGNAL_TYPE_EDP ) && - link->local_sink) { +if (((link->connector_signal ==SIGNAL_TYPE_LVDS || + link->connector_signal ==SIGNAL_TYPE_EDP ) && + (!link->dc->config.allow_edp_hotplug_detection)) && + link->local_sink) {// need to re-write OUI and brightness in resume case if (link->connector_signal ==SIGNAL_TYPE_EDP ) {dpcd_set_source_specific_data (link);
@@ -1501,7 +1502,8 @@ static bool dc_link_construct(struct dc_link *link, link->connector_signal =SIGNAL_TYPE_EDP ;if (link->hpd_gpio) { - link->irq_source_hpd =DC_IRQ_SOURCE_INVALID ; +if (!link->dc->config.allow_edp_hotplug_detection) + link->irq_source_hpd =DC_IRQ_SOURCE_INVALID ; link->irq_source_hpd_rx =dal_irq_get_rx_source (link->hpd_gpio); }
drivers/gpu/drm/amd/display/dc/dc.h +1 -0
@@ -303,6 +303,7 @@ struct dc_config {bool multi_mon_pp_mclk_switch;bool disable_dmcu;bool enable_4to1MPC; +bool allow_edp_hotplug_detection;#if defined(CONFIG_DRM_AMD_DC_DCN )bool clamp_min_dcfclk;#endif
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/24 drm/amd/display: tune backlight ramping profiles
In reply to Anson JacobFrom: Josip Pavic <[email protected]>
[Why & How]
Tune backlight ramping profiles for each Vari-Bright level to suit customer preferences
--- .../amd/display/modules/power/power_helpers.c | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/display/modules/power/power_helpers.c +10 -10
@@ -87,19 +87,19 @@ struct abm_parameters { };static const struct abm_parameters abm_settings_config0[abm_defines_max_level] = { -// min_red max_red bright_pos dark_pos bright_gain contrast dev min_knee max_knee blStart blRed - {0xff ,0xbf ,0x20 ,0x00 ,0xff ,0x99 ,0xb3 ,0x40 ,0xe0 ,0xCCCC ,0xCCCC }, - {0xde ,0x85 ,0x20 ,0x00 ,0xff ,0x90 ,0xa8 ,0x40 ,0xdf ,0xCCCC ,0xCCCC }, - {0xb0 ,0x50 ,0x20 ,0x00 ,0xc0 ,0x88 ,0x78 ,0x70 ,0xa0 ,0xCCCC ,0xCCCC }, - {0x82 ,0x40 ,0x20 ,0x00 ,0x00 ,0xff ,0xb3 ,0x70 ,0x70 ,0xCCCC ,0xCCCC }, +// min_red max_red bright_pos dark_pos bright_gain contrast dev min_knee max_knee blRed blStart + {0xff ,0xbf ,0x20 ,0x00 ,0xff ,0x99 ,0xb3 ,0x40 ,0xe0 ,0xf777 ,0xcccc }, + {0xde ,0x85 ,0x20 ,0x00 ,0xe0 ,0x90 ,0xa8 ,0x40 ,0xc8 ,0xf777 ,0xcccc }, + {0xb0 ,0x50 ,0x20 ,0x00 ,0xc0 ,0x88 ,0x78 ,0x70 ,0xa0 ,0xeeee ,0x9999 }, + {0x82 ,0x40 ,0x20 ,0x00 ,0x00 ,0xb8 ,0xb3 ,0x70 ,0x70 ,0xe333 ,0xb333 }, };static const struct abm_parameters abm_settings_config1[abm_defines_max_level] = { -// min_red max_red bright_pos dark_pos bright_gain contrast dev min_knee max_knee blStart blRed - {0xf0 ,0xd9 ,0x20 ,0x00 ,0x00 ,0xff ,0xb3 ,0x70 ,0x70 ,0xCCCC ,0xCCCC }, - {0xcd ,0xa5 ,0x20 ,0x00 ,0x00 ,0xff ,0xb3 ,0x70 ,0x70 ,0xCCCC ,0xCCCC }, - {0x99 ,0x65 ,0x20 ,0x00 ,0x00 ,0xff ,0xb3 ,0x70 ,0x70 ,0xCCCC ,0xCCCC }, - {0x82 ,0x4d ,0x20 ,0x00 ,0x00 ,0xff ,0xb3 ,0x70 ,0x70 ,0xCCCC ,0xCCCC }, +// min_red max_red bright_pos dark_pos bright_gain contrast dev min_knee max_knee blRed blStart + {0xf0 ,0xd9 ,0x20 ,0x00 ,0x00 ,0xff ,0xb3 ,0x70 ,0x70 ,0xcccc ,0xcccc }, + {0xcd ,0xa5 ,0x20 ,0x00 ,0x00 ,0xff ,0xb3 ,0x70 ,0x70 ,0xcccc ,0xcccc }, + {0x99 ,0x65 ,0x20 ,0x00 ,0x00 ,0xff ,0xb3 ,0x70 ,0x70 ,0xcccc ,0xcccc }, + {0x82 ,0x4d ,0x20 ,0x00 ,0x00 ,0xff ,0xb3 ,0x70 ,0x70 ,0xcccc ,0xcccc }, };static const struct abm_parameters *const abm_settings[] = {
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/24 drm/amd/display: dp mst detection code refactor
In reply to Anson JacobFrom: Wenjing Liu <[email protected]>
[why]
Move mst start top mgr in dc_link_detect layer. Remove unused same_dpcd variable.
Move PEAK_FACTOR_X1000 and LINK_TRAINING_MAX_VERIFY_RETRY to the proper header for defining dc link internal constant.
--- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 156 +++++++----------- .../gpu/drm/amd/display/dc/inc/dc_link_dp.h | 10 +- 2 files changed, 70 insertions(+), 96 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link.c +61 -95
@@ -59,20 +59,6 @@#define RETIMER_REDRIVER_INFO (...) \ DC_LOG_RETIMER_REDRIVER( \ __VA_ARGS__) -/******************************************************************************* -* Private structures -******************************************************************************/ - -enum { -PEAK_FACTOR_X1000 =1006 , -/* -* Some receivers fail to train on first try and are good -* on subsequent tries. 2 retries should be plenty. If we -* don't have a successful training then we don't expect to -* ever get one. -*/ -LINK_TRAINING_MAX_VERIFY_RETRY =2 -};/******************************************************************************* * Private functions
@@ -718,11 +704,9 @@ static void read_current_link_settings_on_detect(struct dc_link *link)static bool detect_dp (struct dc_link *link,struct display_sink_capability *sink_caps, -bool *converter_disable_audio, -struct audio_support *audio_support,enum dc_detect_reason reason) { -bool boot = false; +struct audio_support *audio_support = &link->dc->res_pool->audio_support; sink_caps->signal =link_detect_sink (link, reason); sink_caps->transaction_type =
@@ -745,60 +729,12 @@ static bool detect_dp(struct dc_link *link,* of this function). */ query_hdcp_capability (SIGNAL_TYPE_DISPLAY_PORT_MST , link);#endif -/* -* This call will initiate MST topology discovery. Which -* will detect MST ports and add new DRM connector DRM -* framework. Then read EDID via remote i2c over aux. In -* the end, will notify DRM detect result and save EDID -* into DRM framework. -* -* .detect is called by .fill_modes. -* .fill_modes is called by user mode ioctl -* DRM_IOCTL_MODE_GETCONNECTOR. -* -* .get_modes is called by .fill_modes. -* -* call .get_modes, AMDGPU DM implementation will create -* new dc_sink and add to dc_link. For long HPD plug -* in/out, MST has its own handle. -* -* Therefore, just after dc_create, link->sink is not -* created for MST until user mode app calls -* DRM_IOCTL_MODE_GETCONNECTOR. -* -* Need check ->sink usages in case ->sink = NULL -* TODO: s3 resume check -*/ -if (reason ==DETECT_REASON_BOOT ) - boot = true; - -dm_helpers_dp_update_branch_info (link->ctx, link); - -if (!dm_helpers_dp_mst_start_top_mgr (link->ctx, - link, boot)) { -/* MST not supported */ - link->type = dc_connection_single; - sink_caps->signal =SIGNAL_TYPE_DISPLAY_PORT ; - } }if (link->type != dc_connection_mst_branch && -is_dp_branch_device (link)) { +is_dp_branch_device (link))/* DP SST branch */ link->type = dc_connection_sst_branch; -if (!link->dpcd_caps.sink_count.bits.SINK_COUNT) { -/* -* SST branch unplug processing for short irq -*/ -link_disconnect_sink (link); -return true; - } - -if (is_dp_active_dongle (link) && - (link->dpcd_caps.dongle_type != -DISPLAY_DONGLE_DP_HDMI_CONVERTER )) - *converter_disable_audio = true; - } }else {/* DP passive dongles */ sink_caps->signal = dp_passive_dongle_detection(link->ddc,
@@ -893,7 +829,6 @@ static bool dc_link_detect_helper(struct dc_link *link,struct dc_sink *sink =NULL ;struct dc_sink *prev_sink =NULL ;struct dpcd_caps prev_dpcd_caps; -bool same_dpcd = true;enum dc_connection_type new_connection_type = dc_connection_none;enum dc_connection_type pre_connection_type = dc_connection_none;bool perform_dp_seamless_boot = false;
@@ -984,20 +919,59 @@ static bool dc_link_detect_helper(struct dc_link *link,return false; } -if (!detect_dp (link, &sink_caps, - &converter_disable_audio, - aud_support, reason)) { +if (!detect_dp (link, &sink_caps, reason)) {if (prev_sink)dc_sink_release (prev_sink);return false; } -// Check if dpcp block is the same -if (prev_sink) { -if (memcmp (&link->dpcd_caps, &prev_dpcd_caps, -sizeof (struct dpcd_caps ))) - same_dpcd = false; +if (link->type == dc_connection_mst_branch) { +LINK_INFO ("link=%d, mst branch is now Connected\n" , + link->link_index); +/* Need to setup mst link_cap struct here +* otherwise dc_link_detect() will leave mst link_cap +* empty which leads to allocate_mst_payload() has "0" +* pbn_per_slot value leading to exception on dc_fixpt_div() +*/ +dp_verify_mst_link_cap (link); + +/* +* This call will initiate MST topology discovery. Which +* will detect MST ports and add new DRM connector DRM +* framework. Then read EDID via remote i2c over aux. In +* the end, will notify DRM detect result and save EDID +* into DRM framework. +* +* .detect is called by .fill_modes. +* .fill_modes is called by user mode ioctl +* DRM_IOCTL_MODE_GETCONNECTOR. +* +* .get_modes is called by .fill_modes. +* +* call .get_modes, AMDGPU DM implementation will create +* new dc_sink and add to dc_link. For long HPD plug +* in/out, MST has its own handle. +* +* Therefore, just after dc_create, link->sink is not +* created for MST until user mode app calls +* DRM_IOCTL_MODE_GETCONNECTOR. +* +* Need check ->sink usages in case ->sink = NULL +* TODO: s3 resume check +*/ + +dm_helpers_dp_update_branch_info (link->ctx, link); +if (dm_helpers_dp_mst_start_top_mgr (link->ctx, + link, reason ==DETECT_REASON_BOOT )) { +if (prev_sink) +dc_sink_release (prev_sink); +return false; + }else { + link->type = dc_connection_sst_branch; + sink_caps.signal =SIGNAL_TYPE_DISPLAY_PORT ; + } } +/* Active SST downstream branch device unplug*/ if (link->type == dc_connection_sst_branch && link->dpcd_caps.sink_count.bits.SINK_COUNT ==0 ) {
@@ -1007,31 +981,23 @@ static bool dc_link_detect_helper(struct dc_link *link,return true; } +/* disable audio for non DP to HDMI active sst converter */ +if (link->type == dc_connection_sst_branch && +is_dp_active_dongle (link) && + (link->dpcd_caps.dongle_type != +DISPLAY_DONGLE_DP_HDMI_CONVERTER )) + converter_disable_audio = true; +// link switch from MST to non-MST stop topology manager if (pre_connection_type == dc_connection_mst_branch && - link->type != dc_connection_mst_branch) { + link->type != dc_connection_mst_branch)dm_helpers_dp_mst_stop_top_mgr (link->ctx, link); - } -if (link->type == dc_connection_mst_branch) { -LINK_INFO ("link=%d, mst branch is now Connected\n" , - link->link_index); -/* Need to setup mst link_cap struct here -* otherwise dc_link_detect() will leave mst link_cap -* empty which leads to allocate_mst_payload() has "0" -* pbn_per_slot value leading to exception on dc_fixpt_div() -*/ -dp_verify_mst_link_cap (link); - -if (prev_sink) -dc_sink_release (prev_sink); -return false; - }// For seamless boot, to skip verify link cap, we read UEFI settings and set them as verified. if (reason ==DETECT_REASON_BOOT && - !dc_ctx->dc->config.power_down_display_on_boot && - link->link_status.link_active) + !dc_ctx->dc->config.power_down_display_on_boot && + link->link_status.link_active) perform_dp_seamless_boot = true;if (perform_dp_seamless_boot) {
@@ -1214,11 +1180,11 @@ static bool dc_link_detect_helper(struct dc_link *link, link->dongle_max_pix_clk =0 ; } -LINK_INFO ("link=%d, dc_sink_in=%p is now %s prev_sink=%p dpcd same=%d edid same=%d\n" , +LINK_INFO ("link=%d, dc_sink_in=%p is now %s prev_sink=%p edid same=%d\n" , link->link_index, sink, (sink_caps.signal ==SIGNAL_TYPE_NONE ?"Disconnected" :"Connected" ), - prev_sink, same_dpcd, same_edid); + prev_sink, same_edid);if (prev_sink)dc_sink_release (prev_sink);
drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h +9 -1
@@ -42,7 +42,15 @@ enum {/* to avoid infinite loop where-in the receiver * switches between different VS */ -LINK_TRAINING_MAX_CR_RETRY =100 +LINK_TRAINING_MAX_CR_RETRY =100 , +/* +* Some receivers fail to train on first try and are good +* on subsequent tries. 2 retries should be plenty. If we +* don't have a successful training then we don't expect to +* ever get one. +*/ +LINK_TRAINING_MAX_VERIFY_RETRY =2 , + PEAK_FACTOR_X1000 = 1006, }; bool dp_verify_link_cap(
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/24 drm/amd/display: Change swizzle visual confirm reference pipe
In reply to Anson JacobFrom: Po-Ting Chen <[email protected]>
[Why]
To change the swizzle visual confirm reference pipe from top pipe to bottom pipe due to bottom pipe information would be more important for multiple overlay case.
--- drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c +5 -5
@@ -409,13 +409,13 @@ void get_surface_tile_visual_confirm_color( struct tg_color *color) {uint32_t color_value =MAX_TG_COLOR_VALUE ; -/* Determine the overscan color based on the top-most (desktop) plane's context */ -struct pipe_ctx *top_pipe_ctx = pipe_ctx; +/* Determine the overscan color based on the bottom-most plane's context */ +struct pipe_ctx *bottom_pipe_ctx = pipe_ctx; -while (top_pipe_ctx->top_pipe !=NULL ) - top_pipe_ctx = top_pipe_ctx->top_pipe; +while (bottom_pipe_ctx->bottom_pipe !=NULL ) + bottom_pipe_ctx = bottom_pipe_ctx->bottom_pipe; -switch (top_pipe_ctx->plane_state->tiling_info.gfx9.swizzle) { +switch (bottom_pipe_ctx->plane_state->tiling_info.gfx9.swizzle) {case DC_SW_LINEAR :/* LINEAR Surface - set border color to red */ color->color_r_cr = color_value;
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 7/24 drm/amd/display: Updated variable name.
In reply to Anson JacobFrom: David Galiffi <[email protected]>
[Why]
Fixed spelling error.
[How]
Changed "currnet_setting" to "current_setting".
--- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +6 -6
@@ -1806,7 +1806,7 @@ bool perform_link_training_with_retries(enum dp_panel_mode panel_mode;struct link_encoder *link_enc;enum link_training_result status =LINK_TRAINING_CR_FAIL_LANE0 ; -struct dc_link_settings currnet_setting = *link_setting; +struct dc_link_settings current_setting = *link_setting;/* Dynamically assigned link encoders associated with stream rather than * link.
@@ -1832,7 +1832,7 @@ bool perform_link_training_with_retries( link, signal, pipe_ctx->clock_source->id, - &currnet_setting); + ¤t_setting);if (stream->sink_patches.dppowerup_delay >0 ) {int delay_dp_power_up_in_ms = stream->sink_patches.dppowerup_delay;
@@ -1847,12 +1847,12 @@ bool perform_link_training_with_retries( panel_mode != DP_PANEL_MODE_DEFAULT);if (link->aux_access_disabled) { -dc_link_dp_perform_link_training_skip_aux (link, &currnet_setting); +dc_link_dp_perform_link_training_skip_aux (link, ¤t_setting);return true; }else { status =dc_link_dp_perform_link_training ( link, - &currnet_setting, + ¤t_setting, skip_video_pattern);if (status ==LINK_TRAINING_SUCCESS )return true;
@@ -1872,12 +1872,12 @@ bool perform_link_training_with_retries(if (status ==LINK_TRAINING_ABORT )break ;else if (do_fallback) { -decide_fallback_link_setting (*link_setting, &currnet_setting, status); +decide_fallback_link_setting (*link_setting, ¤t_setting, status);/* Fail link training if reduced link bandwidth no longer meets * stream requirements. */ if (dc_bandwidth_in_kbps_from_timing (&stream->timing) < -dc_link_bandwidth_kbps (link, &currnet_setting)) +dc_link_bandwidth_kbps (link, ¤t_setting))break ; }
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 8/24 drm/amd/display: [FW Promotion] Release 0.0.70
In reply to Anson JacobFrom: Anthony Koo <[email protected]>
--- drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h +2 -2
@@ -47,10 +47,10 @@/* Firmware versioning. */ #ifdef DMUB_EXPOSE_VERSION -#define DMUB_FW_VERSION_GIT_HASH 0xefd666c1 +#define DMUB_FW_VERSION_GIT_HASH 0x5cac099d3#define DMUB_FW_VERSION_MAJOR 0#define DMUB_FW_VERSION_MINOR 0 -#define DMUB_FW_VERSION_REVISION 69 +#define DMUB_FW_VERSION_REVISION 70#define DMUB_FW_VERSION_TEST 0#define DMUB_FW_VERSION_VBIOS 0#define DMUB_FW_VERSION_HOTFIX 0
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 9/24 drm/amd/display: 3.2.140
In reply to Anson JacobFrom: Aric Cyr <[email protected]>
This version brings along following fixed:
- LTTPR improvements
- Backlight improvements
- eDP hotplug detection
--- drivers/gpu/drm/amd/display/dc/dc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dc.h +1 -1
@@ -45,7 +45,7 @@/* forward declaration */ struct aux_payload ; -#define DC_VER "3.2.139" +#define DC_VER "3.2.140"#define MAX_SURFACES 3#define MAX_PLANES 6
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 10/24 drm/amd/display: move psr dm interface to separate files
In reply to Anson JacobFrom: Roman Li <[email protected]>
[Why]
Improve the maintain/read abilities of dm code.
[How]
Create amdgpu_dm_psr.c/h files.
Move psr function from amdgpu_dm.c
--- .../gpu/drm/amd/display/amdgpu_dm/Makefile | 2 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 137 +-------------- .../drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 166 ++++++++++++++++++ .../drm/amd/display/amdgpu_dm/amdgpu_dm_psr.h | 37 ++++ 4 files changed, 205 insertions(+), 137 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.h
drivers/gpu/drm/amd/display/amdgpu_dm/Makefile +1 -1
@@ -28,7 +28,7 @@ AMDGPUDM = amdgpu_dm.o amdgpu_dm_irq.o amdgpu_dm_mst_types.o amdgpu_dm_color.o ifneq ($(CONFIG_DRM_AMD_DC),) -AMDGPUDM += amdgpu_dm_services.o amdgpu_dm_helpers.o amdgpu_dm_pp_smu.o +AMDGPUDM += amdgpu_dm_services.o amdgpu_dm_helpers.o amdgpu_dm_pp_smu.o amdgpu_dm_psr.o endif ifdef CONFIG_DRM_AMD_DC_HDCP
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1 -136
155 lines not on this page · raw message
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c new file +166 -0
166 lines not on this page · raw message
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.h new file +37 -0
@@ -0,0 +1,37 @@ +/* +* 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 +* +*/ + +#ifndef AMDGPU_DM_AMDGPU_DM_PSR_H_ +#define AMDGPU_DM_AMDGPU_DM_PSR_H_ + +#include "amdgpu.h" + +void amdgpu_dm_set_psr_caps (struct dc_link *link); +bool amdgpu_dm_psr_enable (struct dc_stream_state *stream); +bool amdgpu_dm_link_setup_psr (struct dc_stream_state *stream); +bool amdgpu_dm_psr_disable (struct dc_stream_state *stream); +bool amdgpu_dm_psr_disable_all (struct amdgpu_display_manager *dm); + +#endif /* AMDGPU_DM_AMDGPU_DM_PSR_H_ */
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 11/24 drm/amd/display: Read LTTPR caps first on hotplug
In reply to Anson JacobFrom: Wesley Chalmers <[email protected]>
[WHY]
A new SCR for the DP2.0 spec requires that LTTPR caps be the first thing read from DPCD upon hotplug.
--- .../gpu/drm/amd/display/dc/core/dc_link_dp.c | 65 ++++++++++--------- 1 file changed, 33 insertions(+), 32 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +33 -32
@@ -3660,38 +3660,6 @@ static bool retrieve_link_cap(struct dc_link *link)dc_link_aux_try_to_configure_timeout (link->ddc,LINK_AUX_DEFAULT_LTTPR_TIMEOUT_PERIOD ); - status =core_link_read_dpcd (link,DP_SET_POWER , - &dpcd_power_state,sizeof (dpcd_power_state)); - -/* Delay 1 ms if AUX CH is in power down state. Based on spec -* section 2.3.1.2, if AUX CH may be powered down due to -* write to DPCD 600h = 2. Sink AUX CH is monitoring differential -* signal and may need up to 1 ms before being able to reply. -*/ -if (status !=DC_OK || dpcd_power_state ==DP_SET_POWER_D3 ) -udelay (1000 ); - -dpcd_set_source_specific_data (link); -/* Sink may need to configure internals based on vendor, so allow some -* time before proceeding with possibly vendor specific transactions -*/ -msleep (post_oui_delay); - -for (i =0 ; i < read_dpcd_retry_cnt; i++) { - status =core_link_read_dpcd ( - link, -DP_DPCD_REV , - dpcd_data, -sizeof (dpcd_data)); -if (status ==DC_OK ) -break ; - } - -if (status !=DC_OK ) { -dm_error ("%s: Read dpcd data failed.\n" , __func__); -return false; - } -/* Query BIOS to determine if LTTPR functionality is forced on by system */ if (bios->funcs->get_lttpr_caps) {enum bp_result bp_query_result;
@@ -3778,6 +3746,39 @@ static bool retrieve_link_cap(struct dc_link *link)dc_link_aux_try_to_configure_timeout (link->ddc,LINK_AUX_DEFAULT_TIMEOUT_PERIOD ); + status =core_link_read_dpcd (link,DP_SET_POWER , + &dpcd_power_state,sizeof (dpcd_power_state)); + +/* Delay 1 ms if AUX CH is in power down state. Based on spec +* section 2.3.1.2, if AUX CH may be powered down due to +* write to DPCD 600h = 2. Sink AUX CH is monitoring differential +* signal and may need up to 1 ms before being able to reply. +*/ +if (status !=DC_OK || dpcd_power_state ==DP_SET_POWER_D3 ) +udelay (1000 ); + +dpcd_set_source_specific_data (link); +/* Sink may need to configure internals based on vendor, so allow some +* time before proceeding with possibly vendor specific transactions +*/ +msleep (post_oui_delay); + +for (i =0 ; i < read_dpcd_retry_cnt; i++) { + status =core_link_read_dpcd ( + link, +DP_DPCD_REV , + dpcd_data, +sizeof (dpcd_data)); +if (status ==DC_OK ) +break ; + } + + +if (status !=DC_OK ) { +dm_error ("%s: Read receiver caps dpcd data failed.\n" , __func__); +return false; + } + {union training_aux_rd_interval aux_rd_interval;
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 12/24 drm/amd/display: Move LTTPR cap read into its own function
In reply to Anson JacobFrom: Wesley Chalmers <[email protected]>
[WHY]
We want LTTPR capabilities to be readable from more places than just retrieve_link_cap
--- .../gpu/drm/amd/display/dc/core/dc_link_dp.c | 75 ++++++++++--------- 1 file changed, 41 insertions(+), 34 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +41 -34
@@ -3619,47 +3619,16 @@ static bool dpcd_read_sink_ext_caps(struct dc_link *link)return true; } -static bool retrieve_link_cap (struct dc_link *link) +bool dp_retrieve_lttpr_cap (struct dc_link *link) { -/* DP_ADAPTER_CAP - DP_DPCD_REV + 1 == 16 and also DP_DSC_BITS_PER_PIXEL_INC - DP_DSC_SUPPORT + 1 == 16, -* which means size 16 will be good for both of those DPCD register block reads -*/ -uint8_t dpcd_data[16 ];uint8_t lttpr_dpcd_data[6 ]; - -/*Only need to read 1 byte starting from DP_DPRX_FEATURE_ENUMERATION_LIST. -*/ -uint8_t dpcd_dprx_data ='\0' ; -uint8_t dpcd_power_state ='\0' ; - -struct dp_device_vendor_id sink_id; -union down_stream_port_count down_strm_port_count; -union edp_configuration_cap edp_config_cap; -union dp_downstream_port_present ds_port = {0 }; -enum dc_status status =DC_ERROR_UNEXPECTED ; -uint32_t read_dpcd_retry_cnt =3 ; -int i; -struct dp_sink_hw_fw_revision dp_hw_fw_revision; -bool is_lttpr_present = false; -const uint32_t post_oui_delay =30 ;// 30ms bool vbios_lttpr_enable = false;bool vbios_lttpr_interop = false;struct dc_bios *bios = link->dc->ctx->dc_bios; +enum dc_status status =DC_ERROR_UNEXPECTED ; +bool is_lttpr_present = false; -memset (dpcd_data,'\0' ,sizeof (dpcd_data));memset (lttpr_dpcd_data,'\0' ,sizeof (lttpr_dpcd_data)); -memset (&down_strm_port_count, -'\0' ,sizeof (union down_stream_port_count )); -memset (&edp_config_cap,'\0' , -sizeof (union edp_configuration_cap )); - -/* if extended timeout is supported in hardware, -* default to LTTPR timeout (3.2ms) first as a W/A for DP link layer -* CTS 4.2.1.1 regression introduced by CTS specs requirement update. -*/ -dc_link_aux_try_to_configure_timeout (link->ddc, -LINK_AUX_DEFAULT_LTTPR_TIMEOUT_PERIOD ); -/* Query BIOS to determine if LTTPR functionality is forced on by system */ if (bios->funcs->get_lttpr_caps) {enum bp_result bp_query_result;
@@ -3741,7 +3710,45 @@ static bool retrieve_link_cap(struct dc_link *link)else link->lttpr_mode =LTTPR_MODE_NON_LTTPR ; } +return is_lttpr_present; +} + +static bool retrieve_link_cap (struct dc_link *link) +{ +/* DP_ADAPTER_CAP - DP_DPCD_REV + 1 == 16 and also DP_DSC_BITS_PER_PIXEL_INC - DP_DSC_SUPPORT + 1 == 16, +* which means size 16 will be good for both of those DPCD register block reads +*/ +uint8_t dpcd_data[16 ]; +/*Only need to read 1 byte starting from DP_DPRX_FEATURE_ENUMERATION_LIST. +*/ +uint8_t dpcd_dprx_data ='\0' ; +uint8_t dpcd_power_state ='\0' ; + +struct dp_device_vendor_id sink_id; +union down_stream_port_count down_strm_port_count; +union edp_configuration_cap edp_config_cap; +union dp_downstream_port_present ds_port = {0 }; +enum dc_status status =DC_ERROR_UNEXPECTED ; +uint32_t read_dpcd_retry_cnt =3 ; +int i; +struct dp_sink_hw_fw_revision dp_hw_fw_revision; +const uint32_t post_oui_delay =30 ;// 30ms +bool is_lttpr_present = false; + +memset (dpcd_data,'\0' ,sizeof (dpcd_data)); +memset (&down_strm_port_count, +'\0' ,sizeof (union down_stream_port_count )); +memset (&edp_config_cap,'\0' , +sizeof (union edp_configuration_cap )); + +/* if extended timeout is supported in hardware, +* default to LTTPR timeout (3.2ms) first as a W/A for DP link layer +* CTS 4.2.1.1 regression introduced by CTS specs requirement update. +*/ +dc_link_aux_try_to_configure_timeout (link->ddc, +LINK_AUX_DEFAULT_LTTPR_TIMEOUT_PERIOD ); + is_lttpr_present =dp_retrieve_lttpr_cap (link);if (!is_lttpr_present)dc_link_aux_try_to_configure_timeout (link->ddc,LINK_AUX_DEFAULT_TIMEOUT_PERIOD );
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 13/24 drm/amd/display: Read LTTPR caps first on bootup
In reply to Anson JacobFrom: Wesley Chalmers <[email protected]>
[WHY]
SCR for DP 2.0 requires that LTTPR caps be read first on hotplug. For the sake of consistency, this should also be the case on bootup.
--- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 4 ++++ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 3 +++ drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 1 + 3 files changed, 8 insertions(+)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +4 -0
@@ -54,6 +54,7 @@#include "dce/dmub_hw_lock_mgr.h" #include "dc_trace.h" #include "dce/dmub_outbox.h" +#include "inc/dc_link_dp.h" #define DC_LOGGER_INIT (logger)
@@ -1403,6 +1404,9 @@ void dcn10_init_hw(struct dc *dc)if (dc->links[i]->connector_signal !=SIGNAL_TYPE_DISPLAY_PORT )continue ; +/* DP 2.0 requires that LTTPR Caps be read first */ +dp_retrieve_lttpr_cap (dc->links[i]); +/* * If any of the displays are lit up turn them off. * The reason is that some MST hubs cannot be turned off
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c +3 -0
@@ -48,6 +48,7 @@#include "dc_dmub_srv.h" #include "link_hwss.h" #include "dpcd_defs.h" +#include "inc/dc_link_dp.h"
@@ -529,6 +530,8 @@ void dcn30_init_hw(struct dc *dc)for (i =0 ; i < dc->link_count; i++) {if (dc->links[i]->connector_signal !=SIGNAL_TYPE_DISPLAY_PORT )continue ; +/* DP 2.0 states that LTTPR regs must be read first */ +dp_retrieve_lttpr_cap (dc->links[i]);/* if any of the displays are lit up turn them off */ status = core_link_read_dpcd(dc->links[i], DP_SET_POWER,
drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h +1 -0
@@ -190,4 +190,5 @@ enum dc_status dpcd_configure_lttpr_mode( struct link_training_settings *lt_settings);enum dp_link_encoding dp_get_link_encoding_format (const struct dc_link_settings *link_settings); +bool dp_retrieve_lttpr_cap (struct dc_link *link);#endif /* __DC_LINK_DP_H__ */
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 14/24 drm/amd/display: Set LTTPR Transparent Mode after read link cap
In reply to Anson JacobFrom: Wesley Chalmers <[email protected]>
[WHY]
SCR for DP 2.0 Spec states that a DPTX shall put LTTPRs into Transparent mode after reading LTTPR Capability registers on HPD.
The wording of the SCR is somewhat ambiguous as to whether Transparent mode must be set explicity, or is implicitly set on LTTPR capability read. Explicitly setting Transparent mode after LTTPR capability read should cover all
cases.
--- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +3 -2
@@ -3705,9 +3705,10 @@ bool dp_retrieve_lttpr_cap(struct dc_link *link) link->dpcd_caps.lttpr_caps.max_lane_count >0 && link->dpcd_caps.lttpr_caps.max_lane_count <=4 && link->dpcd_caps.lttpr_caps.revision.raw >= 0x14); -if (is_lttpr_present) +if (is_lttpr_present) {CONN_DATA_DETECT (link, lttpr_dpcd_data,sizeof (lttpr_dpcd_data),"LTTPR Caps: " ); -else +configure_lttpr_mode_transparent (link); + }else link->lttpr_mode =LTTPR_MODE_NON_LTTPR ; }return is_lttpr_present;
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 15/24 drm/amd/display: Always write repeater mode regardless of LTTPR
In reply to Anson JacobFrom: Wesley Chalmers <[email protected]>
[WHY]
SCR for DP2.0 requires that LT be performed with PHY_REPEATER_MODE programmed to 0x55 (Transparent) whenever PHY_REPEATER_CNT is any value other than 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, or 0x01.
[HOW]
Write Non-Transparent (0xAA) to PHY_REPEATER_MODE when LTTPRs detected and Non-Transparent is requested.
Write Transparent in all other cases.
--- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +3 -4
@@ -1618,11 +1618,10 @@ enum dc_status dpcd_configure_lttpr_mode(struct dc_link *link, struct link_train {enum dc_status status =DC_OK ; -if (lt_settings->lttpr_mode ==LTTPR_MODE_TRANSPARENT ) - status =configure_lttpr_mode_transparent (link); - -else if (lt_settings->lttpr_mode ==LTTPR_MODE_NON_TRANSPARENT ) +if (lt_settings->lttpr_mode ==LTTPR_MODE_NON_TRANSPARENT ) status =configure_lttpr_mode_non_transparent (link, lt_settings); +else + status =configure_lttpr_mode_transparent (link);return status; }
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 16/24 drm/amd/display: Improve logic for is_lttpr_present
In reply to Anson JacobFrom: Wesley Chalmers <[email protected]>
[WHY]
DP specifies that an LTTPR device is only present if PHY_REPEATER_CNT is 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, or 0x01.
All other values should be considered no LTTPRs present.
[HOW]
Function dp_convert_to_count already does this check. Use it to determine if PHY_REPEATER_CNT is a valid LTTPR count.
--- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +1 -2
@@ -3699,8 +3699,7 @@ bool dp_retrieve_lttpr_cap(struct dc_link *link) DP_LT_TUNABLE_PHY_REPEATER_FIELD_DATA_STRUCTURE_REV];/* Attempt to train in LTTPR transparent mode if repeater count exceeds 8. */ - is_lttpr_present = (link->dpcd_caps.lttpr_caps.phy_repeater_cnt >0 && - link->dpcd_caps.lttpr_caps.phy_repeater_cnt <0xff && + is_lttpr_present = (dp_convert_to_count (link->dpcd_caps.lttpr_caps.phy_repeater_cnt) !=0 && link->dpcd_caps.lttpr_caps.max_lane_count >0 && link->dpcd_caps.lttpr_caps.max_lane_count <=4 && link->dpcd_caps.lttpr_caps.revision.raw >=0x14 );
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 17/24 drm/amd/display: Enforce DPCD Address ranges
In reply to Anson JacobFrom: Wesley Chalmers <[email protected]>
[WHY]
Some DPCD addresses, notably LTTPR Capability registers, are expected to be read all together in a single DPCD transaction. Rather than force callers to read registers they don't need, we want to quietly extend the addresses read, and only return back the values the caller asked for.
This does not affect DPCD writes.
[HOW]
Create an additional layer above AUX to perform 'checked' DPCD transactions.
Iterate through an array of DPCD address ranges that are marked as being contiguous. If a requested read falls within one of those ranges, extend the read to include the entire range.
After DPCD has been queried, copy the requested bytes into the caller's data buffer, and deallocate all resources used.
--- drivers/gpu/drm/amd/display/dc/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 1 + .../gpu/drm/amd/display/dc/core/dc_link_dp.c | 2 + .../drm/amd/display/dc/core/dc_link_dpcd.c | 135 ++++++++++++++++++ .../drm/amd/display/dc/core/dc_link_hwss.c | 31 +--- .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 1 + .../drm/amd/display/dc/dcn30/dcn30_hwseq.c | 1 + .../drm/amd/display/dc/dcn31/dcn31_hwseq.c | 1 + .../gpu/drm/amd/display/dc/hdcp/hdcp_msg.c | 1 + .../gpu/drm/amd/display/dc/inc/link_dpcd.h | 18 +++ .../gpu/drm/amd/display/dc/inc/link_hwss.h | 14 -- 11 files changed, 162 insertions(+), 45 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_link_dpcd.c create mode 100644 drivers/gpu/drm/amd/display/dc/inc/link_dpcd.h
drivers/gpu/drm/amd/display/dc/Makefile +1 -1
@@ -60,7 +60,7 @@ include $(AMD_DC) DISPLAY_CORE = dc.o dc_stat.o dc_link.o dc_resource.o dc_hw_sequencer.o dc_sink.o \ dc_surface.o dc_link_hwss.o dc_link_dp.o dc_link_ddc.o dc_debug.o dc_stream.o \ -dc_link_enc_cfg.o +dc_link_enc_cfg.o dc_link_dpcd.o ifdef CONFIG_DRM_AMD_DC_DCN DISPLAY_CORE += dc_vm_helper.o
drivers/gpu/drm/amd/display/dc/core/dc_link.c +1 -0
@@ -49,6 +49,7 @@#include "dmub/dmub_srv.h" #include "inc/hw/panel_cntl.h" #include "inc/link_enc_cfg.h" +#include "inc/link_dpcd.h" #define DC_LOGGER_INIT (logger)
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +2 -0
@@ -25,6 +25,8 @@ static const uint8_t DP_VGA_LVDS_CONVERTER_ID_3[] = "dnomlA"; link->ctx->logger#define DC_TRACE_LEVEL_MESSAGE (...)/* do nothing */ +#include "link_dpcd.h" +/* maximum pre emphasis level allowed for each voltage swing level*/ static const enum dc_pre_emphasis voltage_swing_to_pre_emphasis[] = {PRE_EMPHASIS_LEVEL3 ,
drivers/gpu/drm/amd/display/dc/core/dc_link_dpcd.c new file +135 -0
135 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c +1 -30
@@ -16,6 +16,7 @@#include "resource.h" #include "link_enc_cfg.h" #include "clk_mgr.h" +#include "inc/link_dpcd.h" static uint8_t convert_to_count (uint8_t lttpr_repeater_count) {
@@ -47,36 +48,6 @@ static inline bool is_immediate_downstream(struct dc_link *link, uint32_t offsetreturn (convert_to_count (link->dpcd_caps.lttpr_caps.phy_repeater_cnt) == offset); } -enum dc_status core_link_read_dpcd ( -struct dc_link *link, -uint32_t address, -uint8_t *data, -uint32_t size) -{ -if (!link->aux_access_disabled && - !dm_helpers_dp_read_dpcd (link->ctx, - link, address, data, size)) { -return DC_ERROR_UNEXPECTED ; - } - -return DC_OK ; -} - -enum dc_status core_link_write_dpcd ( -struct dc_link *link, -uint32_t address, -const uint8_t *data, -uint32_t size) -{ -if (!link->aux_access_disabled && - !dm_helpers_dp_write_dpcd (link->ctx, - link, address, data, size)) { -return DC_ERROR_UNEXPECTED ; - } - -return DC_OK ; -} -void dp_receiver_power_ctrl (struct dc_link *link,bool on) {uint8_t state;
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +1 -0
@@ -55,6 +55,7 @@#include "dc_trace.h" #include "dce/dmub_outbox.h" #include "inc/dc_link_dp.h" +#include "inc/link_dpcd.h" #define DC_LOGGER_INIT (logger)
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c +1 -0
@@ -49,6 +49,7 @@#include "link_hwss.h" #include "dpcd_defs.h" #include "inc/dc_link_dp.h" +#include "inc/link_dpcd.h"
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c +1 -0
@@ -46,6 +46,7 @@#include "dpcd_defs.h" #include "dce/dmub_outbox.h" #include "dc_link_dp.h" +#include "inc/link_dpcd.h" #define DC_LOGGER_INIT (logger)
drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c +1 -0
@@ -33,6 +33,7 @@#include "core_types.h" #include "dc_link_ddc.h" #include "link_hwss.h" +#include "inc/link_dpcd.h" #define DC_LOGGER \ link->ctx->logger
drivers/gpu/drm/amd/display/dc/inc/link_dpcd.h new file +18 -0
@@ -0,0 +1,18 @@ +#ifndef __LINK_DPCD_H__ +#define __LINK_DPCD_H__ +#include <inc/core_status.h> +#include <dc_link.h> +#include <inc/link_hwss.h> + +enum dc_status core_link_read_dpcd ( +struct dc_link *link, +uint32_t address, +uint8_t *data, +uint32_t size); + +enum dc_status core_link_write_dpcd ( +struct dc_link *link, +uint32_t address, +const uint8_t *data, +uint32_t size); +#endif
drivers/gpu/drm/amd/display/dc/inc/link_hwss.h +0 -14
@@ -26,20 +26,6 @@#ifndef __DC_LINK_HWSS_H__#define __DC_LINK_HWSS_H__ -#include "inc/core_status.h" - -enum dc_status core_link_read_dpcd ( -struct dc_link *link, -uint32_t address, -uint8_t *data, -uint32_t size); - -enum dc_status core_link_write_dpcd ( -struct dc_link *link, -uint32_t address, -const uint8_t *data, -uint32_t size); -struct gpio *get_hpd_gpio (struct dc_bios *dcb,struct graphics_object_id link_id,struct gpio_service *gpio_service);
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 18/24 drm/amd/display: Rename constant
In reply to Anson JacobFrom: Wesley Chalmers <[email protected]>
[WHY]
7 is the minimum number of retries TX must attempt on an AUX DEFER, not the maximum.
--- drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/dce/dce_aux.c +3 -3
@@ -615,7 +615,7 @@ int dce_aux_transfer_dmub_raw(struct ddc_service *ddc, }#define AUX_MAX_RETRIES 7 -#define AUX_MAX_DEFER_RETRIES 7 +#define AUX_MIN_DEFER_RETRIES 7#define AUX_MAX_I2C_DEFER_RETRIES 7#define AUX_MAX_INVALID_REPLY_RETRIES 2#define AUX_MAX_TIMEOUT_RETRIES 3
@@ -664,7 +664,7 @@ bool dce_aux_transfer_with_retries(struct ddc_service *ddc, retry_on_defer = true; fallthrough;case AUX_TRANSACTION_REPLY_I2C_OVER_AUX_NACK : -if (++aux_defer_retries >=AUX_MAX_DEFER_RETRIES ) { +if (++aux_defer_retries >=AUX_MIN_DEFER_RETRIES ) { goto fail; }else { if ((*payload->reply == AUX_TRANSACTION_REPLY_AUX_DEFER) ||
@@ -701,7 +701,7 @@ bool dce_aux_transfer_with_retries(struct ddc_service *ddc,// Check whether a DEFER had occurred before the timeout. // If so, treat timeout as a DEFER. if (retry_on_defer) { -if (++aux_defer_retries >=AUX_MAX_DEFER_RETRIES ) +if (++aux_defer_retries >=AUX_MIN_DEFER_RETRIES ) goto fail;else if (payload->defer_delay >0 )msleep (payload->defer_delay);
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 19/24 drm/amd/display: 7 retries + 50 ms timeout on AUX DEFER
In reply to Anson JacobFrom: Wesley Chalmers <[email protected]>
[WHY]
DP 2.0 SCR specifies that TX devices must retry at least 7 times when receiving an AUX DEFER reply from RX. In addition, the specification states that the TX shall not retry indefinitely, and gives a suggestive timeout interval of 50ms.
[HOW]
Keep retrying until both 7 or more retries have been made, and the 50ms interval has passed.
--- drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/dce/dce_aux.c +15 -3
@@ -616,6 +616,7 @@ int dce_aux_transfer_dmub_raw(struct ddc_service *ddc,#define AUX_MAX_RETRIES 7#define AUX_MIN_DEFER_RETRIES 7 +#define AUX_MAX_DEFER_TIMEOUT_MS 50#define AUX_MAX_I2C_DEFER_RETRIES 7#define AUX_MAX_INVALID_REPLY_RETRIES 2#define AUX_MAX_TIMEOUT_RETRIES 3
@@ -628,6 +629,10 @@ bool dce_aux_transfer_with_retries(struct ddc_service *ddc,bool payload_reply = true;enum aux_return_code_type operation_result;bool retry_on_defer = false; +struct ddc *ddc_pin = ddc->ddc_pin; +struct dce_aux *aux_engine = ddc->ctx->dc->res_pool->engines[ddc_pin->pin_data->en]; +struct aux_engine_dce110 *aux110 =FROM_AUX_ENGINE (aux_engine); +uint32_t defer_time_in_ms =0 ;int aux_ack_retries =0 , aux_defer_retries = 0,
@@ -660,19 +665,26 @@ bool dce_aux_transfer_with_retries(struct ddc_service *ddc,break ;case AUX_TRANSACTION_REPLY_AUX_DEFER : +/* polling_timeout_period is in us */ + defer_time_in_ms += aux110->polling_timeout_period /1000 ; +/* fall through */ case AUX_TRANSACTION_REPLY_I2C_OVER_AUX_DEFER : retry_on_defer = true; fallthrough;case AUX_TRANSACTION_REPLY_I2C_OVER_AUX_NACK : -if (++aux_defer_retries >=AUX_MIN_DEFER_RETRIES ) { +if (++aux_defer_retries >=AUX_MIN_DEFER_RETRIES + && defer_time_in_ms >=AUX_MAX_DEFER_TIMEOUT_MS ) { goto fail; }else {if ((*payload->reply ==AUX_TRANSACTION_REPLY_AUX_DEFER ) || (*payload->reply ==AUX_TRANSACTION_REPLY_I2C_OVER_AUX_DEFER )) { -if (payload->defer_delay >1 ) +if (payload->defer_delay >1 ) {msleep (payload->defer_delay); -else if (payload->defer_delay <=1 ) + defer_time_in_ms += payload->defer_delay; + }else if (payload->defer_delay <=1 ) {udelay (payload->defer_delay *1000 ); + defer_time_in_ms += payload->defer_delay; + } } }break ;
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 20/24 drm/amd/display: Do not count I2C DEFERs with AUX DEFERs
In reply to Anson JacobFrom: Wesley Chalmers <[email protected]>
[WHY]
DP 2.0 SCR specifies that
"A DPTX shall distinguish I2C_DEFER|AUX_ACK from AUX_DEFER. AUX retries due toI2C_DEFER are not counted as part of minimum 7 retires (sic) upon AUX_DEFER’s"
--- drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dce/dce_aux.c +2 -1
@@ -667,12 +667,13 @@ bool dce_aux_transfer_with_retries(struct ddc_service *ddc,case AUX_TRANSACTION_REPLY_AUX_DEFER :/* polling_timeout_period is in us */ defer_time_in_ms += aux110->polling_timeout_period /1000 ; + ++aux_defer_retries;/* fall through */ case AUX_TRANSACTION_REPLY_I2C_OVER_AUX_DEFER : retry_on_defer = true; fallthrough;case AUX_TRANSACTION_REPLY_I2C_OVER_AUX_NACK : -if (++aux_defer_retries >=AUX_MIN_DEFER_RETRIES +if (aux_defer_retries >=AUX_MIN_DEFER_RETRIES && defer_time_in_ms >=AUX_MAX_DEFER_TIMEOUT_MS ) { goto fail; }else {
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 21/24 drm/amd/display: Partition DPCD address space and break up transactions
In reply to Anson JacobFrom: Wesley Chalmers <[email protected]>
[WHY]
SCR for DP 2.0 spec says that multiple LTTPRs must not be accessed in a single AUX transaction.
There may be other places in future where breaking up AUX accesses is necessary.
[HOW]
Partition the entire DPCD address space into blocks. When an incoming AUX request spans multiple blocks, break up the request into multiple requests.
--- .../drm/amd/display/dc/core/dc_link_dpcd.c | 87 ++++++++++++++++++- include/drm/drm_dp_helper.h | 17 ++++ 2 files changed, 102 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_dpcd.c +85 -2
@@ -43,6 +43,60 @@ static enum dc_status internal_link_write_dpcd(return DC_OK ; } +/* +* Partition the entire DPCD address space +* XXX: This partitioning must cover the entire DPCD address space, +* and must contain no gaps or overlapping address ranges. +*/ +static const struct dpcd_address_range mandatory_dpcd_partitions[] = { + {0 ,DP_TRAINING_PATTERN_SET_PHY_REPEATER (DP_PHY_LTTPR1 ) -1 }, + {DP_TRAINING_PATTERN_SET_PHY_REPEATER (DP_PHY_LTTPR1 ),DP_TRAINING_PATTERN_SET_PHY_REPEATER (DP_PHY_LTTPR2 ) -1 }, + {DP_TRAINING_PATTERN_SET_PHY_REPEATER (DP_PHY_LTTPR2 ),DP_TRAINING_PATTERN_SET_PHY_REPEATER (DP_PHY_LTTPR3 ) -1 }, + {DP_TRAINING_PATTERN_SET_PHY_REPEATER (DP_PHY_LTTPR3 ),DP_TRAINING_PATTERN_SET_PHY_REPEATER (DP_PHY_LTTPR4 ) -1 }, + {DP_TRAINING_PATTERN_SET_PHY_REPEATER (DP_PHY_LTTPR4 ),DP_TRAINING_PATTERN_SET_PHY_REPEATER (DP_PHY_LTTPR5 ) -1 }, + {DP_TRAINING_PATTERN_SET_PHY_REPEATER (DP_PHY_LTTPR5 ),DP_TRAINING_PATTERN_SET_PHY_REPEATER (DP_PHY_LTTPR6 ) -1 }, + {DP_TRAINING_PATTERN_SET_PHY_REPEATER (DP_PHY_LTTPR6 ),DP_TRAINING_PATTERN_SET_PHY_REPEATER (DP_PHY_LTTPR7 ) -1 }, + {DP_TRAINING_PATTERN_SET_PHY_REPEATER (DP_PHY_LTTPR7 ),DP_TRAINING_PATTERN_SET_PHY_REPEATER (DP_PHY_LTTPR8 ) -1 }, + {DP_TRAINING_PATTERN_SET_PHY_REPEATER (DP_PHY_LTTPR8 ),DP_FEC_STATUS_PHY_REPEATER (DP_PHY_LTTPR1 ) -1 }, +/* +* The FEC registers are contiguous +*/ + {DP_FEC_STATUS_PHY_REPEATER (DP_PHY_LTTPR1 ),DP_FEC_STATUS_PHY_REPEATER (DP_PHY_LTTPR1 ) -1 }, + {DP_FEC_STATUS_PHY_REPEATER (DP_PHY_LTTPR2 ),DP_FEC_STATUS_PHY_REPEATER (DP_PHY_LTTPR2 ) -1 }, + {DP_FEC_STATUS_PHY_REPEATER (DP_PHY_LTTPR3 ),DP_FEC_STATUS_PHY_REPEATER (DP_PHY_LTTPR3 ) -1 }, + {DP_FEC_STATUS_PHY_REPEATER (DP_PHY_LTTPR4 ),DP_FEC_STATUS_PHY_REPEATER (DP_PHY_LTTPR4 ) -1 }, + {DP_FEC_STATUS_PHY_REPEATER (DP_PHY_LTTPR5 ),DP_FEC_STATUS_PHY_REPEATER (DP_PHY_LTTPR5 ) -1 }, + {DP_FEC_STATUS_PHY_REPEATER (DP_PHY_LTTPR6 ),DP_FEC_STATUS_PHY_REPEATER (DP_PHY_LTTPR6 ) -1 }, + {DP_FEC_STATUS_PHY_REPEATER (DP_PHY_LTTPR7 ),DP_FEC_STATUS_PHY_REPEATER (DP_PHY_LTTPR7 ) -1 }, + {DP_FEC_STATUS_PHY_REPEATER (DP_PHY_LTTPR8 ),DP_LTTPR_MAX_ADD }, +/* all remaining DPCD addresses */ + {DP_LTTPR_MAX_ADD +1 ,DP_DPCD_MAX_ADD } }; + +static inline bool do_addresses_intersect_with_range ( +const struct dpcd_address_range *range, +const uint32_t start_address, +const uint32_t end_address) +{ +return start_address <= range->end && end_address >= range->start; +} + +static uint32_t dpcd_get_next_partition_size (const uint32_t address,const uint32_t size) +{ +const uint32_t end_address =END_ADDRESS (address, size); +uint32_t partition_iterator =0 ; + +/* +* find current partition +* this loop spins forever if partition map above is not surjective +*/ +while (!do_addresses_intersect_with_range (&mandatory_dpcd_partitions[partition_iterator], + address, end_address)) + partition_iterator++; +if (end_address < mandatory_dpcd_partitions[partition_iterator].end) +return size; +return ADDRESS_RANGE_SIZE (address, mandatory_dpcd_partitions[partition_iterator].end); +} +/* * Ranges of DPCD addresses that must be read in a single transaction * XXX: Do not allow any two address ranges in this array to overlap
@@ -115,12 +169,28 @@ enum dc_status core_link_read_dpcd( uint32_t size) {uint32_t extended_address; +uint32_t partitioned_address;uint8_t *extended_data;uint32_t extended_size; +/* size of the remaining partitioned address space */ +uint32_t size_left_to_read;enum dc_status status; +/* size of the next partition to be read from */ +uint32_t partition_size; +uint32_t data_index =0 ;dpcd_extend_address_range (address, data, size, &extended_address, &extended_data, &extended_size); - status =internal_link_read_dpcd (link, extended_address, extended_data, extended_size); + partitioned_address = extended_address; + size_left_to_read = extended_size; +while (size_left_to_read) { + partition_size =dpcd_get_next_partition_size (partitioned_address, size_left_to_read); + status =internal_link_read_dpcd (link, partitioned_address, &extended_data[data_index], partition_size); +if (status !=DC_OK ) +break ; + partitioned_address += partition_size; + data_index += partition_size; + size_left_to_read -= partition_size; + }dpcd_reduce_address_range (extended_address, extended_data, extended_size, address, data, size);return status; }
@@ -131,5 +201,18 @@ enum dc_status core_link_write_dpcd(const uint8_t *data, uint32_t size) { - return internal_link_write_dpcd(link, address, data, size); + uint32_t partition_size; +uint32_t data_index =0 ; +enum dc_status status; + +while (size) { + partition_size =dpcd_get_next_partition_size (address, size); + status =internal_link_write_dpcd (link, address, &data[data_index], partition_size); +if (status !=DC_OK ) +break ; + address += partition_size; + data_index += partition_size; + size -= partition_size; + } +return status; }
include/drm/drm_dp_helper.h +17 -0
@@ -1369,10 +1369,27 @@ enum drm_dp_phy {#define DP_SYMBOL_ERROR_COUNT_LANE1_PHY_REPEATER1 0xf0037/* 1.3 */ #define DP_SYMBOL_ERROR_COUNT_LANE2_PHY_REPEATER1 0xf0039/* 1.3 */ #define DP_SYMBOL_ERROR_COUNT_LANE3_PHY_REPEATER1 0xf003b/* 1.3 */ + +#define __DP_FEC1_BASE 0xf0290/* 1.4 */ +#define __DP_FEC2_BASE 0xf0298/* 1.4 */ +#define DP_FEC_BASE (dp_phy) \ + (__DP_FEC1_BASE + ((__DP_FEC2_BASE - __DP_FEC1_BASE) * \ + ((dp_phy) - DP_PHY_LTTPR1))) + +#define DP_FEC_REG (dp_phy, fec1_reg) \ + (DP_FEC_BASE(dp_phy) - DP_FEC_BASE(DP_PHY_LTTPR1) + fec1_reg) +#define DP_FEC_STATUS_PHY_REPEATER1 0xf0290/* 1.4 */ +#define DP_FEC_STATUS_PHY_REPEATER (dp_phy) \ + DP_FEC_REG(dp_phy, DP_FEC_STATUS_PHY_REPEATER1) +#define DP_FEC_ERROR_COUNT_PHY_REPEATER1 0xf0291/* 1.4 */ #define DP_FEC_CAPABILITY_PHY_REPEATER1 0xf0294/* 1.4a */ +#define DP_LTTPR_MAX_ADD 0xf02ff/* 1.4 */ + +#define DP_DPCD_MAX_ADD 0xfffff/* 1.4 */ +/* Repeater modes */ #define DP_PHY_REPEATER_MODE_TRANSPARENT 0x55/* 1.3 */ #define DP_PHY_REPEATER_MODE_NON_TRANSPARENT 0xaa/* 1.3 */
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 22/24 drm/amd/display: Add interface to get Calibrated Avg Level from FIFO
In reply to Anson JacobFrom: Wesley Chalmers <[email protected]>
[WHY]
Hardware has handed down a new sequence requiring the value of this register be read from clk_mgr.
--- .../display/dc/dcn10/dcn10_stream_encoder.h | 24 +++++++++++++++++++ .../display/dc/dcn20/dcn20_stream_encoder.c | 12 ++++++++++ .../display/dc/dcn20/dcn20_stream_encoder.h | 3 +++ .../dc/dcn30/dcn30_dio_stream_encoder.c | 2 ++ .../dc/dcn30/dcn30_dio_stream_encoder.h | 12 ++++++++++ .../amd/display/dc/inc/hw/stream_encoder.h | 3 +++ .../include/asic_reg/dcn/dcn_3_0_1_sh_mask.h | 2 ++ .../include/asic_reg/dcn/dcn_3_1_2_sh_mask.h | 2 ++ 8 files changed, 60 insertions(+)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.h +24 -0
@@ -52,6 +52,7 @@SRI (AFMT_60958_1 ,DIG , id), \SRI (AFMT_60958_2 ,DIG , id), \SRI (DIG_FE_CNTL ,DIG , id), \ +SRI (DIG_FIFO_STATUS ,DIG , id), \SRI (HDMI_CONTROL ,DIG , id), \SRI (HDMI_DB_CONTROL ,DIG , id), \ SRI(HDMI_GC, DIG, id), \
@@ -124,6 +125,7 @@ struct dcn10_stream_enc_registers {uint32_t AFMT_60958_2 ;uint32_t DIG_FE_CNTL ;uint32_t DIG_FE_CNTL2 ; +uint32_t DIG_FIFO_STATUS ;uint32_t DP_MSE_RATE_CNTL ;uint32_t DP_MSE_RATE_UPDATE ;uint32_t DP_PIXEL_FORMAT ;
@@ -266,6 +268,17 @@ struct dcn10_stream_enc_registers {SE_SF (DIG0_DIG_FE_CNTL ,TMDS_COLOR_FORMAT , mask_sh),\SE_SF (DIG0_DIG_FE_CNTL ,DIG_STEREOSYNC_SELECT , mask_sh),\SE_SF (DIG0_DIG_FE_CNTL ,DIG_STEREOSYNC_GATE_EN , mask_sh),\ +SE_SF (DIG0_DIG_FIFO_STATUS ,DIG_FIFO_LEVEL_ERROR , mask_sh),\ +SE_SF (DIG0_DIG_FIFO_STATUS ,DIG_FIFO_USE_OVERWRITE_LEVEL , mask_sh),\ +SE_SF (DIG0_DIG_FIFO_STATUS ,DIG_FIFO_OVERWRITE_LEVEL , mask_sh),\ +SE_SF (DIG0_DIG_FIFO_STATUS ,DIG_FIFO_ERROR_ACK , mask_sh),\ +SE_SF (DIG0_DIG_FIFO_STATUS ,DIG_FIFO_CAL_AVERAGE_LEVEL , mask_sh),\ +SE_SF (DIG0_DIG_FIFO_STATUS ,DIG_FIFO_MAXIMUM_LEVEL , mask_sh),\ +SE_SF (DIG0_DIG_FIFO_STATUS ,DIG_FIFO_MINIMUM_LEVEL , mask_sh),\ +SE_SF (DIG0_DIG_FIFO_STATUS ,DIG_FIFO_READ_CLOCK_SRC , mask_sh),\ +SE_SF (DIG0_DIG_FIFO_STATUS ,DIG_FIFO_CALIBRATED , mask_sh),\ +SE_SF (DIG0_DIG_FIFO_STATUS ,DIG_FIFO_FORCE_RECAL_AVERAGE , mask_sh),\ +SE_SF (DIG0_DIG_FIFO_STATUS ,DIG_FIFO_FORCE_RECOMP_MINMAX , mask_sh),\SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL ,AFMT_GENERIC_LOCK_STATUS , mask_sh),\SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL ,AFMT_GENERIC_CONFLICT , mask_sh),\ SE_SF(DIG0_AFMT_VBI_PACKET_CONTROL, AFMT_GENERIC_CONFLICT_CLR, mask_sh),\
@@ -488,6 +501,17 @@ struct dcn10_stream_enc_registers {type DP_VID_N_MUL ;\type DP_VID_M_DOUBLE_VALUE_EN ;\type DIG_SOURCE_SELECT ;\ +type DIG_FIFO_LEVEL_ERROR ;\ +type DIG_FIFO_USE_OVERWRITE_LEVEL ;\ +type DIG_FIFO_OVERWRITE_LEVEL ;\ +type DIG_FIFO_ERROR_ACK ;\ +type DIG_FIFO_CAL_AVERAGE_LEVEL ;\ +type DIG_FIFO_MAXIMUM_LEVEL ;\ +type DIG_FIFO_MINIMUM_LEVEL ;\ +type DIG_FIFO_READ_CLOCK_SRC ;\ +type DIG_FIFO_CALIBRATED ;\ +type DIG_FIFO_FORCE_RECAL_AVERAGE ;\ +type DIG_FIFO_FORCE_RECOMP_MINMAX ;\ type DIG_CLOCK_PATTERN#define SE_REG_FIELD_LIST_DCN2_0 (type) \
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_stream_encoder.c +12 -0
@@ -552,6 +552,17 @@ void enc2_stream_encoder_dp_set_stream_attribute( DP_SST_SDP_SPLITTING, enable_sdp_splitting); } +uint32_t enc2_get_fifo_cal_average_level ( +struct stream_encoder *enc) +{ +struct dcn10_stream_encoder *enc1 =DCN10STRENC_FROM_STRENC (enc); +uint32_t fifo_level; + +REG_GET (DIG_FIFO_STATUS , +DIG_FIFO_CAL_AVERAGE_LEVEL , &fifo_level); +return fifo_level; +} +static const struct stream_encoder_funcs dcn20_str_enc_funcs = { .dp_set_odm_combine = enc2_dp_set_odm_combine,
@@ -598,6 +609,7 @@ static const struct stream_encoder_funcs dcn20_str_enc_funcs = { .dp_set_dsc_pps_info_packet = enc2_dp_set_dsc_pps_info_packet, .set_dynamic_metadata = enc2_set_dynamic_metadata, .hdmi_reset_stream_attribute = enc1_reset_hdmi_stream_attribute, + .get_fifo_cal_average_level = enc2_get_fifo_cal_average_level, }; void dcn20_stream_encoder_construct(
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_stream_encoder.h +3 -0
@@ -112,4 +112,7 @@ void enc2_set_dynamic_metadata(struct stream_encoder *enc,uint32_t hubp_requestor_id, enum dynamic_metadata_mode dmdata_mode); +uint32_t enc2_get_fifo_cal_average_level ( +struct stream_encoder *enc); +#endif /* __DC_STREAM_ENCODER_DCN20_H__ */
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_stream_encoder.c +2 -0
@@ -823,6 +823,8 @@ static const struct stream_encoder_funcs dcn30_str_enc_funcs = { .dp_set_dsc_pps_info_packet = enc3_dp_set_dsc_pps_info_packet, .set_dynamic_metadata = enc2_set_dynamic_metadata, .hdmi_reset_stream_attribute = enc1_reset_hdmi_stream_attribute, + + .get_fifo_cal_average_level = enc2_get_fifo_cal_average_level, }; void dcn30_dio_stream_encoder_construct(
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_stream_encoder.h +12 -0
@@ -106,6 +106,7 @@SRI (DP_SEC_METADATA_TRANSMISSION ,DP , id), \SRI (HDMI_METADATA_PACKET_CONTROL ,DIG , id), \SRI (DIG_FE_CNTL ,DIG , id), \ +SRI (DIG_FIFO_STATUS ,DIG , id), \SRI (DIG_CLOCK_PATTERN ,DIG , id)
@@ -167,6 +168,17 @@SE_SF (DIG0_DIG_FE_CNTL ,TMDS_COLOR_FORMAT , mask_sh),\SE_SF (DIG0_DIG_FE_CNTL ,DIG_STEREOSYNC_SELECT , mask_sh),\SE_SF (DIG0_DIG_FE_CNTL ,DIG_STEREOSYNC_GATE_EN , mask_sh),\ +SE_SF (DIG0_DIG_FIFO_STATUS ,DIG_FIFO_LEVEL_ERROR , mask_sh),\ +SE_SF (DIG0_DIG_FIFO_STATUS ,DIG_FIFO_USE_OVERWRITE_LEVEL , mask_sh),\ +SE_SF (DIG0_DIG_FIFO_STATUS ,DIG_FIFO_OVERWRITE_LEVEL , mask_sh),\ +SE_SF (DIG0_DIG_FIFO_STATUS ,DIG_FIFO_ERROR_ACK , mask_sh),\ +SE_SF (DIG0_DIG_FIFO_STATUS ,DIG_FIFO_CAL_AVERAGE_LEVEL , mask_sh),\ +SE_SF (DIG0_DIG_FIFO_STATUS ,DIG_FIFO_MAXIMUM_LEVEL , mask_sh),\ +SE_SF (DIG0_DIG_FIFO_STATUS ,DIG_FIFO_MINIMUM_LEVEL , mask_sh),\ +SE_SF (DIG0_DIG_FIFO_STATUS ,DIG_FIFO_READ_CLOCK_SRC , mask_sh),\ +SE_SF (DIG0_DIG_FIFO_STATUS ,DIG_FIFO_CALIBRATED , mask_sh),\ +SE_SF (DIG0_DIG_FIFO_STATUS ,DIG_FIFO_FORCE_RECAL_AVERAGE , mask_sh),\ +SE_SF (DIG0_DIG_FIFO_STATUS ,DIG_FIFO_FORCE_RECOMP_MINMAX , mask_sh),\SE_SF (DP0_DP_SEC_CNTL ,DP_SEC_GSP4_ENABLE , mask_sh),\SE_SF (DP0_DP_SEC_CNTL ,DP_SEC_GSP5_ENABLE , mask_sh),\ SE_SF(DP0_DP_SEC_CNTL, DP_SEC_GSP6_ENABLE, mask_sh),\
drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h +3 -0
@@ -237,6 +237,9 @@ struct stream_encoder_funcs {void (*dp_set_odm_combine)(struct stream_encoder *enc,bool odm_combine); + +uint32_t (*get_fifo_cal_average_level)( + struct stream_encoder *enc); };#endif /* STREAM_ENCODER_H_ */
drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_1_sh_mask.h +2 -0
@@ -29292,6 +29292,7 @@#define DIG0_DIG_FIFO_STATUS__DIG_FIFO_OVERWRITE_LEVEL_MASK 0x000000FCL#define DIG0_DIG_FIFO_STATUS__DIG_FIFO_ERROR_ACK_MASK 0x00000100L#define DIG0_DIG_FIFO_STATUS__DIG_FIFO_CAL_AVERAGE_LEVEL_MASK 0x0000FC00L +#define DIG0_DIG_FIFO_STATUS__DIG_FIFO_MAXIMUM_LEVEL_MASK 0x001F0000L#define DIG0_DIG_FIFO_STATUS__DIG_FIFO_MINIMUM_LEVEL_MASK 0x03C00000L#define DIG0_DIG_FIFO_STATUS__DIG_FIFO_READ_CLOCK_SRC_MASK 0x04000000L#define DIG0_DIG_FIFO_STATUS__DIG_FIFO_CALIBRATED_MASK 0x20000000L
@@ -34431,6 +34432,7 @@#define DIG3_DIG_FIFO_STATUS__DIG_FIFO_OVERWRITE_LEVEL__SHIFT 0x2#define DIG3_DIG_FIFO_STATUS__DIG_FIFO_ERROR_ACK__SHIFT 0x8#define DIG3_DIG_FIFO_STATUS__DIG_FIFO_CAL_AVERAGE_LEVEL__SHIFT 0xa +#define DIG0_DIG_FIFO_STATUS__DIG_FIFO_MAXIMUM_LEVEL__SHIFT 0x10#define DIG3_DIG_FIFO_STATUS__DIG_FIFO_MINIMUM_LEVEL__SHIFT 0x16#define DIG3_DIG_FIFO_STATUS__DIG_FIFO_READ_CLOCK_SRC__SHIFT 0x1a#define DIG3_DIG_FIFO_STATUS__DIG_FIFO_CALIBRATED__SHIFT 0x1d
drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_1_2_sh_mask.h +2 -0
@@ -33869,6 +33869,7 @@#define DIG0_DIG_FIFO_STATUS__DIG_FIFO_OVERWRITE_LEVEL__SHIFT 0x2#define DIG0_DIG_FIFO_STATUS__DIG_FIFO_ERROR_ACK__SHIFT 0x8#define DIG0_DIG_FIFO_STATUS__DIG_FIFO_CAL_AVERAGE_LEVEL__SHIFT 0xa +#define DIG0_DIG_FIFO_STATUS__DIG_FIFO_MAXIMUM_LEVEL__SHIFT 0x10#define DIG0_DIG_FIFO_STATUS__DIG_FIFO_MINIMUM_LEVEL__SHIFT 0x16#define DIG0_DIG_FIFO_STATUS__DIG_FIFO_READ_CLOCK_SRC__SHIFT 0x1a#define DIG0_DIG_FIFO_STATUS__DIG_FIFO_CALIBRATED__SHIFT 0x1d
@@ -33879,6 +33880,7 @@#define DIG0_DIG_FIFO_STATUS__DIG_FIFO_OVERWRITE_LEVEL_MASK 0x000000FCL#define DIG0_DIG_FIFO_STATUS__DIG_FIFO_ERROR_ACK_MASK 0x00000100L#define DIG0_DIG_FIFO_STATUS__DIG_FIFO_CAL_AVERAGE_LEVEL_MASK 0x0000FC00L +#define DIG0_DIG_FIFO_STATUS__DIG_FIFO_MAXIMUM_LEVEL_MASK 0x001F0000L#define DIG0_DIG_FIFO_STATUS__DIG_FIFO_MINIMUM_LEVEL_MASK 0x03C00000L#define DIG0_DIG_FIFO_STATUS__DIG_FIFO_READ_CLOCK_SRC_MASK 0x04000000L#define DIG0_DIG_FIFO_STATUS__DIG_FIFO_CALIBRATED_MASK 0x20000000L
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 23/24 drm/amd/display: Cover edge-case when changing DISPCLK WDIVIDER
In reply to Anson JacobFrom: Wesley Chalmers <[email protected]>
[WHY]
When changing the DISPCLK_WDIVIDER value from 126 to 127, the change in clock rate is too great for the FIFOs to handle. This can cause visible corruption during clock change.
HW has handed down this register sequence to fix the issue.
[HOW]
The sequence, from HW:
a. 127 -> 126
Read DIG_FIFO_CAL_AVERAGE_LEVEL
FIFO level N = DIG_FIFO_CAL_AVERAGE_LEVEL / 4
Set DCCG_FIFO_ERRDET_OVR_EN = 1
Write 1 to OTGx_DROP_PIXEL for (N-4) times
Set DCCG_FIFO_ERRDET_OVR_EN = 0
Write DENTIST_DISPCLK_RDIVIDER = 126
Because of frequency stepping, sequence a can be executed to change the divider from 127 to any other divider value.
b. 126 -> 127
Read DIG_FIFO_CAL_AVERAGE_LEVEL
FIFO level N = DIG_FIFO_CAL_AVERAGE_LEVEL / 4
Set DCCG_FIFO_ERRDET_OVR_EN = 1
Write 1 to OTGx_ADD_PIXEL for (12-N) times
Set DCCG_FIFO_ERRDET_OVR_EN = 0
Write DENTIST_DISPCLK_RDIVIDER = 127
Because of frequency stepping, divider must first be set from any other divider value to 126 before executing sequence b.
--- .../display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 68 ++++++++++++++++++- .../display/dc/clk_mgr/dcn20/dcn20_clk_mgr.h | 3 +- .../display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 4 +- 3 files changed, 69 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c +65 -3
@@ -123,7 +123,7 @@ void dcn20_update_clocks_update_dpp_dto(struct clk_mgr_internal *clk_mgr, } } -void dcn20_update_clocks_update_dentist (struct clk_mgr_internal *clk_mgr) +void dcn20_update_clocks_update_dentist (struct clk_mgr_internal *clk_mgr,struct dc_state *context) {int dpp_divider =DENTIST_DIVIDER_RANGE_SCALE_FACTOR * clk_mgr->base.dentist_vco_freq_khz / clk_mgr->base.clks.dppclk_khz;
@@ -132,6 +132,68 @@ void dcn20_update_clocks_update_dentist(struct clk_mgr_internal *clk_mgr)uint32_t dppclk_wdivider =dentist_get_did_from_divider (dpp_divider);uint32_t dispclk_wdivider =dentist_get_did_from_divider (disp_divider); +uint32_t current_dispclk_wdivider; +uint32_t i; + +REG_GET (DENTIST_DISPCLK_CNTL , +DENTIST_DISPCLK_WDIVIDER , ¤t_dispclk_wdivider); + +/* When changing divider to or from 127, some extra programming is required to prevent corruption */ +if (current_dispclk_wdivider ==127 && dispclk_wdivider !=127 ) { +for (i =0 ; i < clk_mgr->base.ctx->dc->res_pool->pipe_count; i++) { +struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i]; +uint32_t fifo_level; +struct dccg *dccg = clk_mgr->base.ctx->dc->res_pool->dccg; +struct stream_encoder *stream_enc = pipe_ctx->stream_res.stream_enc; +int32_t N ; +int32_t j; + +if (!pipe_ctx->stream) +continue ; +/* Virtual encoders don't have this function */ +if (!stream_enc->funcs->get_fifo_cal_average_level) +continue ; + fifo_level = stream_enc->funcs->get_fifo_cal_average_level ( + stream_enc); +N = fifo_level /4 ; + dccg->funcs->set_fifo_errdet_ovr_en ( + dccg, + true); +for (j =0 ; j <N -4 ; j++) + dccg->funcs->otg_drop_pixel ( + dccg, + pipe_ctx->stream_res.tg->inst); + dccg->funcs->set_fifo_errdet_ovr_en ( + dccg, + false); + } + }else if (dispclk_wdivider ==127 && current_dispclk_wdivider !=127 ) { +REG_UPDATE (DENTIST_DISPCLK_CNTL , +DENTIST_DISPCLK_WDIVIDER ,126 ); +REG_WAIT (DENTIST_DISPCLK_CNTL ,DENTIST_DISPCLK_CHG_DONE ,1 ,50 ,100 ); +for (i =0 ; i < clk_mgr->base.ctx->dc->res_pool->pipe_count; i++) { +struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i]; +struct dccg *dccg = clk_mgr->base.ctx->dc->res_pool->dccg; +struct stream_encoder *stream_enc = pipe_ctx->stream_res.stream_enc; +uint32_t fifo_level; +int32_t N ; +int32_t j; + +if (!pipe_ctx->stream) +continue ; +/* Virtual encoders don't have this function */ +if (!stream_enc->funcs->get_fifo_cal_average_level) +continue ; + fifo_level = stream_enc->funcs->get_fifo_cal_average_level ( + stream_enc); +N = fifo_level /4 ; + dccg->funcs->set_fifo_errdet_ovr_en (dccg, true); +for (j =0 ; j <12 -N ; j++) + dccg->funcs->otg_add_pixel (dccg, + pipe_ctx->stream_res.tg->inst); + dccg->funcs->set_fifo_errdet_ovr_en (dccg, false); + } + }REG_UPDATE (DENTIST_DISPCLK_CNTL ,DENTIST_DISPCLK_WDIVIDER , dispclk_wdivider);
@@ -251,11 +313,11 @@ void dcn2_update_clocks(struct clk_mgr *clk_mgr_base,if (dpp_clock_lowered) {// if clock is being lowered, increase DTO before lowering refclk dcn20_update_clocks_update_dpp_dto (clk_mgr, context, safe_to_lower); -dcn20_update_clocks_update_dentist (clk_mgr); +dcn20_update_clocks_update_dentist (clk_mgr, context); }else {// if clock is being raised, increase refclk before lowering DTO if (update_dppclk || update_dispclk) -dcn20_update_clocks_update_dentist (clk_mgr); +dcn20_update_clocks_update_dentist (clk_mgr, context);// always update dtos unless clock is lowered and not safe to lower dcn20_update_clocks_update_dpp_dto (clk_mgr, context, safe_to_lower); }
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.h +2 -1
@@ -50,7 +50,8 @@ void dcn2_get_clock(struct clk_mgr *clk_mgr,enum dc_clock_type clock_type, struct dc_clock_config *clock_cfg); -void dcn20_update_clocks_update_dentist (struct clk_mgr_internal *clk_mgr); +void dcn20_update_clocks_update_dentist (struct clk_mgr_internal *clk_mgr, +struct dc_state *context);void dcn2_read_clocks_from_hw_dentist (struct clk_mgr *clk_mgr_base);
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c +2 -2
@@ -334,11 +334,11 @@ static void dcn3_update_clocks(struct clk_mgr *clk_mgr_base,if (dpp_clock_lowered) {/* if clock is being lowered, increase DTO before lowering refclk */ dcn20_update_clocks_update_dpp_dto (clk_mgr, context, safe_to_lower); -dcn20_update_clocks_update_dentist (clk_mgr); +dcn20_update_clocks_update_dentist (clk_mgr, context); }else {/* if clock is being raised, increase refclk before lowering DTO */ if (update_dppclk || update_dispclk) -dcn20_update_clocks_update_dentist (clk_mgr); +dcn20_update_clocks_update_dentist (clk_mgr, context);/* There is a check inside dcn20_update_clocks_update_dpp_dto which ensures * that we do not lower dto when it is not safe to lower. We do not need to * compare the current and new dppclk before calling this function.*/
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 24/24 drm/amd/display: Extend AUX timeout for DP initial reads
In reply to Anson JacobFrom: Wesley Chalmers <[email protected]>
[WHY]
DP LL Compliance tests require that the first DPCD transactions after a
hotplug have a timeout interval of 3.2 ms. In cases where LTTPR is
disabled, this means that the first reads from DP_SET_POWER and DP_DPCD_REV must have an extended timeout.
--- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +3 -4
@@ -3750,9 +3750,6 @@ static bool retrieve_link_cap(struct dc_link *link) LINK_AUX_DEFAULT_LTTPR_TIMEOUT_PERIOD); is_lttpr_present =dp_retrieve_lttpr_cap (link); -if (!is_lttpr_present) -dc_link_aux_try_to_configure_timeout (link->ddc,LINK_AUX_DEFAULT_TIMEOUT_PERIOD ); - status =core_link_read_dpcd (link,DP_SET_POWER , &dpcd_power_state,sizeof (dpcd_power_state));
@@ -3781,12 +3778,14 @@ static bool retrieve_link_cap(struct dc_link *link)break ; } -if (status !=DC_OK ) {dm_error ("%s: Read receiver caps dpcd data failed.\n" , __func__);return false; } +if (!is_lttpr_present) +dc_link_aux_try_to_configure_timeout (link->ddc,LINK_AUX_DEFAULT_TIMEOUT_PERIOD ); + {union training_aux_rd_interval aux_rd_interval;
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[Public]
Hi all,
This week this patchset was tested on the following systems:
HP Envy 360, with Ryzen 5 4500U, with the following display types: eDP 1080p 60hz, 4k 60hz (via USB-C to DP/HDMI), 1440p 144hz (via USB-C to DP/HDMI), 1680*1050 60hz (via USB-C to DP and then DP to DVI/VGA)
AMD Ryzen 9 5900H, with the following display types: eDP 1080p 60hz, 4k 60hz (via USB-C to DP/HDMI), 1440p 144hz (via USB-C to DP/HDMI), 1680*1050 60hz (via USB-C to DP and then DP to DVI/VGA)
Sapphire Pulse RX5700XT with the following display types:
4k 60hz (via DP/HDMI), 1440p 144hz (via DP/HDMI), 1680*1050 60hz (via DP to DVI/VGA)
Reference AMD RX6800 with the following display types:
4k 60hz (via DP/HDMI and USB-C to DP/HDMI), 1440p 144hz (via USB-C to DP/HDMI and USB-C to DP/HDMI), 1680*1050 60hz (via DP to DVI/VGA)
Included testing using a Startech DP 1.4 MST hub at 2x 4k 60hz, and 3x 1080p 60hz on all systems.
Thank you,
Dan Wheeler
Technologist | AMD
SW Display
------------------------------------------------------------------------------------------------------------------
1 Commerce Valley Dr E, Thornhill, ON L3T 7X6
Facebook | Twitter | amd.com
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Anson Jacob
Sent: June 10, 2021 12:28 PM
To: [email protected]
Cc: Brol, Eryk <[email protected]>; Li, Sun peng (Leo) <[email protected]>; Wentland, Harry <[email protected]>; Zhuo, Qingqing <[email protected]>; Siqueira, Rodrigo <[email protected]>; Li, Roman <[email protected]>; Jacob, Anson <[email protected]>; Pillai, Aurabindo <[email protected]>; Lakha, Bhawanpreet <[email protected]>; R, Bindu <[email protected]>
Subject: [PATCH 00/24] DC Patches June 10, 2021
This DC patchset brings improvements in multiple areas. In summary, we have:
* LTTPR improvements
* Backlight improvements
* eDP hotplug detection
*** BLURB HERE ***
Anthony Koo (1):
drm/amd/display: [FW Promotion] Release 0.0.70
Aric Cyr (1):
drm/amd/display: 3.2.140
Ashley Thomas (1):
drm/amd/display: add DMUB registers to crash dump diagnostic data.
David Galiffi (1):
drm/amd/display: Updated variable name.
Dmytro Laktyushkin (1):
drm/amd/display: Remove unnecessary blank lines
Josip Pavic (1):
drm/amd/display: tune backlight ramping profiles
Po-Ting Chen (1):
drm/amd/display: Change swizzle visual confirm reference pipe
Roman Li (1):
drm/amd/display: move psr dm interface to separate files
Wenjing Liu (1):
drm/amd/display: dp mst detection code refactor
Wesley Chalmers (14):
drm/amd/display: Read LTTPR caps first on hotplug drm/amd/display: Move LTTPR cap read into its own function drm/amd/display: Read LTTPR caps first on bootup drm/amd/display: Set LTTPR Transparent Mode after read link cap drm/amd/display: Always write repeater mode regardless of LTTPR drm/amd/display: Improve logic for is_lttpr_present drm/amd/display: Enforce DPCD Address ranges drm/amd/display: Rename constant
drm/amd/display: 7 retries + 50 ms timeout on AUX DEFER drm/amd/display: Do not count I2C DEFERs with AUX DEFERs drm/amd/display: Partition DPCD address space and break up
transactions
drm/amd/display: Add interface to get Calibrated Avg Level from FIFO drm/amd/display: Cover edge-case when changing DISPCLK WDIVIDER drm/amd/display: Extend AUX timeout for DP initial reads
Yi-Ling Chen (1):
drm/amd/display: add config option for eDP hotplug detection
.../gpu/drm/amd/display/amdgpu_dm/Makefile | 2 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 137 +---------- .../drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 166 +++++++++++++ .../drm/amd/display/amdgpu_dm/amdgpu_dm_psr.h | 37 +++ drivers/gpu/drm/amd/display/dc/Makefile | 2 +- .../display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 68 +++++- .../display/dc/clk_mgr/dcn20/dcn20_clk_mgr.h | 3 +- .../display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 4 +- .../drm/amd/display/dc/core/dc_hw_sequencer.c | 10 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 167 ++++++-------- .../gpu/drm/amd/display/dc/core/dc_link_dp.c | 170 +++++++------- .../drm/amd/display/dc/core/dc_link_dpcd.c | 218 ++++++++++++++++++ .../drm/amd/display/dc/core/dc_link_hwss.c | 31 +-- drivers/gpu/drm/amd/display/dc/dc.h | 3 +- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 100 +++++++- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 4 + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 23 +- .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 5 + .../display/dc/dcn10/dcn10_stream_encoder.h | 24 ++ .../display/dc/dcn20/dcn20_stream_encoder.c | 12 + .../display/dc/dcn20/dcn20_stream_encoder.h | 3 + .../dc/dcn30/dcn30_dio_stream_encoder.c | 2 + .../dc/dcn30/dcn30_dio_stream_encoder.h | 12 + .../drm/amd/display/dc/dcn30/dcn30_hwseq.c | 4 + .../drm/amd/display/dc/dcn31/dcn31_hwseq.c | 1 + .../drm/amd/display/dc/dml/display_mode_vba.c | 2 - .../gpu/drm/amd/display/dc/hdcp/hdcp_msg.c | 1 + .../gpu/drm/amd/display/dc/inc/dc_link_dp.h | 11 +- .../amd/display/dc/inc/hw/stream_encoder.h | 3 + .../gpu/drm/amd/display/dc/inc/link_dpcd.h | 18 ++ .../gpu/drm/amd/display/dc/inc/link_hwss.h | 14 -- drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 29 +++ .../gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 4 +- .../gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 65 +++++- .../gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 14 +- .../gpu/drm/amd/display/dmub/src/dmub_dcn21.c | 5 +- .../gpu/drm/amd/display/dmub/src/dmub_dcn30.c | 5 +- .../drm/amd/display/dmub/src/dmub_dcn301.c | 5 +- .../drm/amd/display/dmub/src/dmub_dcn302.c | 5 +- .../drm/amd/display/dmub/src/dmub_dcn303.c | 5 +- .../gpu/drm/amd/display/dmub/src/dmub_srv.c | 10 + .../amd/display/modules/power/power_helpers.c | 20 +- .../include/asic_reg/dcn/dcn_3_0_1_sh_mask.h | 2 + .../include/asic_reg/dcn/dcn_3_1_2_sh_mask.h | 2 + include/drm/drm_dp_helper.h | 17 ++ 45 files changed, 1042 insertions(+), 403 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.h create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_link_dpcd.c create mode 100644 drivers/gpu/drm/amd/display/dc/inc/link_dpcd.h
--
2.25.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%7Cdaniel.wheeler%40amd.com%7C3bab580e964e468fb54a08d92c2ce15c%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637589393544509598%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=IdOfoStTgKT0SdjvMNrdFiGMJuK%2FnvPCjG%2Bw%2FO5xveM%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx