DC Patches June 14, 2023
Subsystems (5)
cover DC Patches June 14, 2023
This DC patch-set brings improvements in multiple areas. In summary, we highlight:
- DCN314 fixes
- DCN32x fixes
- New fast update sequence enablement
- DC mode clock switching enablement for DCN32x
- DP link loss fix
- New debugfs entry to set MST link settings
Alvin Lee (4):
drm/amd/display: Fix pipe check condition for manual trigger drm/amd/display: Clear update flags at end of flip drm/amd/display: enable the new fast update path for supported ASICs drm/amd/display: Enable dc mode clock switching for DCN32x
Aric Cyr (1):
drm/amd/display: 3.2.240
Austin Zheng (2):
drm/amd/display: Add Clock Table Entry With Max DC Values drm/amd/display: Disable DC Mode Capping On DCN321
Daniel Miess (4):
Partially revert "drm/amd/display: Fix possible underflow for displays
with large vblank"
drm/amd/display: Move DPP/HUBP power gating setting below debug
initialization
Revert "drm/amd/display: Move DCN314 DOMAIN power control to DMCUB" drm/amd/display: Prevent dcn314 RCO from enabling on unsupported chips
Dmytro Laktyushkin (1):
drm/amd/display: fix odm k2 div calculation
Fangzhi Zuo (1):
drm/amd/display: Add MST Preferred Link Setting Entry
Ilya Bakoulin (1):
drm/amd/display: Fix 128b132b link loss handling
Leo Chen (1):
drm/amd/display: disable seamless boot if force_odm_combine is enabled
Sridevi Arvindekar (1):
drm/amd/display: add missing ABM registers
Sung-huai Wang (1):
drm/amd/display: add a NULL pointer check
.../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 156 +++++++++++++++++- .../display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 43 ++++- drivers/gpu/drm/amd/display/dc/core/dc.c | 20 ++- .../drm/amd/display/dc/core/dc_hw_sequencer.c | 2 +- drivers/gpu/drm/amd/display/dc/dc.h | 4 +- drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 29 +++- .../amd/display/dc/dce112/dce112_resource.c | 10 +- .../drm/amd/display/dc/dcn30/dcn30_resource.c | 3 +- .../amd/display/dc/dcn302/dcn302_resource.c | 3 +- .../amd/display/dc/dcn303/dcn303_resource.c | 1 + .../drm/amd/display/dc/dcn314/dcn314_dccg.c | 2 +- .../drm/amd/display/dc/dcn314/dcn314_hwseq.c | 30 +--- .../drm/amd/display/dc/dcn314/dcn314_hwseq.h | 4 +- .../drm/amd/display/dc/dcn314/dcn314_init.c | 2 +- .../amd/display/dc/dcn314/dcn314_resource.c | 19 ++- .../gpu/drm/amd/display/dc/dcn32/dcn32_hubp.c | 1 + .../drm/amd/display/dc/dcn32/dcn32_hwseq.c | 8 +- .../drm/amd/display/dc/dcn32/dcn32_hwseq.h | 2 +- .../gpu/drm/amd/display/dc/dcn32/dcn32_init.c | 1 + .../drm/amd/display/dc/dcn32/dcn32_resource.c | 2 + .../amd/display/dc/dcn321/dcn321_resource.c | 3 + .../amd/display/dc/dml/dcn314/dcn314_fpu.c | 2 +- .../drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 90 +++++++++- .../drm/amd/display/dc/dml/dcn32/dcn32_fpu.h | 4 - .../amd/display/dc/dml/dcn321/dcn321_fpu.c | 102 ++++++++++-- .../amd/display/dc/dml/dcn321/dcn321_fpu.h | 4 - .../amd/display/dc/dml/display_mode_structs.h | 1 + .../gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 1 + .../amd/display/dc/inc/hw_sequencer_private.h | 2 +- .../dc/link/protocols/link_dp_irq_handler.c | 11 +- 30 files changed, 474 insertions(+), 88 deletions(-)
Signature · 1 line
2.40.1
PATCH 1/17 Partially revert "drm/amd/display: Fix possible underflow for displays with large vblank"
From: Daniel Miess <[email protected]>
This partially reverts commit 94bea120b3f5 ("drm/amd/display: Fix possible underflow for displays with large vblank").
[Why]
The increased value of VBlankNomDefaultUS causes underflow at the desktop of an IP KVM setup
[How]
Change the value from 800 back to 668
--- drivers/gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c +1 -1
@@ -33,7 +33,7 @@#include "dml/display_mode_vba.h" struct _vcs_dpi_ip_params_st dcn3_14_ip = { - .VBlankNomDefaultUS =800 , + .VBlankNomDefaultUS =668 , .gpuvm_enable =1 , .gpuvm_max_page_table_levels =1 , .hostvm_enable =1 ,
Signature · 1 line
2.40.1
PATCH 2/17 drm/amd/display: add a NULL pointer check
In reply to Hamza MahfoozFrom: Sung-huai Wang <[email protected]>
[Why & How]
We have to check if stream is properly initialized before calling find_matching_pll(), otherwise we might end up trying to deferecence a NULL pointer.
--- .../gpu/drm/amd/display/dc/dce112/dce112_resource.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c +6 -4
@@ -974,10 +974,12 @@ enum dc_status resource_map_phy_clock_resources( || dc_is_virtual_signal(pipe_ctx->stream->signal)) pipe_ctx->clock_source = dc->res_pool->dp_clock_source; - else - pipe_ctx->clock_source = find_matching_pll( - &context->res_ctx, dc->res_pool, - stream); + else { +if (stream && stream->link && stream->link->link_enc) + pipe_ctx->clock_source =find_matching_pll ( + &context->res_ctx, dc->res_pool, + stream); + }if (pipe_ctx->clock_source ==NULL )return DC_NO_CLOCK_SOURCE_RESOURCE ;
Signature · 1 line
2.40.1
PATCH 3/17 drm/amd/display: Move DPP/HUBP power gating setting below debug initialization
In reply to Hamza MahfoozFrom: Daniel Miess <[email protected]>
[Why]
Setting DPP/HUBP power gating debug settings occurs before debug struct initalization leading to the values being clobbered
[How]
Move the setting down below debug struct initalization
--- .../drm/amd/display/dc/dcn314/dcn314_resource.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c +8 -7
@@ -1883,13 +1883,6 @@ static bool dcn314_resource_construct(/* Use pipe context based otg sync logic */ dc->config.use_pipe_ctx_sync_logic = true; -/* Disable pipe power gating when unsupported */ -if (ctx->asic_id.hw_internal_rev ==0x01 || - ctx->asic_id.hw_internal_rev ==0x80 ) { - dc->debug.disable_dpp_power_gate = true; - dc->debug.disable_hubp_power_gate = true; - } -/* read VBIOS LTTPR caps */ {if (ctx->dc_bios->funcs->get_lttpr_caps) {
@@ -1910,6 +1903,14 @@ static bool dcn314_resource_construct( dc->debug = debug_defaults_drv; else dc->debug = debug_defaults_diags; + +/* Disable pipe power gating when unsupported */ +if (ctx->asic_id.hw_internal_rev ==0x01 || + ctx->asic_id.hw_internal_rev ==0x80 ) { + dc->debug.disable_dpp_power_gate = true; + dc->debug.disable_hubp_power_gate = true; + } +// Init the vm_helper if (dc->vm_helper)vm_helper_init (dc->vm_helper,16 );
Signature · 1 line
2.40.1
PATCH 4/17 Revert "drm/amd/display: Move DCN314 DOMAIN power control to DMCUB"
In reply to Hamza MahfoozFrom: Daniel Miess <[email protected]>
This reverts commit e383b12709e32d6494c948422070c2464b637e44.
Controling hubp power gating using the DMCUB isn't stable so we are reverting this change to move control back into the driver.
--- .../drm/amd/display/dc/dcn314/dcn314_hwseq.c | 21 ------------------- .../drm/amd/display/dc/dcn314/dcn314_hwseq.h | 2 -- .../drm/amd/display/dc/dcn314/dcn314_init.c | 2 +- 3 files changed, 1 insertion(+), 24 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.c +0 -21
@@ -424,27 +424,6 @@ void dcn314_dpp_root_clock_control(struct dce_hwseq *hws, unsigned int dpp_inst, hws->ctx->dc->res_pool->dccg, dpp_inst, clock_on); } -void dcn314_hubp_pg_control (struct dce_hwseq *hws,unsigned int hubp_inst,bool power_on) -{ -struct dc_context *ctx = hws->ctx; -union dmub_rb_cmd cmd; - -if (hws->ctx->dc->debug.disable_hubp_power_gate) -return ; - -PERF_TRACE (); - -memset (&cmd,0 ,sizeof (cmd)); - cmd.domain_control.header.type =DMUB_CMD__VBIOS ; - cmd.domain_control.header.sub_type =DMUB_CMD__VBIOS_DOMAIN_CONTROL ; - cmd.domain_control.header.payload_bytes =sizeof (cmd.domain_control.data); - cmd.domain_control.data.inst = hubp_inst; - cmd.domain_control.data.power_gate = !power_on; - -dm_execute_dmub_cmd (ctx, &cmd,DM_DMUB_WAIT_TYPE_WAIT ); - -PERF_TRACE (); -}static void apply_symclk_on_tx_off_wa (struct dc_link *link) {/* There are use cases where SYMCLK is referenced by OTG. For instance
drivers/gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.h +0 -2
@@ -43,8 +43,6 @@ void dcn314_set_pixels_per_cycle(struct pipe_ctx *pipe_ctx);void dcn314_resync_fifo_dccg_dio (struct dce_hwseq *hws,struct dc *dc,struct dc_state *context); -void dcn314_hubp_pg_control (struct dce_hwseq *hws,unsigned int hubp_inst,bool power_on); -void dcn314_dpp_root_clock_control (struct dce_hwseq *hws,unsigned int dpp_inst,bool clock_on);void dcn314_disable_link_output (struct dc_link *link,const struct link_resource *link_res,enum signal_type signal);
drivers/gpu/drm/amd/display/dc/dcn314/dcn314_init.c +1 -1
@@ -139,7 +139,7 @@ static const struct hwseq_private_funcs dcn314_private_funcs = { .plane_atomic_power_down = dcn10_plane_atomic_power_down, .enable_power_gating_plane = dcn314_enable_power_gating_plane, .dpp_root_clock_control = dcn314_dpp_root_clock_control, - .hubp_pg_control = dcn314_hubp_pg_control, + .hubp_pg_control = dcn31_hubp_pg_control, .program_all_writeback_pipes_in_tree = dcn30_program_all_writeback_pipes_in_tree, .update_odm = dcn314_update_odm, .dsc_pg_control = dcn314_dsc_pg_control,
Signature · 1 line
2.40.1
PATCH 5/17 drm/amd/display: Add Clock Table Entry With Max DC Values
In reply to Hamza MahfoozFrom: Austin Zheng <[email protected]>
Why:
Certain display configs resulted in underflow
How:
Add an entry containing all max DC clock timings
--- .../drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 90 ++++++++++++++++-- .../drm/amd/display/dc/dml/dcn32/dcn32_fpu.h | 4 - .../amd/display/dc/dml/dcn321/dcn321_fpu.c | 92 +++++++++++++++++-- .../amd/display/dc/dml/dcn321/dcn321_fpu.h | 4 - .../amd/display/dc/dml/display_mode_structs.h | 1 + 5 files changed, 171 insertions(+), 20 deletions(-)
drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c +84 -6
@@ -485,24 +485,20 @@ static void get_optimal_ntuple(struct _vcs_dpi_voltage_scaling_st *entry) } } -void insert_entry_into_table_sorted (struct _vcs_dpi_voltage_scaling_st *table, +static void insert_entry_into_table_sorted (struct _vcs_dpi_voltage_scaling_st *table,unsigned int *num_entries,struct _vcs_dpi_voltage_scaling_st *entry) {int i =0 ;int index =0 ; -float net_bw_of_new_state =0 ;dc_assert_fp_enabled (); -get_optimal_ntuple (entry); -if (*num_entries ==0 ) { table[0 ] = *entry; (*num_entries)++; }else { - net_bw_of_new_state =calculate_net_bw_in_kbytes_sec (entry); -while (net_bw_of_new_state >calculate_net_bw_in_kbytes_sec (&table[index])) { +while (entry->net_bw_in_kbytes_sec > table[index].net_bw_in_kbytes_sec) { index++;if (index >= *num_entries)break ;
@@ -2349,6 +2345,63 @@ void dcn32_patch_dpm_table(struct clk_bw_params *bw_params) bw_params->clk_table.entries[0 ].memclk_mhz = dcn3_2_soc.clock_limits[0 ].dram_speed_mts /16 ; } +static void swap_table_entries (struct _vcs_dpi_voltage_scaling_st *first_entry, +struct _vcs_dpi_voltage_scaling_st *second_entry) +{ +struct _vcs_dpi_voltage_scaling_st temp_entry = *first_entry; + *first_entry = *second_entry; + *second_entry = temp_entry; +} + +/* +* sort_entries_with_same_bw - Sort entries sharing the same bandwidth by DCFCLK +*/ +static void sort_entries_with_same_bw (struct _vcs_dpi_voltage_scaling_st *table,unsigned int *num_entries) +{ +unsigned int start_index =0 ; +unsigned int end_index =0 ; +unsigned int current_bw =0 ; + +for (int i =0 ; i < (*num_entries -1 ); i++) { +if (table[i].net_bw_in_kbytes_sec == table[i+1 ].net_bw_in_kbytes_sec) { + current_bw = table[i].net_bw_in_kbytes_sec; + start_index = i; + end_index = ++i; + +while ((i < (*num_entries -1 )) && (table[i+1 ].net_bw_in_kbytes_sec == current_bw)) + end_index = ++i; + } + +if (start_index != end_index) { +for (int j = start_index; j < end_index; j++) { +for (int k = start_index; k < end_index; k++) { +if (table[k].dcfclk_mhz > table[k+1 ].dcfclk_mhz) +swap_table_entries (&table[k], &table[k+1 ]); + } + } + } + + start_index =0 ; + end_index =0 ; + + } +} + +/* +* remove_inconsistent_entries - Ensure entries with the same bandwidth have MEMCLK and FCLK monotonically increasing +* and remove entries that do not +*/ +static void remove_inconsistent_entries (struct _vcs_dpi_voltage_scaling_st *table,unsigned int *num_entries) +{ +for (int i =0 ; i < (*num_entries -1 ); i++) { +if (table[i].net_bw_in_kbytes_sec == table[i+1 ].net_bw_in_kbytes_sec) { +if ((table[i].dram_speed_mts > table[i+1 ].dram_speed_mts) || + (table[i].fabricclk_mhz > table[i+1 ].fabricclk_mhz)) +remove_entry_from_table_at_index (table, num_entries, i); + } + } +} +/* * override_max_clk_values - Overwrite the max clock frequencies with the max DC mode timings * Input:
@@ -2480,6 +2533,8 @@ static int build_synthetic_soc_states(bool disable_dc_mode_overwrite, struct clk entry.fabricclk_mhz =0 ; entry.dram_speed_mts =0 ; +get_optimal_ntuple (&entry); + entry.net_bw_in_kbytes_sec =calculate_net_bw_in_kbytes_sec (&entry);insert_entry_into_table_sorted (table, num_entries, &entry); }
@@ -2488,6 +2543,8 @@ static int build_synthetic_soc_states(bool disable_dc_mode_overwrite, struct clk entry.fabricclk_mhz =0 ; entry.dram_speed_mts =0 ; +get_optimal_ntuple (&entry); + entry.net_bw_in_kbytes_sec =calculate_net_bw_in_kbytes_sec (&entry);insert_entry_into_table_sorted (table, num_entries, &entry);// Insert the UCLK DPMS
@@ -2496,6 +2553,8 @@ static int build_synthetic_soc_states(bool disable_dc_mode_overwrite, struct clk entry.fabricclk_mhz =0 ; entry.dram_speed_mts = bw_params->clk_table.entries[i].memclk_mhz *16 ; +get_optimal_ntuple (&entry); + entry.net_bw_in_kbytes_sec =calculate_net_bw_in_kbytes_sec (&entry);insert_entry_into_table_sorted (table, num_entries, &entry); }
@@ -2506,6 +2565,8 @@ static int build_synthetic_soc_states(bool disable_dc_mode_overwrite, struct clk entry.fabricclk_mhz = bw_params->clk_table.entries[i].fclk_mhz; entry.dram_speed_mts =0 ; +get_optimal_ntuple (&entry); + entry.net_bw_in_kbytes_sec =calculate_net_bw_in_kbytes_sec (&entry);insert_entry_into_table_sorted (table, num_entries, &entry); } }
@@ -2515,6 +2576,8 @@ static int build_synthetic_soc_states(bool disable_dc_mode_overwrite, struct clk entry.fabricclk_mhz = max_clk_data.fclk_mhz; entry.dram_speed_mts =0 ; +get_optimal_ntuple (&entry); + entry.net_bw_in_kbytes_sec =calculate_net_bw_in_kbytes_sec (&entry);insert_entry_into_table_sorted (table, num_entries, &entry); }
@@ -2530,6 +2593,21 @@ static int build_synthetic_soc_states(bool disable_dc_mode_overwrite, struct clkremove_entry_from_table_at_index (table, num_entries, i); } +// Insert entry with all max dc limits without bandwidth matching +if (!disable_dc_mode_overwrite) { +struct _vcs_dpi_voltage_scaling_st max_dc_limits_entry = entry; + + max_dc_limits_entry.dcfclk_mhz = max_clk_data.dcfclk_mhz; + max_dc_limits_entry.fabricclk_mhz = max_clk_data.fclk_mhz; + max_dc_limits_entry.dram_speed_mts = max_clk_data.memclk_mhz *16 ; + + max_dc_limits_entry.net_bw_in_kbytes_sec =calculate_net_bw_in_kbytes_sec (&max_dc_limits_entry); +insert_entry_into_table_sorted (table, num_entries, &max_dc_limits_entry); + +sort_entries_with_same_bw (table, num_entries); +remove_inconsistent_entries (table, num_entries); + } +// At this point, the table only contains supported points of interest // it could be used as is, but some states may be redundant due to // coarse grained nature of some clocks, so we want to round up to
drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h +0 -4
@@ -39,10 +39,6 @@ void dcn32_helper_populate_phantom_dlg_params(struct dc *dc,uint8_t dcn32_predict_pipe_split (struct dc_state *context,display_e2e_pipe_params_st *pipe_e2e); -void insert_entry_into_table_sorted (struct _vcs_dpi_voltage_scaling_st *table, -unsigned int *num_entries, -struct _vcs_dpi_voltage_scaling_st *entry); - void dcn32_set_phantom_stream_timing(struct dc *dc, struct dc_state *context, struct pipe_ctx *ref_pipe,
drivers/gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c +86 -6
152 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.h +0 -4
@@ -29,10 +29,6 @@#include "dml/display_mode_vba.h" -void dcn321_insert_entry_into_table_sorted (struct _vcs_dpi_voltage_scaling_st *table, -unsigned int *num_entries, -struct _vcs_dpi_voltage_scaling_st *entry); -void dcn321_update_bw_bounding_box_fpu (struct dc *dc,struct clk_bw_params *bw_params);#endif
drivers/gpu/drm/amd/display/dc/dml/display_mode_structs.h +1 -0
@@ -167,6 +167,7 @@ struct _vcs_dpi_voltage_scaling_st {double phyclk_mhz;double dppclk_mhz;double dtbclk_mhz; +float net_bw_in_kbytes_sec; };/**
Signature · 1 line
2.40.1
PATCH 6/17 drm/amd/display: add missing ABM registers
In reply to Hamza MahfoozFrom: Sridevi Arvindekar <[email protected]>
[Why]
We are currently missing some ABM registers.
[How]
Add the missing registers to dce_abm.h.
--- drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 29 +++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dce/dce_abm.h +28 -1
@@ -266,7 +266,24 @@type MASTER_COMM_INTERRUPT ; \type MASTER_COMM_CMD_REG_BYTE0 ; \type MASTER_COMM_CMD_REG_BYTE1 ; \ - type MASTER_COMM_CMD_REG_BYTE2 +type MASTER_COMM_CMD_REG_BYTE2 ; \ +type ABM1_HG_BIN_33_40_SHIFT_INDEX ; \ +type ABM1_HG_BIN_33_64_SHIFT_FLAG ; \ +type ABM1_HG_BIN_41_48_SHIFT_INDEX ; \ +type ABM1_HG_BIN_49_56_SHIFT_INDEX ; \ +type ABM1_HG_BIN_57_64_SHIFT_INDEX ; \ +type ABM1_HG_RESULT_DATA ; \ +type ABM1_HG_RESULT_INDEX ; \ +type ABM1_ACE_SLOPE_DATA ; \ +type ABM1_ACE_OFFSET_DATA ; \ +type ABM1_ACE_OFFSET_SLOPE_INDEX ; \ +type ABM1_ACE_THRES_INDEX ; \ +type ABM1_ACE_IGNORE_MASTER_LOCK_EN ; \ +type ABM1_ACE_READBACK_DB_REG_VALUE_EN ; \ +type ABM1_ACE_DBUF_REG_UPDATE_PENDING ; \ +type ABM1_ACE_LOCK ; \ +type ABM1_ACE_THRES_DATA_1 ; \ + type ABM1_ACE_THRES_DATA_2struct dce_abm_shift {ABM_REG_FIELD_LIST (uint8_t );
@@ -288,6 +305,16 @@ struct dce_abm_registers {uint32_t DC_ABM1_LS_MIN_MAX_PIXEL_VALUE_THRES ;uint32_t DC_ABM1_HGLS_REG_READ_PROGRESS ;uint32_t DC_ABM1_ACE_OFFSET_SLOPE_0 ; +uint32_t DC_ABM1_ACE_OFFSET_SLOPE_DATA ; +uint32_t DC_ABM1_ACE_PWL_CNTL ; +uint32_t DC_ABM1_HG_BIN_33_40_SHIFT_INDEX ; +uint32_t DC_ABM1_HG_BIN_33_64_SHIFT_FLAG ; +uint32_t DC_ABM1_HG_BIN_41_48_SHIFT_INDEX ; +uint32_t DC_ABM1_HG_BIN_49_56_SHIFT_INDEX ; +uint32_t DC_ABM1_HG_BIN_57_64_SHIFT_INDEX ; +uint32_t DC_ABM1_HG_RESULT_DATA ; +uint32_t DC_ABM1_HG_RESULT_INDEX ; +uint32_t DC_ABM1_ACE_THRES_DATA ;uint32_t DC_ABM1_ACE_THRES_12 ;uint32_t MASTER_COMM_CNTL_REG ;uint32_t MASTER_COMM_CMD_REG ;
Signature · 1 line
2.40.1
PATCH 7/17 drm/amd/display: Prevent dcn314 RCO from enabling on unsupported chips
In reply to Hamza MahfoozFrom: Daniel Miess <[email protected]>
[Why]
In some cases enabling RCO on older dcn314 chips leads to underflow
[How]
Explicitly disable RCO on unsupported dcn314 chips
--- drivers/gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c | 2 +- drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c +1 -1
@@ -332,7 +332,7 @@ static void dccg314_dpp_root_clock_control( {struct dcn_dccg *dccg_dcn =TO_DCN_DCCG (dccg); -if (dccg->dpp_clock_gated[dpp_inst] == clock_on) +if (dccg->dpp_clock_gated[dpp_inst] != clock_on)return ;if (clock_on) {
drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c +5 -1
@@ -1904,11 +1904,15 @@ static bool dcn314_resource_construct(else dc->debug = debug_defaults_diags; -/* Disable pipe power gating when unsupported */ +if (ctx->asic_id.hw_internal_rev ==0x01 || ctx->asic_id.hw_internal_rev ==0x80 ) { +/* Disable pipe power gating when unsupported */ dc->debug.disable_dpp_power_gate = true; dc->debug.disable_hubp_power_gate = true; + +/* Disable root clock optimization when unsupported*/ + dc->debug.root_clock_optimization.u32All =0 ; }// Init the vm_helper
Signature · 1 line
2.40.1
PATCH 8/17 drm/amd/display: Fix pipe check condition for manual trigger
In reply to Hamza MahfoozFrom: Alvin Lee <[email protected]>
Condition for programming manually trigger used the wrong pipe (always used top pipe instead of the one we are iterating through).
--- drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c +1 -1
@@ -610,7 +610,7 @@ void hwss_build_fast_sequence(struct dc *dc, current_mpc_pipe = current_pipe;while (current_mpc_pipe) { -if (!current_mpc_pipe->bottom_pipe && !pipe_ctx->next_odm_pipe && +if (!current_mpc_pipe->bottom_pipe && !current_mpc_pipe->next_odm_pipe && current_mpc_pipe->stream && current_mpc_pipe->plane_state && current_mpc_pipe->plane_state->update_flags.bits.addr_update && !current_mpc_pipe->plane_state->skip_manual_trigger) {
Signature · 1 line
2.40.1
PATCH 9/17 drm/amd/display: Clear update flags at end of flip
In reply to Hamza MahfoozFrom: Alvin Lee <[email protected]>
Clear update flags so the next flip does not have any redundant programming (if a subsequent flip does not have a stream or plane update, the update flags are not cleared).
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc.c +7 -0
@@ -3579,6 +3579,13 @@ static void commit_planes_for_stream_fast(struct dc *dc,hwss_execute_sequence (dc, context->block_sequence, context->block_sequence_steps); +/* Clear update flags so next flip doesn't have redundant programming +* (if there's no stream update, the update flags are not cleared). +*/ +if (top_pipe_to_program->plane_state) + top_pipe_to_program->plane_state->update_flags.raw =0 ; +if (top_pipe_to_program->stream) + top_pipe_to_program->stream->update_flags.raw =0 ; } static void commit_planes_for_stream(struct dc *dc,
Signature · 1 line
2.40.1
PATCH 10/17 drm/amd/display: enable the new fast update path for supported ASICs
In reply to Hamza MahfoozFrom: Alvin Lee <[email protected]>
The new fast update sequence is now supported on some ASICs. So, enable it by default for all applicable ASICs.
--- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 3 ++- drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c | 3 ++- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c | 1 + 4 files changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c +2 -1
@@ -725,7 +725,8 @@ static const struct dc_debug_options debug_defaults_drv = { .dwb_fi_phase = -1, // -1 = disable, .dmub_command_table = true, .use_max_lb = true, - .exit_idle_opt_for_cursor_updates = true + .exit_idle_opt_for_cursor_updates = true, + .enable_legacy_fast_update = false, };static const struct dc_panel_config panel_config_defaults = {
drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c +2 -1
@@ -95,7 +95,8 @@ static const struct dc_debug_options debug_defaults_drv = { .dwb_fi_phase = -1, // -1 = disable, .dmub_command_table = true, .use_max_lb = true, - .exit_idle_opt_for_cursor_updates = true + .exit_idle_opt_for_cursor_updates = true, + .enable_legacy_fast_update = false, };static const struct dc_panel_config panel_config_defaults = {
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c +1 -0
@@ -732,6 +732,7 @@ static const struct dc_debug_options debug_defaults_drv = { .disable_dp_plus_plus_wa = true, .fpo_vactive_min_active_margin_us = 200, .fpo_vactive_max_blank_us = 1000, + .enable_legacy_fast_update = false, }; static struct dce_aux *dcn32_aux_engine_create(
drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c +1 -0
@@ -730,6 +730,7 @@ static const struct dc_debug_options debug_defaults_drv = { .disable_subvp_high_refresh = false, .fpo_vactive_min_active_margin_us = 200, .fpo_vactive_max_blank_us = 1000, + .enable_legacy_fast_update = false, }; static struct dce_aux *dcn321_aux_engine_create(
Signature · 1 line
2.40.1
PATCH 11/17 drm/amd/display: Disable DC Mode Capping On DCN321
In reply to Hamza MahfoozFrom: Austin Zheng <[email protected]>
Why:
Limiting clocks to DC mode max results in some
display modes to no longer be supported
How:
Disable the path that limits the clock values
--- .../gpu/drm/amd/display/dc/dcn321/dcn321_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c +1 -0
@@ -731,6 +731,7 @@ static const struct dc_debug_options debug_defaults_drv = { .fpo_vactive_min_active_margin_us = 200, .fpo_vactive_max_blank_us = 1000, .enable_legacy_fast_update = false, + .disable_dc_mode_overwrite = true, }; static struct dce_aux *dcn321_aux_engine_create(
drivers/gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c +5 -5
@@ -415,11 +415,11 @@ static int build_synthetic_soc_states(bool disable_dc_mode_overwrite, struct clkif (max_clk_data.fclk_mhz ==0 ) max_clk_data.fclk_mhz = max_clk_data.dcfclk_mhz * - dcn3_2_soc.pct_ideal_sdp_bw_after_urgent / - dcn3_2_soc.pct_ideal_fabric_bw_after_urgent; + dcn3_21_soc.pct_ideal_sdp_bw_after_urgent / + dcn3_21_soc.pct_ideal_fabric_bw_after_urgent;if (max_clk_data.phyclk_mhz ==0 ) - max_clk_data.phyclk_mhz = dcn3_2_soc.clock_limits[0 ].phyclk_mhz; + max_clk_data.phyclk_mhz = dcn3_21_soc.clock_limits[0 ].phyclk_mhz; *num_entries =0 ; entry.dispclk_mhz = max_clk_data.dispclk_mhz;
@@ -427,8 +427,8 @@ static int build_synthetic_soc_states(bool disable_dc_mode_overwrite, struct clk entry.dppclk_mhz = max_clk_data.dppclk_mhz; entry.dtbclk_mhz = max_clk_data.dtbclk_mhz; entry.phyclk_mhz = max_clk_data.phyclk_mhz; - entry.phyclk_d18_mhz = dcn3_2_soc.clock_limits[0 ].phyclk_d18_mhz; - entry.phyclk_d32_mhz = dcn3_2_soc.clock_limits[0 ].phyclk_d32_mhz; + entry.phyclk_d18_mhz = dcn3_21_soc.clock_limits[0 ].phyclk_d18_mhz; + entry.phyclk_d32_mhz = dcn3_21_soc.clock_limits[0 ].phyclk_d32_mhz;// Insert all the DCFCLK STAs for (i =0 ; i < num_dcfclk_stas; i++) {
Signature · 1 line
2.40.1
PATCH 12/17 drm/amd/display: disable seamless boot if force_odm_combine is enabled
In reply to Hamza MahfoozFrom: Leo Chen <[email protected]>
[Why & How]
Having seamless boot on while forcing debug option ODM combine 2 to 1 will cause some corruptions because of some missing programmings.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc.c +3 -0
@@ -1629,6 +1629,9 @@ bool dc_validate_boot_timing(const struct dc *dc,return false; } +if (dc->debug.force_odm_combine) +return false; +/* Check for enabled DIG to identify enabled display */ if (!link->link_enc->funcs->is_dig_enabled (link->link_enc))return false;
Signature · 1 line
2.40.1
PATCH 13/17 drm/amd/display: Add MST Preferred Link Setting Entry
In reply to Hamza MahfoozFrom: Fangzhi Zuo <[email protected]>
When using debugfs to change MST link settings, we need to wait until the next stream update to apply the preferred link setting. So, trigger a hotplug event right after the preferred link setting is applied.
--- .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 156 +++++++++++++++++- 1 file changed, 155 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +155 -1
@@ -336,6 +336,153 @@ static ssize_t dp_link_settings_write(struct file *f, const char __user *buf,return size; } +static bool dp_mst_is_end_device (struct amdgpu_dm_connector *aconnector) +{ +bool is_end_device = false; +struct drm_dp_mst_topology_mgr *mgr =NULL ; +struct drm_dp_mst_port *port =NULL ; + +if (aconnector->mst_root && aconnector->mst_root->mst_mgr.mst_state) { + mgr = &aconnector->mst_root->mst_mgr; + port = aconnector->mst_output_port; + +drm_modeset_lock (&mgr->base.lock,NULL ); +if (port->pdt ==DP_PEER_DEVICE_SST_SINK || + port->pdt ==DP_PEER_DEVICE_DP_LEGACY_CONV ) + is_end_device = true; +drm_modeset_unlock (&mgr->base.lock); + } + +return is_end_device; +} + +/* Change MST link setting +* +* valid lane count value: 1, 2, 4 +* valid link rate value: +* 06h = 1.62Gbps per lane +* 0Ah = 2.7Gbps per lane +* 0Ch = 3.24Gbps per lane +* 14h = 5.4Gbps per lane +* 1Eh = 8.1Gbps per lane +* 3E8h = 10.0Gbps per lane +* 546h = 13.5Gbps per lane +* 7D0h = 20.0Gbps per lane +* +* debugfs is located at /sys/kernel/debug/dri/0/DP-x/mst_link_settings +* +* for example, to force to 2 lane, 10.0GHz, +* echo 2 0x3e8 > /sys/kernel/debug/dri/0/DP-x/mst_link_settings +* +* Valid input will trigger hotplug event to get new link setting applied +* Invalid input will trigger training setting reset +* +* The usage can be referred to link_settings entry +* +*/ +static ssize_t dp_mst_link_setting (struct file *f,const char __user *buf, +size_t size,loff_t *pos) +{ +struct amdgpu_dm_connector *aconnector =file_inode (f)->i_private; +struct dc_link *link = aconnector->dc_link; +struct amdgpu_device *adev =drm_to_adev (aconnector->base.dev); +struct dc *dc = (struct dc *)link->dc; +struct dc_link_settings prefer_link_settings; +char *wr_buf =NULL ; +const uint32_t wr_buf_size =40 ; +/* 0: lane_count; 1: link_rate */ +int max_param_num =2 ; +uint8_t param_nums =0 ; +long param[2 ]; +bool valid_input = true; + +if (!dp_mst_is_end_device (aconnector)) +return -EINVAL ; + +if (size ==0 ) +return -EINVAL ; + + wr_buf =kcalloc (wr_buf_size,sizeof (char ),GFP_KERNEL ); +if (!wr_buf) +return -ENOSPC ; + +if (parse_write_buffer_into_params (wr_buf, wr_buf_size, + (long *)param, buf, + max_param_num, + ¶m_nums)) { +kfree (wr_buf); +return -EINVAL ; + } + +if (param_nums <=0 ) { +kfree (wr_buf); +DRM_DEBUG_DRIVER ("user data not be read\n" ); +return -EINVAL ; + } + +switch (param[0 ]) { +case LANE_COUNT_ONE : +case LANE_COUNT_TWO : +case LANE_COUNT_FOUR : +break ; +default : + valid_input = false; +break ; + } + +switch (param[1 ]) { +case LINK_RATE_LOW : +case LINK_RATE_HIGH : +case LINK_RATE_RBR2 : +case LINK_RATE_HIGH2 : +case LINK_RATE_HIGH3 : +case LINK_RATE_UHBR10 : +case LINK_RATE_UHBR13_5 : +case LINK_RATE_UHBR20 : +break ; +default : + valid_input = false; +break ; + } + +if (!valid_input) { +kfree (wr_buf); +DRM_DEBUG_DRIVER ("Invalid Input value No HW will be programmed\n" ); +mutex_lock (&adev->dm.dc_lock); +dc_link_set_preferred_training_settings (dc,NULL ,NULL , link, false); +mutex_unlock (&adev->dm.dc_lock); +return -EINVAL ; + } + +/* save user force lane_count, link_rate to preferred settings +* spread spectrum will not be changed +*/ + prefer_link_settings.link_spread = link->cur_link_settings.link_spread; + prefer_link_settings.use_link_rate_set = false; + prefer_link_settings.lane_count = param[0 ]; + prefer_link_settings.link_rate = param[1 ]; + +/* skip immediate retrain, and train to new link setting after hotplug event triggered */ +mutex_lock (&adev->dm.dc_lock); +dc_link_set_preferred_training_settings (dc, &prefer_link_settings,NULL , link, true); +mutex_unlock (&adev->dm.dc_lock); + +mutex_lock (&aconnector->base.dev->mode_config.mutex); + aconnector->base.force =DRM_FORCE_OFF ; +mutex_unlock (&aconnector->base.dev->mode_config.mutex); +drm_kms_helper_hotplug_event (aconnector->base.dev); + +msleep (100 ); + +mutex_lock (&aconnector->base.dev->mode_config.mutex); + aconnector->base.force =DRM_FORCE_UNSPECIFIED ; +mutex_unlock (&aconnector->base.dev->mode_config.mutex); +drm_kms_helper_hotplug_event (aconnector->base.dev); + +kfree (wr_buf); +return size; +} +/* function: get current DP PHY settings: voltage swing, pre-emphasis, * post-cursor2 (defined by VESA DP specification) *
@@ -2668,6 +2815,12 @@ static const struct file_operations dp_dsc_disable_passthrough_debugfs_fops = { .llseek = default_llseek }; +static const struct file_operations dp_mst_link_settings_debugfs_fops = { + .owner =THIS_MODULE , + .write = dp_mst_link_setting, + .llseek = default_llseek +}; + static const struct { char *name; const struct file_operations *fops;
@@ -2691,7 +2844,8 @@ static const struct { {"dsc_disable_passthrough", &dp_dsc_disable_passthrough_debugfs_fops}, {"is_mst_connector", &dp_is_mst_connector_fops}, {"mst_progress_status", &dp_mst_progress_status_fops}, - {"is_dpia_link", &is_dpia_link_fops} + {"is_dpia_link", &is_dpia_link_fops}, + {"mst_link_settings", &dp_mst_link_settings_debugfs_fops} }; static const struct {
Signature · 1 line
2.40.1
PATCH 14/17 drm/amd/display: fix odm k2 div calculation
In reply to Hamza MahfoozFrom: Dmytro Laktyushkin <[email protected]>
Correct setting is div by 2 for odm. Seamless odm transitions are enabled with enable_dp_dig_pixel_rate_div_policy debug flag.
--- drivers/gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.c | 9 +++++++-- drivers/gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.h | 2 +- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 8 ++++++-- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.h | 2 +- .../gpu/drm/amd/display/dc/inc/hw_sequencer_private.h | 2 +- 5 files changed, 16 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.c +7 -2
@@ -337,13 +337,14 @@ void dcn314_enable_power_gating_plane(struct dce_hwseq *hws, bool enable)REG_SET (DC_IP_REQUEST_CNTL ,0 ,IP_REQUEST_EN ,0 ); } -void dcn314_calculate_dccg_k1_k2_values (struct pipe_ctx *pipe_ctx,unsigned int *k1_div,unsigned int *k2_div) +unsigned int dcn314_calculate_dccg_k1_k2_values (struct pipe_ctx *pipe_ctx,unsigned int *k1_div,unsigned int *k2_div) {struct dc_stream_state *stream = pipe_ctx->stream; +unsigned int odm_combine_factor =0 ;bool two_pix_per_container = false; two_pix_per_container =optc2_is_two_pixels_per_containter (&stream->timing); -get_odm_config (pipe_ctx,NULL ); + odm_combine_factor =get_odm_config (pipe_ctx,NULL );if (stream->ctx->dc->link_srv->dp_is_128b_132b_signal (pipe_ctx)) { *k1_div =PIXEL_RATE_DIV_BY_1 ;
@@ -361,11 +362,15 @@ void dcn314_calculate_dccg_k1_k2_values(struct pipe_ctx *pipe_ctx, unsigned int }else { *k1_div =PIXEL_RATE_DIV_BY_1 ; *k2_div =PIXEL_RATE_DIV_BY_4 ; +if (odm_combine_factor ==2 ) + *k2_div =PIXEL_RATE_DIV_BY_2 ; } }if ((*k1_div ==PIXEL_RATE_DIV_NA ) && (*k2_div ==PIXEL_RATE_DIV_NA ))ASSERT (false); + +return odm_combine_factor; }void dcn314_set_pixels_per_cycle (struct pipe_ctx *pipe_ctx)
drivers/gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.h +1 -1
@@ -37,7 +37,7 @@ void dcn314_dsc_pg_control(struct dce_hwseq *hws, unsigned int dsc_inst, bool povoid dcn314_enable_power_gating_plane (struct dce_hwseq *hws,bool enable); -void dcn314_calculate_dccg_k1_k2_values (struct pipe_ctx *pipe_ctx,unsigned int *k1_div,unsigned int *k2_div); +unsigned int dcn314_calculate_dccg_k1_k2_values (struct pipe_ctx *pipe_ctx,unsigned int *k1_div,unsigned int *k2_div);void dcn314_set_pixels_per_cycle (struct pipe_ctx *pipe_ctx);
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c +6 -2
@@ -1141,9 +1141,10 @@ void dcn32_update_odm(struct dc *dc, struct dc_state *context, struct pipe_ctx * } } -void dcn32_calculate_dccg_k1_k2_values (struct pipe_ctx *pipe_ctx,unsigned int *k1_div,unsigned int *k2_div) +unsigned int dcn32_calculate_dccg_k1_k2_values (struct pipe_ctx *pipe_ctx,unsigned int *k1_div,unsigned int *k2_div) {struct dc_stream_state *stream = pipe_ctx->stream; +unsigned int odm_combine_factor =0 ;bool two_pix_per_container = false;// For phantom pipes, use the same programming as the main pipes
@@ -1151,6 +1152,7 @@ void dcn32_calculate_dccg_k1_k2_values(struct pipe_ctx *pipe_ctx, unsigned int * stream = pipe_ctx->stream->mall_stream_config.paired_stream; } two_pix_per_container =optc2_is_two_pixels_per_containter (&stream->timing); + odm_combine_factor =get_odm_config (pipe_ctx,NULL );if (stream->ctx->dc->link_srv->dp_is_128b_132b_signal (pipe_ctx)) { *k1_div =PIXEL_RATE_DIV_BY_1 ;
@@ -1168,13 +1170,15 @@ void dcn32_calculate_dccg_k1_k2_values(struct pipe_ctx *pipe_ctx, unsigned int * }else { *k1_div =PIXEL_RATE_DIV_BY_1 ; *k2_div =PIXEL_RATE_DIV_BY_4 ; -if (dcn32_is_dp_dig_pixel_rate_div_policy (pipe_ctx)) +if ((odm_combine_factor ==2 ) ||dcn32_is_dp_dig_pixel_rate_div_policy (pipe_ctx)) *k2_div =PIXEL_RATE_DIV_BY_2 ; } }if ((*k1_div ==PIXEL_RATE_DIV_NA ) && (*k2_div ==PIXEL_RATE_DIV_NA ))ASSERT (false); + +return odm_combine_factor; }void dcn32_set_pixels_per_cycle (struct pipe_ctx *pipe_ctx)
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.h +1 -1
@@ -71,7 +71,7 @@ void dcn32_update_force_pstate(struct dc *dc, struct dc_state *context);void dcn32_update_odm (struct dc *dc,struct dc_state *context,struct pipe_ctx *pipe_ctx); -void dcn32_calculate_dccg_k1_k2_values (struct pipe_ctx *pipe_ctx,unsigned int *k1_div,unsigned int *k2_div); +unsigned int dcn32_calculate_dccg_k1_k2_values (struct pipe_ctx *pipe_ctx,unsigned int *k1_div,unsigned int *k2_div);void dcn32_set_pixels_per_cycle (struct pipe_ctx *pipe_ctx);
drivers/gpu/drm/amd/display/dc/inc/hw_sequencer_private.h +1 -1
@@ -156,7 +156,7 @@ struct hwseq_private_funcs {void (*program_mall_pipe_config)(struct dc *dc,struct dc_state *context);void (*update_force_pstate)(struct dc *dc,struct dc_state *context);void (*update_mall_sel)(struct dc *dc,struct dc_state *context); -void (*calculate_dccg_k1_k2_values)(struct pipe_ctx *pipe_ctx, +unsigned int (*calculate_dccg_k1_k2_values)(struct pipe_ctx *pipe_ctx,unsigned int *k1_div,unsigned int *k2_div);void (*set_pixels_per_cycle)(struct pipe_ctx *pipe_ctx);
Signature · 1 line
2.40.1
PATCH 15/17 drm/amd/display: Fix 128b132b link loss handling
In reply to Hamza MahfoozFrom: Ilya Bakoulin <[email protected]>
[Why]
We don't check 128b132b-specific bits in LANE_ALIGN_STATUS_UPDATED DPCD registers when parsing link loss status, which can cause us to miss a link loss notification from some sinks.
[How]
Add a 128b132b-specific status bit check.
--- .../display/dc/link/protocols/link_dp_irq_handler.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_irq_handler.c +9 -2
@@ -82,8 +82,15 @@ bool dp_parse_link_loss_status( }/* Check interlane align.*/ -if (sink_status_changed || - !hpd_irq_dpcd_data->bytes.lane_status_updated.bits.INTERLANE_ALIGN_DONE) { +if (link_dp_get_encoding_format (&link->cur_link_settings) == DP_128b_132b_ENCODING && + (!hpd_irq_dpcd_data->bytes.lane_status_updated.bits.EQ_INTERLANE_ALIGN_DONE_128b_132b || + !hpd_irq_dpcd_data->bytes.lane_status_updated.bits.CDS_INTERLANE_ALIGN_DONE_128b_132b)) { + sink_status_changed = true; + }else if (!hpd_irq_dpcd_data->bytes.lane_status_updated.bits.INTERLANE_ALIGN_DONE) { + sink_status_changed = true; + } + +if (sink_status_changed) {DC_LOG_HW_HPD_IRQ ("%s: Link Status changed.\n" , __func__);
Signature · 1 line
2.40.1
PATCH 16/17 drm/amd/display: Enable dc mode clock switching for DCN32x
In reply to Hamza MahfoozFrom: Alvin Lee <[email protected]>
- DC mode clock switch interface was previously only executed for DCN303. Enable it for DCN32x so that the interface is called correctly
- Assign function pointers for DCN32x that are used in the dc mode interface
- Update the dc mode interface to work generically for each ASIC
- In update_clocks, make sure to consider softmax if we're in DC mode
--- .../display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 43 ++++++++++++++++--- drivers/gpu/drm/amd/display/dc/core/dc.c | 10 +++-- drivers/gpu/drm/amd/display/dc/dc.h | 2 +- .../amd/display/dc/dcn303/dcn303_resource.c | 1 + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubp.c | 1 + .../gpu/drm/amd/display/dc/dcn32/dcn32_init.c | 1 + .../drm/amd/display/dc/dcn32/dcn32_resource.c | 1 + .../amd/display/dc/dcn321/dcn321_resource.c | 1 + .../gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 1 + 9 files changed, 50 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c +37 -6
@@ -541,9 +541,18 @@ static void dcn32_update_clocks(struct clk_mgr *clk_mgr_base, clk_mgr_base->clks.p_state_change_support = p_state_change_support;/* to disable P-State switching, set UCLK min = max */ -if (!clk_mgr_base->clks.p_state_change_support) -dcn32_smu_set_hard_min_by_freq (clk_mgr,PPCLK_UCLK , - clk_mgr_base->bw_params->clk_table.entries[clk_mgr_base->bw_params->clk_table.num_entries_per_clk.num_memclk_levels -1 ].memclk_mhz); +if (!clk_mgr_base->clks.p_state_change_support) { +if (dc->clk_mgr->dc_mode_softmax_enabled) { +/* On DCN32x we will never have the functional UCLK min above the softmax +* since we calculate mode support based on softmax being the max UCLK +* frequency. +*/ +dcn32_smu_set_hard_min_by_freq (clk_mgr,PPCLK_UCLK , + dc->clk_mgr->bw_params->dc_mode_softmax_memclk); + }else { +dcn32_smu_set_hard_min_by_freq (clk_mgr,PPCLK_UCLK , dc->clk_mgr->bw_params->max_memclk_mhz); + } + } }/* Always update saved value, even if new value not set due to P-State switching unsupported. Also check safe_to_lower for FCLK */
@@ -808,8 +817,7 @@ static void dcn32_set_hard_max_memclk(struct clk_mgr *clk_mgr_base)if (!clk_mgr->smu_present)return ; -dcn30_smu_set_hard_max_by_freq (clk_mgr,PPCLK_UCLK , - clk_mgr_base->bw_params->clk_table.entries[clk_mgr_base->bw_params->clk_table.num_entries_per_clk.num_memclk_levels -1 ].memclk_mhz); +dcn30_smu_set_hard_max_by_freq (clk_mgr,PPCLK_UCLK , clk_mgr_base->bw_params->max_memclk_mhz); }/* Get current memclk states, update bounding box */
@@ -827,6 +835,7 @@ static void dcn32_get_memclk_states_from_smu(struct clk_mgr *clk_mgr_base) &clk_mgr_base->bw_params->clk_table.entries[0 ].memclk_mhz, &num_entries_per_clk->num_memclk_levels); clk_mgr_base->bw_params->dc_mode_limit.memclk_mhz =dcn30_smu_get_dc_mode_max_dpm_freq (clk_mgr,PPCLK_UCLK ); + clk_mgr_base->bw_params->dc_mode_softmax_memclk = clk_mgr_base->bw_params->dc_mode_limit.memclk_mhz;/* memclk must have at least one level */ num_entries_per_clk->num_memclk_levels = num_entries_per_clk->num_memclk_levels ? num_entries_per_clk->num_memclk_levels :1 ;
@@ -841,7 +850,8 @@ static void dcn32_get_memclk_states_from_smu(struct clk_mgr *clk_mgr_base) }else { num_levels = num_entries_per_clk->num_fclk_levels; } - + clk_mgr_base->bw_params->max_memclk_mhz = + clk_mgr_base->bw_params->clk_table.entries[num_entries_per_clk->num_memclk_levels -1 ].memclk_mhz; clk_mgr_base->bw_params->clk_table.num_entries = num_levels ? num_levels :1 ;if (clk_mgr->dpm_present && !num_levels)
@@ -894,6 +904,25 @@ static bool dcn32_is_smu_present(struct clk_mgr *clk_mgr_base)return clk_mgr->smu_present; } +static void dcn32_set_max_memclk (struct clk_mgr *clk_mgr_base,unsigned int memclk_mhz) +{ +struct clk_mgr_internal *clk_mgr =TO_CLK_MGR_INTERNAL (clk_mgr_base); + +if (!clk_mgr->smu_present) +return ; + +dcn30_smu_set_hard_max_by_freq (clk_mgr,PPCLK_UCLK , memclk_mhz); +} + +static void dcn32_set_min_memclk (struct clk_mgr *clk_mgr_base,unsigned int memclk_mhz) +{ +struct clk_mgr_internal *clk_mgr =TO_CLK_MGR_INTERNAL (clk_mgr_base); + +if (!clk_mgr->smu_present) +return ; + +dcn32_smu_set_hard_min_by_freq (clk_mgr,PPCLK_UCLK , memclk_mhz); +}static struct clk_mgr_funcs dcn32_funcs = { .get_dp_ref_clk_frequency = dce12_get_dp_ref_freq_khz,
@@ -904,6 +933,8 @@ static struct clk_mgr_funcs dcn32_funcs = { .notify_wm_ranges = dcn32_notify_wm_ranges, .set_hard_min_memclk = dcn32_set_hard_min_memclk, .set_hard_max_memclk = dcn32_set_hard_max_memclk, + .set_max_memclk = dcn32_set_max_memclk, + .set_min_memclk = dcn32_set_min_memclk, .get_memclk_states_from_smu = dcn32_get_memclk_states_from_smu, .are_clock_states_equal = dcn32_are_clock_states_equal, .enable_pme_wa = dcn32_enable_pme_wa,
drivers/gpu/drm/amd/display/dc/core/dc.c +6 -4
@@ -4767,15 +4767,17 @@ static void blank_and_force_memclk(struct dc *dc, bool apply, unsigned int memcl*/ void dc_enable_dcmode_clk_limit (struct dc *dc,bool enable) { -uint32_t hw_internal_rev = dc->ctx->asic_id.hw_internal_rev; -unsigned int softMax, maxDPM, funcMin; +unsigned int softMax =0 , maxDPM =0 , funcMin =0 , i;bool p_state_change_support; -if (!ASICREV_IS_BEIGE_GOBY_P (hw_internal_rev)) +if (!dc->config.dc_mode_clk_limit_support)return ; softMax = dc->clk_mgr->bw_params->dc_mode_softmax_memclk; - maxDPM = dc->clk_mgr->bw_params->clk_table.entries[dc->clk_mgr->bw_params->clk_table.num_entries -1 ].memclk_mhz; +for (i =0 ; i < dc->clk_mgr->bw_params->clk_table.num_entries; i++) { +if (dc->clk_mgr->bw_params->clk_table.entries[i].memclk_mhz > maxDPM) + maxDPM = dc->clk_mgr->bw_params->clk_table.entries[i].memclk_mhz; + } funcMin = (dc->clk_mgr->clks.dramclk_khz +999 ) /1000 ; p_state_change_support = dc->clk_mgr->clks.p_state_change_support;
drivers/gpu/drm/amd/display/dc/dc.h +1 -1
@@ -416,7 +416,7 @@ struct dc_config {uint8_t force_bios_fixed_vs;int sdpif_request_limit_words_per_umc;bool use_old_fixed_vs_sequence; -bool disable_subvp_drr; +bool dc_mode_clk_limit_support; };enum visual_confirm {
drivers/gpu/drm/amd/display/dc/dcn303/dcn303_resource.c +1 -0
@@ -1190,6 +1190,7 @@ static bool dcn303_resource_construct( dc->caps.dp_hdmi21_pcon_support = true; + dc->config.dc_mode_clk_limit_support = true;/* read VBIOS LTTPR caps */ if (ctx->dc_bios->funcs->get_lttpr_caps) {enum bp_result bp_query_result;
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.c +1 -0
@@ -179,6 +179,7 @@ static struct hubp_funcs dcn32_hubp_funcs = { .hubp_setup_interdependent = hubp2_setup_interdependent, .hubp_set_vm_system_aperture_settings = hubp3_set_vm_system_aperture_settings, .set_blank = hubp2_set_blank, + .set_blank_regs = hubp2_set_blank_regs, .dcc_control = hubp3_dcc_control, .mem_program_viewport = min_set_viewport, .set_cursor_attributes = hubp32_cursor_set_attributes,
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c +1 -0
@@ -56,6 +56,7 @@ static const struct hw_sequencer_funcs dcn32_funcs = { .enable_audio_stream = dce110_enable_audio_stream, .disable_audio_stream = dce110_disable_audio_stream, .disable_plane = dcn20_disable_plane, + .disable_pixel_data = dcn20_disable_pixel_data, .pipe_control_lock = dcn20_pipe_control_lock, .interdependent_update_lock = dcn10_lock_all_pipes, .cursor_lock = dcn10_cursor_lock,
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c +1 -0
@@ -2215,6 +2215,7 @@ static bool dcn32_resource_construct(/* Use pipe context based otg sync logic */ dc->config.use_pipe_ctx_sync_logic = true; + dc->config.dc_mode_clk_limit_support = true;/* read VBIOS LTTPR caps */ {if (ctx->dc_bios->funcs->get_lttpr_caps) {
drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c +1 -0
@@ -1756,6 +1756,7 @@ static bool dcn321_resource_construct( dc->caps.color.mpc.ogam_rom_caps.hlg =0 ; dc->caps.color.mpc.ocsc =1 ; + dc->config.dc_mode_clk_limit_support = true;/* read VBIOS LTTPR caps */ {if (ctx->dc_bios->funcs->get_lttpr_caps) {
drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h +1 -0
@@ -230,6 +230,7 @@ struct clk_bw_params {unsigned int dram_channel_width_bytes;unsigned int dispclk_vco_khz;unsigned int dc_mode_softmax_memclk; +unsigned int max_memclk_mhz;struct clk_limit_table clk_table;struct wm_table wm_table;struct dummy_pstate_entry dummy_pstate_table[4 ];
Signature · 1 line
2.40.1
PATCH 17/17 drm/amd/display: 3.2.240
In reply to Hamza MahfoozFrom: Aric Cyr <[email protected]>
This version brings along the following:
- DCN314 fixes
- DCN32x fixes
- New fast update sequence enablement
- DC mode clock switching enablement for DCN32x
- DP link loss fix
- New debugfs entry to set MST link settings
--- 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 @@ struct aux_payload;struct set_config_cmd_payload ;struct dmub_notification ; -#define DC_VER "3.2.239" +#define DC_VER "3.2.240"#define MAX_SURFACES 3#define MAX_PLANES 6
Signature · 1 line
2.40.1