DC Patches July 22, 2022
cover DC Patches July 22, 2022
This DC patchset brings improvements in multiple areas. In summary, we highlight:
* Copy crc_skip_count when duplicating CRTC state
* Add debug option for idle optimizations on cursor updates
* Disable MPC split for DCN32/321
* Add missing ODM 2:1 policy logic
* Update DCN32 and DCN321 SR latencies
* Add reinstate dram in the FPO logic
* Add dc_ctx to link_enc_create() parameters
* Cache cursor when cursor exceeds 64x64
* Add support for manual DMUB FAMS trigger
* Fix dpstreamclk programming
* Add missing AUDIO_DTO_SEL reg field
* Add OTG/ODM functions
* Use correct clock source constructor for DCN314
* Use correct DTO_SRC_SEL for 128b/132b encoding
* Add pixel rate div calcs and programming
* Remove FPU flags from DCN30 Makefile
* Create patch bounding box function for isolate FPU
* Move mclk calculation function to DML
* Remove FPU operations from dcn201 resources
* Fallback to SW cursor if SubVP + cursor too big
* Drop unnecessary FPU flags on dcn302 files
* Reboot while unplug hdcp enabled dp from mst hub
* Reset pipe count when iterating for DET override
* Calculate MALL cache lines based on Mblks required
* Fix two MPO videos in single display ODM combine mode
* Guard against zero memory channels
* Updates SubVP + SubVP DRR cases updates
* Fix OPTC function pointers for DCN314
* Add enable/disable FIFO callbacks to stream setup
* Avoid MPC infinite loop
Alvin Lee (6):
drm/amd/display: Updates SubVP and SubVP DRR cases drm/amd/display: Calculate MALL cache lines based on Mblks required drm/amd/display: Fallback to SW cursor if SubVP + cursor too big drm/amd/display: Update DCN32 and DCN321 SR latencies drm/amd/display: Disable MPC split for DCN32/321 drm/amd/display: Add debug option for idle optimizations on cursor
updates
Anthony Koo (2):
drm/amd/display: Add support for manual DMUB FAMS trigger drm/amd/display: 3.2.196
Aric Cyr (1):
drm/amd/display: Avoid MPC infinite loop
Aurabindo Pillai (1):
drm/amd/display: Add dc_ctx to link_enc_create() parameters
Chris Park (1):
drm/amd/display: Cache cursor when cursor exceeds 64x64
Leo Li (1):
drm/amd/display: Copy crc_skip_count when duplicating CRTC state
Michael Strauss (6):
drm/amd/display: Add pixel rate div calcs and programming drm/amd/display: Use correct DTO_SRC_SEL for 128b/132b encoding drm/amd/display: Use correct clock source constructor for DCN314 drm/amd/display: Add OTG/ODM functions drm/amd/display: Add missing AUDIO_DTO_SEL reg field drm/amd/display: Fix dpstreamclk programming
Nicholas Kazlauskas (3):
drm/amd/display: Add enable/disable FIFO callbacks to stream setup drm/amd/display: Fix OPTC function pointers for DCN314 drm/amd/display: Guard against zero memory channels
Rodrigo Siqueira (6):
drm/amd/display: Drop unnecessary FPU flags on dcn302 files drm/amd/display: Remove FPU operations from dcn201 resources drm/amd/display: Move mclk calculation function to DML drm/amd/display: Create patch bounding box function for isolate FPU drm/amd/display: Remove FPU flags from DCN30 Makefile drm/amd/display: Add reinstate dram in the FPO logic
Samson Tam (2):
drm/amd/display: Fix two MPO videos in single display ODM combine mode drm/amd/display: Add missing ODM 2:1 policy logic
Taimur Hassan (1):
drm/amd/display: Reset pipe count when iterating for DET override
hersen wu (1):
drm/amd/display: Reboot while unplug hdcp enabled dp from mst hub
.../amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 1 + .../amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 34 ++-- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 2 +- .../gpu/drm/amd/display/dc/core/dc_link_dp.c | 1 + .../gpu/drm/amd/display/dc/core/dc_resource.c | 136 +++++++++++++--- .../gpu/drm/amd/display/dc/core/dc_stream.c | 5 + drivers/gpu/drm/amd/display/dc/dc.h | 2 +- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 17 ++ drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 1 + .../drm/amd/display/dc/dce/dce_clock_source.c | 20 ++- .../amd/display/dc/dce100/dce100_resource.c | 1 + .../display/dc/dce110/dce110_hw_sequencer.c | 1 + .../amd/display/dc/dce110/dce110_resource.c | 1 + .../amd/display/dc/dce112/dce112_resource.c | 1 + .../amd/display/dc/dce120/dce120_resource.c | 1 + .../drm/amd/display/dc/dce60/dce60_resource.c | 1 + .../drm/amd/display/dc/dce80/dce80_resource.c | 1 + .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 1 + .../gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 5 + .../drm/amd/display/dc/dcn10/dcn10_resource.c | 1 + .../drm/amd/display/dc/dcn20/dcn20_hwseq.c | 1 + .../drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +- .../drm/amd/display/dc/dcn20/dcn20_resource.h | 1 + .../gpu/drm/amd/display/dc/dcn201/Makefile | 24 --- .../amd/display/dc/dcn201/dcn201_resource.c | 11 +- .../drm/amd/display/dc/dcn21/dcn21_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 30 ---- .../drm/amd/display/dc/dcn30/dcn30_resource.c | 58 +------ .../drm/amd/display/dc/dcn30/dcn30_resource.h | 3 + .../amd/display/dc/dcn301/dcn301_resource.c | 1 + .../gpu/drm/amd/display/dc/dcn302/Makefile | 25 --- .../amd/display/dc/dcn302/dcn302_resource.c | 4 +- .../amd/display/dc/dcn303/dcn303_resource.c | 4 +- .../gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 8 +- .../gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h | 8 +- .../gpu/drm/amd/display/dc/dcn31/dcn31_optc.c | 2 +- .../gpu/drm/amd/display/dc/dcn31/dcn31_optc.h | 2 + .../drm/amd/display/dc/dcn31/dcn31_resource.c | 1 + .../drm/amd/display/dc/dcn314/dcn314_dccg.c | 30 +++- .../drm/amd/display/dc/dcn314/dcn314_dccg.h | 3 +- .../dc/dcn314/dcn314_dio_stream_encoder.c | 38 +++-- .../drm/amd/display/dc/dcn314/dcn314_hwseq.c | 36 +++++ .../drm/amd/display/dc/dcn314/dcn314_hwseq.h | 2 + .../drm/amd/display/dc/dcn314/dcn314_init.c | 1 + .../drm/amd/display/dc/dcn314/dcn314_optc.c | 37 ++++- .../amd/display/dc/dcn314/dcn314_resource.c | 8 +- .../amd/display/dc/dcn315/dcn315_resource.c | 1 + .../amd/display/dc/dcn316/dcn316_resource.c | 1 + .../gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c | 3 +- .../gpu/drm/amd/display/dc/dcn32/dcn32_hubp.c | 4 +- .../gpu/drm/amd/display/dc/dcn32/dcn32_hubp.h | 2 +- .../drm/amd/display/dc/dcn32/dcn32_hwseq.c | 23 ++- .../gpu/drm/amd/display/dc/dcn32/dcn32_optc.c | 63 +++++++- .../drm/amd/display/dc/dcn32/dcn32_resource.c | 153 ++++++++++++++++-- .../drm/amd/display/dc/dcn32/dcn32_resource.h | 7 + .../display/dc/dcn32/dcn32_resource_helpers.c | 18 ++- .../amd/display/dc/dcn321/dcn321_resource.c | 4 +- .../drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 87 ++++++++++ .../drm/amd/display/dc/dml/dcn20/dcn20_fpu.h | 4 + .../drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 63 ++++++++ .../drm/amd/display/dc/dml/dcn30/dcn30_fpu.h | 8 + .../drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 71 ++++++-- .../amd/display/dc/dml/dcn321/dcn321_fpu.c | 4 +- .../gpu/drm/amd/display/dc/inc/clock_source.h | 7 +- .../gpu/drm/amd/display/dc/inc/core_types.h | 1 + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 3 +- drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 2 +- .../amd/display/dc/inc/hw/stream_encoder.h | 2 + .../drm/amd/display/dc/link/link_hwss_dio.c | 7 + .../amd/display/dc/link/link_hwss_hpo_dp.c | 4 +- .../gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 9 +- 71 files changed, 867 insertions(+), 258 deletions(-)
Signature · 1 line
2.37.1
PATCH 1/31 drm/amd/display: Avoid MPC infinite loop
From: Aric Cyr <[email protected]>
[why]
In some cases MPC tree bottom pipe ends up point to itself. This causes iterating from top to bottom to hang the system in an infinite loop.
[how]
When looping to next MPC bottom pipe, check that the pointer is not same as current to avoid infinite loop.
--- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c +5 -0
@@ -49,6 +49,11 @@ void mpc1_set_bg_color(struct mpc *mpc,/* find bottommost mpcc. */ while (bottommost_mpcc->mpcc_bot) { +/* avoid circular linked link */ +ASSERT (bottommost_mpcc != bottommost_mpcc->mpcc_bot); +if (bottommost_mpcc == bottommost_mpcc->mpcc_bot) +break ; + bottommost_mpcc = bottommost_mpcc->mpcc_bot; }
Signature · 1 line
2.37.1
PATCH 2/31 drm/amd/display: Add enable/disable FIFO callbacks to stream setup
In reply to Alex HungFrom: Nicholas Kazlauskas <[email protected]>
[Why]
We don't write out attributes after disabling and re-enabling the link on some monitors, causing some, but not all, HDMI displays to fail to lightup on DCN314.
[How]
Firmware used to do this after DIG link setup.
Since firmware is no longer doing this to support USB4 and dynamic link remapping we'll need to add this to driver in the equivalent paths.
New optional callbacks were created in the stream encoder interface and implementations were added for DCN314.
--- .../dc/dcn314/dcn314_dio_stream_encoder.c | 38 +++++++++++++------ .../amd/display/dc/inc/hw/stream_encoder.h | 2 + .../drm/amd/display/dc/link/link_hwss_dio.c | 7 ++++ 3 files changed, 35 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn314/dcn314_dio_stream_encoder.c +26 -12
@@ -50,6 +50,26 @@ enc1->base.ctx +static void enc314_enable_fifo (struct stream_encoder *enc) +{ +struct dcn10_stream_encoder *enc1 =DCN10STRENC_FROM_STRENC (enc); + +/* TODO: Confirm if we need to wait for DIG_SYMCLK_FE_ON */ +REG_WAIT (DIG_FE_CNTL ,DIG_SYMCLK_FE_ON ,1 ,10 ,5000 ); +REG_UPDATE_2 (DIG_FIFO_CTRL0 ,DIG_FIFO_RESET ,1 ,DIG_FIFO_READ_START_LEVEL ,0x7 ); +REG_WAIT (DIG_FIFO_CTRL0 ,DIG_FIFO_RESET_DONE ,1 ,10 ,5000 ); +REG_UPDATE (DIG_FIFO_CTRL0 ,DIG_FIFO_RESET ,0 ); +REG_WAIT (DIG_FIFO_CTRL0 ,DIG_FIFO_RESET_DONE ,0 ,10 ,5000 ); +REG_UPDATE (DIG_FIFO_CTRL0 ,DIG_FIFO_ENABLE ,1 ); +} + +static void enc314_disable_fifo (struct stream_encoder *enc) +{ +struct dcn10_stream_encoder *enc1 =DCN10STRENC_FROM_STRENC (enc); + +REG_UPDATE_2 (DIG_FIFO_CTRL0 ,DIG_FIFO_ENABLE ,0 , +DIG_FIFO_READ_START_LEVEL ,0 ); +} static void enc314_dp_set_odm_combine( struct stream_encoder *enc,
@@ -92,7 +112,7 @@ void enc314_stream_encoder_dvi_set_stream_attribute(//DIG_SOURCE_SELECT is already set in dig_connect_to_otg -/* DIG_START is removed from the register spec */ +enc314_enable_fifo (enc); }ASSERT (crtc_timing->pixel_encoding ==PIXEL_ENCODING_RGB );
@@ -132,7 +152,7 @@ static void enc314_stream_encoder_hdmi_set_stream_attribute(//DIG_SOURCE_SELECT is already set in dig_connect_to_otg -/* DIG_START is removed from the register spec */ +enc314_enable_fifo (enc); }/* Configure pixel encoding */
@@ -302,16 +322,8 @@ static void enc314_stream_encoder_dp_unblank(REG_UPDATE (DP_STEER_FIFO ,DP_STEER_FIFO_RESET ,0 ); -/* -* DIG Resync FIFO now needs to be explicitly enabled. -* TODO: Confirm if we need to wait for DIG_SYMCLK_FE_ON -*/ -REG_WAIT (DIG_FE_CNTL ,DIG_SYMCLK_FE_ON ,1 ,10 ,5000 ); -REG_UPDATE (DIG_FIFO_CTRL0 ,DIG_FIFO_RESET ,1 ); -REG_WAIT (DIG_FIFO_CTRL0 ,DIG_FIFO_RESET_DONE ,1 ,10 ,5000 ); -REG_UPDATE (DIG_FIFO_CTRL0 ,DIG_FIFO_RESET ,0 ); -REG_WAIT (DIG_FIFO_CTRL0 ,DIG_FIFO_RESET_DONE ,0 ,10 ,5000 ); -REG_UPDATE (DIG_FIFO_CTRL0 ,DIG_FIFO_ENABLE ,1 ); +/* DIG Resync FIFO now needs to be explicitly enabled. */ +enc314_enable_fifo (enc);/* wait 100us for DIG/DP logic to prime * (i.e. a few video lines)
@@ -420,6 +432,8 @@ static const struct stream_encoder_funcs dcn314_str_enc_funcs = { .set_dynamic_metadata = enc2_set_dynamic_metadata, .hdmi_reset_stream_attribute = enc1_reset_hdmi_stream_attribute, + .enable_fifo = enc314_enable_fifo, + .disable_fifo = enc314_disable_fifo, .set_input_mode = enc314_set_dig_input_mode, };
drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h +2 -0
@@ -252,6 +252,8 @@ struct stream_encoder_funcs {void (*set_input_mode)(struct stream_encoder *enc,unsigned int pix_per_container); +void (*enable_fifo)(struct stream_encoder *enc); +void (*disable_fifo)(struct stream_encoder *enc); };struct hpo_dp_stream_encoder_state {
drivers/gpu/drm/amd/display/dc/link/link_hwss_dio.c +7 -0
@@ -40,17 +40,24 @@ void set_dio_throttled_vcp_size(struct pipe_ctx *pipe_ctx,void setup_dio_stream_encoder (struct pipe_ctx *pipe_ctx) {struct link_encoder *link_enc =link_enc_cfg_get_link_enc (pipe_ctx->stream->link); +struct stream_encoder *stream_enc = pipe_ctx->stream_res.stream_enc; link_enc->funcs->connect_dig_be_to_fe (link_enc, pipe_ctx->stream_res.stream_enc->id, true);if (dc_is_dp_signal (pipe_ctx->stream->signal))dp_source_sequence_trace (pipe_ctx->stream->link,DPCD_SOURCE_SEQ_AFTER_CONNECT_DIG_FE_BE ); +if (stream_enc->funcs->enable_fifo) + stream_enc->funcs->enable_fifo (stream_enc); }void reset_dio_stream_encoder (struct pipe_ctx *pipe_ctx) {struct link_encoder *link_enc =link_enc_cfg_get_link_enc (pipe_ctx->stream->link); +struct stream_encoder *stream_enc = pipe_ctx->stream_res.stream_enc; + +if (stream_enc && stream_enc->funcs->disable_fifo) + stream_enc->funcs->disable_fifo (stream_enc); link_enc->funcs->connect_dig_be_to_fe( link_enc,
Signature · 1 line
2.37.1
PATCH 3/31 drm/amd/display: Fix OPTC function pointers for DCN314
In reply to Alex HungFrom: Nicholas Kazlauskas <[email protected]>
[Why]
Access violation occurs when swapping between HDMI and FRL monitors because we're missing the immediate_disable_crtc callback and it's required for the DCN314 clk manager.
[How]
Update the table to match the DCN31 optc functions for ones that should be the same:
- immediate_disable_crtc
- configure_crc
--- drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c | 2 +- drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.h | 2 ++ drivers/gpu/drm/amd/display/dc/dcn314/dcn314_optc.c | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c +1 -1
@@ -141,7 +141,7 @@ static bool optc31_disable_crtc(struct timing_generator *optc)return true; } -static bool optc31_immediate_disable_crtc (struct timing_generator *optc) +bool optc31_immediate_disable_crtc (struct timing_generator *optc) {struct optc *optc1 =DCN10TG_FROM_TG (optc);
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.h +2 -0
@@ -258,6 +258,8 @@void dcn31_timing_generator_init (struct optc *optc1); +bool optc31_immediate_disable_crtc (struct timing_generator *optc); +void optc31_set_drr (struct timing_generator *optc,const struct drr_params *params);void optc3_init_odm (struct timing_generator *optc);
drivers/gpu/drm/amd/display/dc/dcn314/dcn314_optc.c +2 -1
@@ -170,6 +170,7 @@ static struct timing_generator_funcs dcn314_tg_funcs = { .program_global_sync = optc1_program_global_sync, .enable_crtc = optc314_enable_crtc, .disable_crtc = optc314_disable_crtc, + .immediate_disable_crtc = optc31_immediate_disable_crtc, .phantom_crtc_post_enable = optc314_phantom_crtc_post_enable,/* used by enable_timing_synchronization. Not need for FPGA */ .is_counter_moving = optc1_is_counter_moving,
@@ -204,7 +205,7 @@ static struct timing_generator_funcs dcn314_tg_funcs = { .clear_optc_underflow = optc1_clear_optc_underflow, .setup_global_swap_lock = NULL, .get_crc = optc1_get_crc, - .configure_crc = optc1_configure_crc, + .configure_crc = optc2_configure_crc, .set_dsc_config = optc3_set_dsc_config, .get_dsc_status = optc2_get_dsc_status, .set_dwb_source = NULL,
Signature · 1 line
2.37.1
PATCH 4/31 drm/amd/display: Updates SubVP and SubVP DRR cases
In reply to Alex HungFrom: Alvin Lee <[email protected]>
[Description]
- For any DRR cases in SubVP, don't lock for VSYNC flips
- For DCN32/321 use FW to do DRR manual trigger programming
- Add bit in SubVP cmd to indicate if the SubVP pipe is DRR
--- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 17 +++++ drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 1 + .../drm/amd/display/dc/dcn32/dcn32_hwseq.c | 7 +-- .../gpu/drm/amd/display/dc/dcn32/dcn32_optc.c | 63 ++++++++++++++++++- 4 files changed, 82 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c +17 -0
@@ -270,6 +270,23 @@ void dc_dmub_srv_drr_update_cmd(struct dc *dc, uint32_t tg_inst, uint32_t vtotaldc_dmub_srv_wait_idle (dc->ctx->dmub_srv); } +void dc_dmub_srv_set_drr_manual_trigger_cmd (struct dc *dc,uint32_t tg_inst) +{ +union dmub_rb_cmd cmd = {0 }; + + cmd.drr_update.header.type =DMUB_CMD__FW_ASSISTED_MCLK_SWITCH ; +// TODO: Uncomment once FW headers are promoted +//cmd.drr_update.header.sub_type = DMUB_CMD__FAMS_SET_MANUAL_TRIGGER; + cmd.drr_update.dmub_optc_state_req.tg_inst = tg_inst; + + cmd.drr_update.header.payload_bytes =sizeof (cmd.drr_update) -sizeof (cmd.drr_update.header); + +// Send the command to the DMCUB. +dc_dmub_srv_cmd_queue (dc->ctx->dmub_srv, &cmd); +dc_dmub_srv_cmd_execute (dc->ctx->dmub_srv); +dc_dmub_srv_wait_idle (dc->ctx->dmub_srv); +} +static uint8_t dc_dmub_srv_get_pipes_for_stream (struct dc *dc,struct dc_stream_state *stream) {uint8_t pipes =0 ;
drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h +1 -0
@@ -74,6 +74,7 @@ void dc_dmub_trace_event_control(struct dc *dc, bool enable);void dc_dmub_srv_drr_update_cmd (struct dc *dc,uint32_t tg_inst,uint32_t vtotal_min,uint32_t vtotal_max); +void dc_dmub_srv_set_drr_manual_trigger_cmd (struct dc *dc,uint32_t tg_inst);bool dc_dmub_srv_p_state_delegate (struct dc *dc,bool enable_pstate,struct dc_state *context);void dc_dmub_srv_query_caps_cmd (struct dmub_srv *dmub);
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c +2 -5
@@ -424,7 +424,6 @@ void dcn32_subvp_pipe_control_lock(struct dc *dc,unsigned int i =0 ;bool subvp_immediate_flip = false;bool subvp_in_use = false; -bool drr_pipe = false;struct pipe_ctx *pipe;for (i =0 ; i < dc->res_pool->pipe_count; i++) {
@@ -440,12 +439,10 @@ void dcn32_subvp_pipe_control_lock(struct dc *dc,if (top_pipe_to_program->stream->mall_stream_config.type ==SUBVP_MAIN && top_pipe_to_program->plane_state->flip_immediate) subvp_immediate_flip = true; -else if (top_pipe_to_program->stream->mall_stream_config.type ==SUBVP_NONE && - top_pipe_to_program->stream->ignore_msa_timing_param) - drr_pipe = true; } -if ((subvp_in_use && (should_lock_all_pipes || subvp_immediate_flip || drr_pipe)) || (!subvp_in_use && subvp_prev_use)) { +// Don't need to lock for DRR VSYNC flips -- FW will wait for DRR pending update cleared. +if ((subvp_in_use && (should_lock_all_pipes || subvp_immediate_flip)) || (!subvp_in_use && subvp_prev_use)) {union dmub_inbox0_cmd_lock_hw hw_lock_cmd = {0 };if (!lock) {
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c +62 -1
84 lines not on this page · raw message
Signature · 1 line
2.37.1
PATCH 5/31 drm/amd/display: Guard against zero memory channels
In reply to Alex HungFrom: Nicholas Kazlauskas <[email protected]>
[Why]
If BIOS doesn't specify number of memory channels then bandwidth validation will fail due to insufficient BW in DML.
[How]
If BIOS is setting zero channels then use the default in the table. If no entry is in the table and no BIOS value is specified then throw an ASSERT for future developers to look into.
--- drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c +4 -1
@@ -1916,8 +1916,11 @@ static void dcn314_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *b dcn3_14_ip.max_num_otg = dc->res_pool->res_cap->num_timing_generator; dcn3_14_ip.max_num_dpp = dc->res_pool->pipe_count; - dcn3_14_soc.num_chans = bw_params->num_channels; +if (bw_params->num_channels >0 ) + dcn3_14_soc.num_chans = bw_params->num_channels; + +ASSERT (dcn3_14_soc.num_chans);ASSERT (clk_table->num_entries);/* Prepass to find max clocks independent of voltage level. */
Signature · 1 line
2.37.1
PATCH 6/31 drm/amd/display: Fix two MPO videos in single display ODM combine mode
In reply to Alex HungFrom: Samson Tam <[email protected]>
[Why]
In single display ODM combine mode, two MPO videos ( three
planes ) are not working
[How]
When we detect three planes, don't set odm combine 2to1 policy
for the MPO planes. Otherwise, we run out of pipes available
Add support for two MPO videos in dc_add_plane_to_context().
Don't allow both videos to be on the same side of the display.
Add extra check when fetching free pipe for two MPO videos.
--- .../gpu/drm/amd/display/dc/core/dc_resource.c | 136 +++++++++++++--- .../drm/amd/display/dc/dcn32/dcn32_resource.c | 149 ++++++++++++++++-- .../drm/amd/display/dc/dcn32/dcn32_resource.h | 6 + 3 files changed, 260 insertions(+), 31 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +115 -21
@@ -1463,6 +1463,7 @@ bool dc_add_plane_to_context(struct dc_stream_status *stream_status =NULL ;struct pipe_ctx *prev_right_head =NULL ;struct pipe_ctx *free_right_pipe =NULL ; +struct pipe_ctx *prev_left_head =NULL ;DC_LOGGER_INIT (stream->ctx->logger);for (i =0 ; i < context->stream_count; i++)
@@ -1514,8 +1515,16 @@ bool dc_add_plane_to_context(/* ODM + window MPO, where MPO window is on right half only */ if (free_pipe->plane_state && - (free_pipe->plane_state->clip_rect.x >= free_pipe->stream->src.x + free_pipe->stream->src.width/2 ) && - tail_pipe->next_odm_pipe) { + (free_pipe->plane_state->clip_rect.x >= free_pipe->stream->src.x + free_pipe->stream->src.width/2 ) && + tail_pipe->next_odm_pipe) { + +/* For ODM + window MPO, in 3 plane case, if we already have a MPO window on +* the right side, then we will invalidate a 2nd one on the right side +*/ +if (head_pipe->next_odm_pipe && tail_pipe->next_odm_pipe->bottom_pipe) { +dc_plane_state_release (plane_state); +return false; + } DC_LOG_SCALER("%s - ODM + window MPO(right). free_pipe:%d tail_pipe->next_odm_pipe:%d\n", __func__,
@@ -1530,20 +1539,42 @@ bool dc_add_plane_to_context(* - If not, continue to use free_pipe * - If the right side already has a pipe, use that pipe instead if its available */ + +/* +* We also want to avoid the case where with three plane ( 2 MPO videos ), we have +* both videos on the left side so one of the videos is invalidated. Then we +* move the invalidated video back to the right side. If the order of the plane +* states is such that the right MPO plane is processed first, the free pipe +* selected by the head will be the left MPO pipe. But since there was no right +* MPO pipe, it will assign the free pipe to the right MPO pipe instead and +* a pipe reallocation will occur. +* Check the old context to see if the left side already has a pipe allocated +* - If not, continue to use free_pipe +* - If the left side is already using this pipe, then pick another pipe for right +*/ + prev_right_head = &dc->current_state->res_ctx.pipe_ctx[tail_pipe->next_odm_pipe->pipe_idx]; -if ((prev_right_head->bottom_pipe) && (free_pipe->pipe_idx != prev_right_head->bottom_pipe->pipe_idx)) { +if ((prev_right_head->bottom_pipe) && + (free_pipe->pipe_idx != prev_right_head->bottom_pipe->pipe_idx)) { free_right_pipe =acquire_free_pipe_for_head (context, pool, tail_pipe->next_odm_pipe); -if (free_right_pipe) { - free_pipe->stream =NULL ; -memset (&free_pipe->stream_res,0 ,sizeof (struct stream_resource )); -memset (&free_pipe->plane_res,0 ,sizeof (struct plane_resource )); - free_pipe->plane_state =NULL ; - free_pipe->pipe_idx =0 ; - free_right_pipe->plane_state = plane_state; - free_pipe = free_right_pipe; + }else { + prev_left_head = &dc->current_state->res_ctx.pipe_ctx[head_pipe->pipe_idx]; +if ((prev_left_head->bottom_pipe) && + (free_pipe->pipe_idx == prev_left_head->bottom_pipe->pipe_idx)) { + free_right_pipe =acquire_free_pipe_for_head (context, pool, head_pipe); } } +if (free_right_pipe) { + free_pipe->stream =NULL ; +memset (&free_pipe->stream_res,0 ,sizeof (struct stream_resource )); +memset (&free_pipe->plane_res,0 ,sizeof (struct plane_resource )); + free_pipe->plane_state =NULL ; + free_pipe->pipe_idx =0 ; + free_right_pipe->plane_state = plane_state; + free_pipe = free_right_pipe; + } + free_pipe->stream_res.tg = tail_pipe->next_odm_pipe->stream_res.tg; free_pipe->stream_res.abm = tail_pipe->next_odm_pipe->stream_res.abm; free_pipe->stream_res.opp = tail_pipe->next_odm_pipe->stream_res.opp;
@@ -1553,7 +1584,63 @@ bool dc_add_plane_to_context( free_pipe->top_pipe = tail_pipe->next_odm_pipe; tail_pipe->next_odm_pipe->bottom_pipe = free_pipe; + }else if (free_pipe->plane_state && + (free_pipe->plane_state->clip_rect.x >= free_pipe->stream->src.x + free_pipe->stream->src.width/2 ) + && head_pipe->next_odm_pipe) { + +/* For ODM + window MPO, support 3 plane ( 2 MPO ) case. +* Here we have a desktop ODM + left window MPO and a new MPO window appears +* on the right side only. It fails the first case, because tail_pipe is the +* left window MPO, so it has no next_odm_pipe. So in this scenario, we check +* for head_pipe->next_odm_pipe instead +*/ +DC_LOG_SCALER ("%s - ODM + win MPO (left) + win MPO (right). free_pipe:%d head_pipe->next_odm:%d\n" , + __func__, + free_pipe->pipe_idx, + head_pipe->next_odm_pipe ? head_pipe->next_odm_pipe->pipe_idx :-1 ); + +/* +* We want to avoid the case where the right side already has a pipe assigned to +* it and is different from free_pipe ( which would cause trigger a pipe +* reallocation ). +* Check the old context to see if the right side already has a pipe allocated +* - If not, continue to use free_pipe +* - If the right side already has a pipe, use that pipe instead if its available +*/ + prev_right_head = &dc->current_state->res_ctx.pipe_ctx[head_pipe->next_odm_pipe->pipe_idx]; +if ((prev_right_head->bottom_pipe) && + (free_pipe->pipe_idx != prev_right_head->bottom_pipe->pipe_idx)) { + free_right_pipe =acquire_free_pipe_for_head (context, pool, head_pipe->next_odm_pipe); +if (free_right_pipe) { + free_pipe->stream =NULL ; +memset (&free_pipe->stream_res,0 ,sizeof (struct stream_resource )); +memset (&free_pipe->plane_res,0 ,sizeof (struct plane_resource )); + free_pipe->plane_state =NULL ; + free_pipe->pipe_idx =0 ; + free_right_pipe->plane_state = plane_state; + free_pipe = free_right_pipe; + } + } + + free_pipe->stream_res.tg = head_pipe->next_odm_pipe->stream_res.tg; + free_pipe->stream_res.abm = head_pipe->next_odm_pipe->stream_res.abm; + free_pipe->stream_res.opp = head_pipe->next_odm_pipe->stream_res.opp; + free_pipe->stream_res.stream_enc = head_pipe->next_odm_pipe->stream_res.stream_enc; + free_pipe->stream_res.audio = head_pipe->next_odm_pipe->stream_res.audio; + free_pipe->clock_source = head_pipe->next_odm_pipe->clock_source; + + free_pipe->top_pipe = head_pipe->next_odm_pipe; + head_pipe->next_odm_pipe->bottom_pipe = free_pipe; }else { + +/* For ODM + window MPO, in 3 plane case, if we already have a MPO window on +* the left side, then we will invalidate a 2nd one on the left side +*/ +if (head_pipe->next_odm_pipe && tail_pipe->top_pipe) { +dc_plane_state_release (plane_state); +return false; + } + free_pipe->stream_res.tg = tail_pipe->stream_res.tg; free_pipe->stream_res.abm = tail_pipe->stream_res.abm; free_pipe->stream_res.opp = tail_pipe->stream_res.opp;
@@ -1564,21 +1651,28 @@ bool dc_add_plane_to_context( free_pipe->top_pipe = tail_pipe; tail_pipe->bottom_pipe = free_pipe; -if (!free_pipe->next_odm_pipe && tail_pipe->next_odm_pipe && tail_pipe->next_odm_pipe->bottom_pipe) { - free_pipe->next_odm_pipe = tail_pipe->next_odm_pipe->bottom_pipe; - tail_pipe->next_odm_pipe->bottom_pipe->prev_odm_pipe = free_pipe; - } -if (!free_pipe->prev_odm_pipe && tail_pipe->prev_odm_pipe && tail_pipe->prev_odm_pipe->bottom_pipe) { - free_pipe->prev_odm_pipe = tail_pipe->prev_odm_pipe->bottom_pipe; - tail_pipe->prev_odm_pipe->bottom_pipe->next_odm_pipe = free_pipe; +/* Connect MPO pipes together if MPO window is in the centre */ +if (!(free_pipe->plane_state && + (free_pipe->plane_state->clip_rect.x + free_pipe->plane_state->clip_rect.width <= + free_pipe->stream->src.x + free_pipe->stream->src.width/2 ))) { +if (!free_pipe->next_odm_pipe && + tail_pipe->next_odm_pipe && tail_pipe->next_odm_pipe->bottom_pipe) { + free_pipe->next_odm_pipe = tail_pipe->next_odm_pipe->bottom_pipe; + tail_pipe->next_odm_pipe->bottom_pipe->prev_odm_pipe = free_pipe; + } +if (!free_pipe->prev_odm_pipe && + tail_pipe->prev_odm_pipe && tail_pipe->prev_odm_pipe->bottom_pipe) { + free_pipe->prev_odm_pipe = tail_pipe->prev_odm_pipe->bottom_pipe; + tail_pipe->prev_odm_pipe->bottom_pipe->next_odm_pipe = free_pipe; + } } } }/* ODM + window MPO, where MPO window is on left half only */ if (free_pipe->plane_state && - (free_pipe->plane_state->clip_rect.x + free_pipe->plane_state->clip_rect.width <= - free_pipe->stream->src.x + free_pipe->stream->src.width/2 )) { + (free_pipe->plane_state->clip_rect.x + free_pipe->plane_state->clip_rect.width <= + free_pipe->stream->src.x + free_pipe->stream->src.width/2 )) {DC_LOG_SCALER ("%s - ODM + window MPO(left). free_pipe:%d\n" , __func__, free_pipe->pipe_idx);
@@ -1586,7 +1680,7 @@ bool dc_add_plane_to_context( }/* ODM + window MPO, where MPO window is on right half only */ if (free_pipe->plane_state && - (free_pipe->plane_state->clip_rect.x >= free_pipe->stream->src.x + free_pipe->stream->src.width/2 )) { + (free_pipe->plane_state->clip_rect.x >= free_pipe->stream->src.x + free_pipe->stream->src.width/2 )) {DC_LOG_SCALER ("%s - ODM + window MPO(right). free_pipe:%d\n" , __func__, free_pipe->pipe_idx);
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c +139 -10
197 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.h +6 -0
@@ -99,6 +99,12 @@ bool dcn32_subvp_in_use(struct dc *dc,bool dcn32_mpo_in_use (struct dc_state *context); +struct pipe_ctx *dcn32_acquire_idle_pipe_for_head_pipe_in_layer ( +struct dc_state *state, +const struct resource_pool *pool, +struct dc_stream_state *stream, +struct pipe_ctx *head_pipe); +void dcn32_determine_det_override (struct dc_state *context,display_e2e_pipe_params_st *pipes,bool *is_pipe_split_expected,int pipe_cnt);
Signature · 1 line
2.37.1
PATCH 7/31 drm/amd/display: Calculate MALL cache lines based on Mblks required
In reply to Alex HungFrom: Alvin Lee <[email protected]>
[Description]
- Calculation for NumWays in MALL should be based on number of MBlks
--- .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 1 + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.h +1 -0
@@ -29,6 +29,7 @@#include "core_types.h" #define DCN3_2_DET_SEG_SIZE 64 +#define DCN3_2_MALL_MBLK_SIZE_BYTES 65536 // 64 * 1024#define TO_DCN32_RES_POOL (pool)\ container_of(pool, struct dcn32_resource_pool, base)
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c +14 -1
@@ -51,6 +51,9 @@ uint32_t dcn32_helper_calculate_num_ways_for_subvp(struct dc *dc, struct dc_statuint32_t cache_lines_used =0 ;uint32_t lines_per_way =0 ;uint32_t total_cache_lines =0 ; +uint32_t bytes_in_mall =0 ; +uint32_t num_mblks =0 ; +uint32_t cache_lines_per_plane =0 ;uint32_t i =0 ;for (i =0 ; i < dc->res_pool->pipe_count; i++) {
@@ -61,9 +64,19 @@ uint32_t dcn32_helper_calculate_num_ways_for_subvp(struct dc *dc, struct dc_stat pipe->stream->mall_stream_config.type == SUBVP_PHANTOM) { bytes_per_pixel = pipe->plane_state->format >=SURFACE_PIXEL_FORMAT_GRPH_ARGB16161616 ?8 :4 ; mall_region_pixels = pipe->stream->timing.h_addressable * pipe->stream->timing.v_addressable; + +// For bytes required in MALL, calculate based on number of MBlks required + num_mblks = (mall_region_pixels * bytes_per_pixel + +DCN3_2_MALL_MBLK_SIZE_BYTES -1 ) /DCN3_2_MALL_MBLK_SIZE_BYTES ; + bytes_in_mall = num_mblks *DCN3_2_MALL_MBLK_SIZE_BYTES ;// cache lines used is total bytes / cache_line size. Add +2 for worst case alignment // (MALL is 64-byte aligned) - cache_lines_used += (bytes_per_pixel * mall_region_pixels) / dc->caps.cache_line_size +2 ; + cache_lines_per_plane = bytes_in_mall / dc->caps.cache_line_size +2 ; + +// For DCC we must cache the meat surface, so double cache lines required +if (pipe->plane_state->dcc.enable) + cache_lines_per_plane *=2 ; + cache_lines_used += cache_lines_per_plane; } }
Signature · 1 line
2.37.1
PATCH 8/31 drm/amd/display: Reset pipe count when iterating for DET override
In reply to Alex HungFrom: Taimur Hassan <[email protected]>
[Why]
Coding error in DET allocation was resulting in too few DET segments being allocated, causing underflow.
[How]
Reset pipe count each time we begin iterating through pipes for a stream.
--- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c +2 -1
@@ -184,7 +184,8 @@ void dcn32_determine_det_override(struct dc_state *context, display_e2e_pipe_parif (context->stream_count >0 ) { stream_segments =18 / context->stream_count; -for (i =0 , count =0 ; i < context->stream_count; i++) { +for (i =0 ; i < context->stream_count; i++) { + count =0 ;for (j =0 ; j < pipe_cnt; j++) {if (context->res_ctx.pipe_ctx[j].stream == context->streams[i]) { count++;
Signature · 1 line
2.37.1
PATCH 9/31 drm/amd/display: Reboot while unplug hdcp enabled dp from mst hub
In reply to Alex HungFrom: hersen wu <[email protected]>
[Why]event_property_update does not check NULL pointer
[How]
check aconnector->base.state equals NULL
--- .../amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 34 ++++++++++++------- 1 file changed, 22 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c +22 -12
@@ -302,7 +302,7 @@ static void event_property_update(struct work_struct *work)mutex_lock (&hdcp_work->mutex); -if (aconnector->base.state->commit) { +if (aconnector->base.state && aconnector->base.state->commit) { ret =wait_for_completion_interruptible_timeout (&aconnector->base.state->commit->hw_done,10 *HZ );if (ret ==0 ) {
@@ -311,18 +311,26 @@ static void event_property_update(struct work_struct *work) } } -if (hdcp_work->encryption_status !=MOD_HDCP_ENCRYPTION_STATUS_HDCP_OFF ) { -if (aconnector->base.state->hdcp_content_type ==DRM_MODE_HDCP_CONTENT_TYPE0 && - hdcp_work->encryption_status <=MOD_HDCP_ENCRYPTION_STATUS_HDCP2_TYPE0_ON ) -drm_hdcp_update_content_protection (&aconnector->base,DRM_MODE_CONTENT_PROTECTION_ENABLED ); -else if (aconnector->base.state->hdcp_content_type ==DRM_MODE_HDCP_CONTENT_TYPE1 && - hdcp_work->encryption_status ==MOD_HDCP_ENCRYPTION_STATUS_HDCP2_TYPE1_ON ) -drm_hdcp_update_content_protection (&aconnector->base,DRM_MODE_CONTENT_PROTECTION_ENABLED ); - }else { -drm_hdcp_update_content_protection (&aconnector->base,DRM_MODE_CONTENT_PROTECTION_DESIRED ); +if (aconnector->base.state) { +if (hdcp_work->encryption_status !=MOD_HDCP_ENCRYPTION_STATUS_HDCP_OFF ) { +if (aconnector->base.state->hdcp_content_type == +DRM_MODE_HDCP_CONTENT_TYPE0 && + hdcp_work->encryption_status <= +MOD_HDCP_ENCRYPTION_STATUS_HDCP2_TYPE0_ON ) +drm_hdcp_update_content_protection (&aconnector->base, +DRM_MODE_CONTENT_PROTECTION_ENABLED ); +else if (aconnector->base.state->hdcp_content_type == +DRM_MODE_HDCP_CONTENT_TYPE1 && + hdcp_work->encryption_status == +MOD_HDCP_ENCRYPTION_STATUS_HDCP2_TYPE1_ON ) +drm_hdcp_update_content_protection (&aconnector->base, +DRM_MODE_CONTENT_PROTECTION_ENABLED ); + }else { +drm_hdcp_update_content_protection (&aconnector->base, +DRM_MODE_CONTENT_PROTECTION_DESIRED ); + } } -mutex_unlock (&hdcp_work->mutex);drm_modeset_unlock (&dev->mode_config.connection_mutex); }
@@ -495,7 +503,9 @@ static void update_config(void *handle, struct cp_psp_stream_config *config) (!!aconnector->base.state) ? aconnector->base.state->content_protection :-1 , (!!aconnector->base.state) ? aconnector->base.state->hdcp_content_type : -1); -hdcp_update_display (hdcp_work, link_index, aconnector, conn_state->hdcp_content_type, false); +if (conn_state) +hdcp_update_display (hdcp_work, link_index, aconnector, + conn_state->hdcp_content_type, false); }
Signature · 1 line
2.37.1
PATCH 10/31 drm/amd/display: Drop unnecessary FPU flags on dcn302 files
In reply to Alex HungFrom: Rodrigo Siqueira <[email protected]>
We already isolated the DCN302 code in the DML folder, but we forgot to drop the FPU flags from the Makefile. This commit drops those flags.
--- .../gpu/drm/amd/display/dc/dcn302/Makefile | 25 ------------------- 1 file changed, 25 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn302/Makefile +0 -25
@@ -7,31 +7,6 @@ DCN3_02 = dcn302_init.o dcn302_hwseq.o dcn302_resource.o -ifdef CONFIG_X86 -CFLAGS_$(AMDDALPATH)/dc/dcn302/dcn302_resource.o := -mhard-float -msse -endif - -ifdef CONFIG_PPC64 -CFLAGS_$(AMDDALPATH)/dc/dcn302/dcn302_resource.o := -mhard-float -maltivec -endif - -ifdef CONFIG_X86 -ifdef CONFIG_CC_IS_GCC -ifeq ($(call cc-ifversion, -lt, 0701, y), y) -IS_OLD_GCC = 1 -endif -endif - -ifdef IS_OLD_GCC -# Stack alignment mismatch, proceed with caution. -# GCC < 7.1 cannot compile code using `double` and -mpreferred-stack-boundary=3 -# (8B stack alignment). -CFLAGS_$(AMDDALPATH)/dc/dcn302/dcn302_resource.o += -mpreferred-stack-boundary=4 -else -CFLAGS_$(AMDDALPATH)/dc/dcn302/dcn302_resource.o += -msse2 -endif -endif - AMD_DAL_DCN3_02 = $(addprefix $(AMDDALPATH)/dc/dcn302/,$(DCN3_02)) AMD_DISPLAY_FILES += $(AMD_DAL_DCN3_02)
Signature · 1 line
2.37.1
PATCH 11/31 drm/amd/display: Fallback to SW cursor if SubVP + cursor too big
In reply to Alex HungFrom: Alvin Lee <[email protected]>
[Description]
- For SubVP cursor cannot be cached in MALL, therefore we will switch to SW cursor if the cursor size exceeds what can fit in the local DCN buffers (64x64x4)
- Returning false / failure for set_cursor_attributes will fallback to SW cursor
--- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_stream.c +5 -0
@@ -328,6 +328,11 @@ bool dc_stream_set_cursor_attributes( } dc = stream->ctx->dc; + +if (attributes->height * attributes->width *4 >16384 ) +if (stream->mall_stream_config.type ==SUBVP_MAIN ) +return false; + stream->cursor_attributes = *attributes;dc_z10_restore (dc);
Signature · 1 line
2.37.1
PATCH 12/31 drm/amd/display: Remove FPU operations from dcn201 resources
In reply to Alex HungFrom: Rodrigo Siqueira <[email protected]>
We have some FPU operations on the resource part of the DCN201. This commit drops FPU flags and moves any required FPU code to the DML folder.
--- .../gpu/drm/amd/display/dc/dcn201/Makefile | 24 ----- .../amd/display/dc/dcn201/dcn201_resource.c | 10 ++- .../drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 87 +++++++++++++++++++ .../drm/amd/display/dc/dml/dcn20/dcn20_fpu.h | 4 + 4 files changed, 100 insertions(+), 25 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn201/Makefile +0 -24
@@ -6,30 +6,6 @@ DCN201 = dcn201_init.o dcn201_resource.o dcn201_hwseq.o \ dcn201_mpc.o dcn201_hubp.o dcn201_opp.o dcn201_optc.o dcn201_dpp.o \ dcn201_dccg.o dcn201_link_encoder.o -ifdef CONFIG_X86 -CFLAGS_$(AMDDALPATH)/dc/dcn201/dcn201_resource.o := -mhard-float -msse -endif - -ifdef CONFIG_PPC64 -CFLAGS_$(AMDDALPATH)/dc/dcn201/dcn201_resource.o := -mhard-float -maltivec -endif - -ifdef CONFIG_CC_IS_GCC -ifeq ($(call cc-ifversion, -lt, 0701, y), y) -IS_OLD_GCC = 1 -endif -endif - -ifdef CONFIG_X86 -ifdef IS_OLD_GCC -# Stack alignment mismatch, proceed with caution. -# GCC < 7.1 cannot compile code using `double` and -mpreferred-stack-boundary=3 -# (8B stack alignment). -CFLAGS_$(AMDDALPATH)/dc/dcn201/dcn201_resource.o += -mpreferred-stack-boundary=4 -else -CFLAGS_$(AMDDALPATH)/dc/dcn201/dcn201_resource.o += -msse2 -endif -endif AMD_DAL_DCN201 = $(addprefix $(AMDDALPATH)/dc/dcn201/,$(DCN201)) AMD_DISPLAY_FILES += $(AMD_DAL_DCN201)
drivers/gpu/drm/amd/display/dc/dcn201/dcn201_resource.c +9 -1
@@ -1036,6 +1036,14 @@ static bool dcn201_get_dcc_compression_cap(const struct dc *dc, output); } +static void dcn201_populate_dml_writeback_from_context (struct dc *dc, +struct resource_context *res_ctx, +display_e2e_pipe_params_st *pipes) +{ +DC_FP_START (); +dcn201_populate_dml_writeback_from_context_fpu (dc, res_ctx, pipes); +DC_FP_END (); +}static void dcn201_destroy_resource_pool (struct resource_pool **pool) {
@@ -1067,8 +1075,8 @@ static struct resource_funcs dcn201_res_pool_funcs = { .add_dsc_to_stream_resource = NULL, .remove_stream_from_ctx = dcn20_remove_stream_from_ctx, .acquire_idle_pipe_for_layer = dcn201_acquire_idle_pipe_for_layer, + .populate_dml_writeback_from_context = dcn201_populate_dml_writeback_from_context, .patch_unknown_plane_state = dcn20_patch_unknown_plane_state, - .populate_dml_writeback_from_context = dcn20_populate_dml_writeback_from_context, .set_mcif_arb_params = dcn20_set_mcif_arb_params, .find_first_free_match_stream_enc_for_link = dcn10_find_first_free_match_stream_enc_for_link };
drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c +87 -0
90 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.h +4 -0
@@ -84,4 +84,8 @@ void dcn21_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_paramsvoid dcn21_clk_mgr_set_bw_params_wm_table (struct clk_bw_params *bw_params); +void dcn201_populate_dml_writeback_from_context_fpu (struct dc *dc, +struct resource_context *res_ctx, +display_e2e_pipe_params_st *pipes); +#endif /* __DCN20_FPU_H__ */
Signature · 1 line
2.37.1
PATCH 13/31 drm/amd/display: Move mclk calculation function to DML
In reply to Alex HungFrom: Rodrigo Siqueira <[email protected]>
The function responsible for calculating the MCLK switching has FPU operations. This commit moves it to the dcn30_fpu file.
--- .../drm/amd/display/dc/dcn30/dcn30_resource.c | 38 ---------------- .../drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 43 +++++++++++++++++++ .../drm/amd/display/dc/dml/dcn30/dcn30_fpu.h | 6 +++ 3 files changed, 49 insertions(+), 38 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c +0 -38
@@ -2031,44 +2031,6 @@ void dcn30_setup_mclk_switch_using_fw_based_vblank_stretch(struct dc *dc, struct context->bw_ctx.bw.dcn.watermarks.a.cstate_pstate.pstate_change_ns =4U *1000U *1000U *1000U ; } -/* -* Finds dummy_latency_index when MCLK switching using firmware based -* vblank stretch is enabled. This function will iterate through the -* table of dummy pstate latencies until the lowest value that allows -* dm_allow_self_refresh_and_mclk_switch to happen is found -*/ -int dcn30_find_dummy_latency_index_for_fw_based_mclk_switch (struct dc *dc,struct dc_state *context, -display_e2e_pipe_params_st *pipes,int pipe_cnt,int vlevel) -{ -const int max_latency_table_entries =4 ; -int dummy_latency_index =0 ; - -while (dummy_latency_index < max_latency_table_entries) { - context->bw_ctx.dml.soc.dram_clock_change_latency_us = - dc->clk_mgr->bw_params->dummy_pstate_table[dummy_latency_index].dummy_pstate_latency_us; -dcn30_internal_validate_bw (dc, context, pipes, &pipe_cnt, &vlevel, false); - -if (context->bw_ctx.dml.soc.allow_dram_self_refresh_or_dram_clock_change_in_vblank == - dm_allow_self_refresh_and_mclk_switch) -break ; - - dummy_latency_index++; - } - -if (dummy_latency_index == max_latency_table_entries) { -ASSERT (dummy_latency_index != max_latency_table_entries); -/* If the execution gets here, it means dummy p_states are -* not possible. This should never happen and would mean -* something is severely wrong. -* Here we reset dummy_latency_index to 3, because it is -* better to have underflows than system crashes. -*/ - dummy_latency_index =3 ; - } - -return dummy_latency_index; -} -void dcn30_update_soc_for_wm_a (struct dc *dc,struct dc_state *context) {DC_FP_START ();
drivers/gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c +43 -0
49 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.h +6 -0
@@ -63,6 +63,12 @@ void dcn30_fpu_update_bw_bounding_box(struct dc *dc,unsigned int *dcfclk_mhz, unsigned int *dram_speed_mts); +int dcn30_find_dummy_latency_index_for_fw_based_mclk_switch (struct dc *dc, +struct dc_state *context, +display_e2e_pipe_params_st *pipes, +int pipe_cnt, +int vlevel); +void dcn3_fpu_build_wm_range_table (struct clk_mgr *base);#endif /* __DCN30_FPU_H__*/
Signature · 1 line
2.37.1
PATCH 14/31 drm/amd/display: Create patch bounding box function for isolate FPU
In reply to Alex HungFrom: Rodrigo Siqueira <[email protected]>
In the DCN30 resource, we have a small patch to the bounding box struct; this patch uses FPU operations. This commit moves that specific part to its function under the DML folder.
--- .../drm/amd/display/dc/dcn30/dcn30_resource.c | 19 ++---------------- .../drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 20 +++++++++++++++++++ .../drm/amd/display/dc/dml/dcn30/dcn30_fpu.h | 2 ++ 3 files changed, 24 insertions(+), 17 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c +2 -17
@@ -1521,26 +1521,11 @@ static bool init_soc_bounding_box(struct dc *dc, loaded_ip->max_num_otg = pool->base.res_cap->num_timing_generator; loaded_ip->max_num_dpp = pool->base.pipe_count; loaded_ip->clamp_min_dcfclk = dc->config.clamp_min_dcfclk; - -DC_FP_START ();dcn20_patch_bounding_box (dc, loaded_bb); +DC_FP_START (); +patch_dcn30_soc_bounding_box (dc, &dcn3_0_soc);DC_FP_END (); -if (dc->ctx->dc_bios->funcs->get_soc_bb_info) { -struct bp_soc_bb_info bb_info = {0 }; - -if (dc->ctx->dc_bios->funcs->get_soc_bb_info (dc->ctx->dc_bios, &bb_info) ==BP_RESULT_OK ) { -if (bb_info.dram_clock_change_latency_100ns >0 ) - dcn3_0_soc.dram_clock_change_latency_us = bb_info.dram_clock_change_latency_100ns *10 ; - -if (bb_info.dram_sr_enter_exit_latency_100ns >0 ) - dcn3_0_soc.sr_enter_plus_exit_time_us = bb_info.dram_sr_enter_exit_latency_100ns *10 ; - -if (bb_info.dram_sr_exit_latency_100ns >0 ) - dcn3_0_soc.sr_exit_time_us = bb_info.dram_sr_exit_latency_100ns *10 ; - } - } -return true; }
drivers/gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c +20 -0
@@ -721,3 +721,23 @@ void dcn3_fpu_build_wm_range_table(struct clk_mgr *base) base->bw_params->wm_table.nv_entries[WM_D ].pmfw_breakdown.min_uclk = min_uclk_mhz; base->bw_params->wm_table.nv_entries[WM_D ].pmfw_breakdown.max_uclk =0xFFFF ; } + +void patch_dcn30_soc_bounding_box (struct dc *dc,struct _vcs_dpi_soc_bounding_box_st *dcn3_0_ip) +{ +dc_assert_fp_enabled (); + +if (dc->ctx->dc_bios->funcs->get_soc_bb_info) { +struct bp_soc_bb_info bb_info = {0 }; + +if (dc->ctx->dc_bios->funcs->get_soc_bb_info (dc->ctx->dc_bios, &bb_info) ==BP_RESULT_OK ) { +if (bb_info.dram_clock_change_latency_100ns >0 ) + dcn3_0_soc.dram_clock_change_latency_us = bb_info.dram_clock_change_latency_100ns *10 ; + +if (bb_info.dram_sr_enter_exit_latency_100ns >0 ) + dcn3_0_soc.sr_enter_plus_exit_time_us = bb_info.dram_sr_enter_exit_latency_100ns *10 ; + +if (bb_info.dram_sr_exit_latency_100ns >0 ) + dcn3_0_soc.sr_exit_time_us = bb_info.dram_sr_exit_latency_100ns *10 ; + } + } +}
drivers/gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.h +2 -0
@@ -71,4 +71,6 @@ int dcn30_find_dummy_latency_index_for_fw_based_mclk_switch(struct dc *dc,void dcn3_fpu_build_wm_range_table (struct clk_mgr *base); +void patch_dcn30_soc_bounding_box (struct dc *dc,struct _vcs_dpi_soc_bounding_box_st *dcn3_0_ip); +#endif /* __DCN30_FPU_H__*/
Signature · 1 line
2.37.1
PATCH 15/31 drm/amd/display: Remove FPU flags from DCN30 Makefile
In reply to Alex HungFrom: Rodrigo Siqueira <[email protected]>
At this stage, we must have all the FPU code for DCN30 isolated in the DML folder. Drop FPU flags from Makefile.
--- drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 30 ------------------- 1 file changed, 30 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn30/Makefile +0 -30
@@ -30,36 +30,6 @@ DCN30 = dcn30_init.o dcn30_hubbub.o dcn30_hubp.o dcn30_dpp.o dcn30_optc.o \ dcn30_dpp_cm.o dcn30_dwb_cm.o dcn30_cm_common.o dcn30_mmhubbub.o \ dcn30_dio_link_encoder.o dcn30_resource.o - -ifdef CONFIG_X86 -CFLAGS_$(AMDDALPATH)/dc/dcn30/dcn30_resource.o := -mhard-float -msse -CFLAGS_$(AMDDALPATH)/dc/dcn30/dcn30_optc.o := -mhard-float -msse -endif - -ifdef CONFIG_PPC64 -CFLAGS_$(AMDDALPATH)/dc/dcn30/dcn30_resource.o := -mhard-float -maltivec -CFLAGS_$(AMDDALPATH)/dc/dcn30/dcn30_optc.o := -mhard-float -maltivec -endif - -ifdef CONFIG_CC_IS_GCC -ifeq ($(call cc-ifversion, -lt, 0701, y), y) -IS_OLD_GCC = 1 -endif -endif - -ifdef CONFIG_X86 -ifdef IS_OLD_GCC -# Stack alignment mismatch, proceed with caution. -# GCC < 7.1 cannot compile code using `double` and -mpreferred-stack-boundary=3 -# (8B stack alignment). -CFLAGS_$(AMDDALPATH)/dc/dcn30/dcn30_resource.o += -mpreferred-stack-boundary=4 -CFLAGS_$(AMDDALPATH)/dc/dcn30/dcn30_optc.o += -mpreferred-stack-boundary=4 -else -CFLAGS_$(AMDDALPATH)/dc/dcn30/dcn30_resource.o += -msse2 -CFLAGS_$(AMDDALPATH)/dc/dcn30/dcn30_optc.o += -msse2 -endif -endif - AMD_DAL_DCN30 = $(addprefix $(AMDDALPATH)/dc/dcn30/,$(DCN30)) AMD_DISPLAY_FILES += $(AMD_DAL_DCN30)
Signature · 1 line
2.37.1
PATCH 16/31 drm/amd/display: Add pixel rate div calcs and programming
In reply to Alex HungFrom: Michael Strauss <[email protected]>
[WHY/HOW]
Need to calculate and set some pixel rate divisors on correct otg_inst
--- .../drm/amd/display/dc/dcn314/dcn314_dccg.c | 17 +++++++++ .../drm/amd/display/dc/dcn314/dcn314_hwseq.c | 36 +++++++++++++++++++ .../drm/amd/display/dc/dcn314/dcn314_hwseq.h | 2 ++ .../drm/amd/display/dc/dcn314/dcn314_init.c | 1 + 4 files changed, 56 insertions(+)
drivers/gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c +17 -0
@@ -219,6 +219,21 @@ void dccg314_set_dpstreamclk( } } +void dccg314_set_valid_pixel_rate ( +struct dccg *dccg, +int ref_dtbclk_khz, +int otg_inst, +int pixclk_khz) +{ +struct dtbclk_dto_params dto_params = {0 }; + + dto_params.ref_dtbclk_khz = ref_dtbclk_khz; + dto_params.otg_inst = otg_inst; + dto_params.pixclk_khz = pixclk_khz; + +dccg314_set_dtbclk_dto (dccg, &dto_params); +} +static const struct dccg_funcs dccg314_funcs = { .update_dpp_dto = dccg31_update_dpp_dto, .get_dccg_ref_freq = dccg31_get_dccg_ref_freq,
@@ -237,6 +252,8 @@ static const struct dccg_funcs dccg314_funcs = { .set_dispclk_change_mode = dccg31_set_dispclk_change_mode, .disable_dsc = dccg31_disable_dscclk, .enable_dsc = dccg31_enable_dscclk, + .set_pixel_rate_div = dccg314_set_pixel_rate_div, + .set_valid_pixel_rate = dccg314_set_valid_pixel_rate, }; struct dccg *dccg314_create(
drivers/gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.c +36 -0
@@ -338,3 +338,39 @@ void dcn314_enable_power_gating_plane(struct dce_hwseq *hws, bool enable)if (org_ip_request_cntl ==0 )REG_SET (DC_IP_REQUEST_CNTL ,0 ,IP_REQUEST_EN ,0 ); } + +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 ; + + odm_combine_factor =get_odm_config (pipe_ctx,NULL ); + +if (is_dp_128b_132b_signal (pipe_ctx)) { + *k2_div =PIXEL_RATE_DIV_BY_1 ; + }else if (dc_is_hdmi_tmds_signal (pipe_ctx->stream->signal) ||dc_is_dvi_signal (pipe_ctx->stream->signal)) { + *k1_div =PIXEL_RATE_DIV_BY_1 ; +if (stream->timing.pixel_encoding ==PIXEL_ENCODING_YCBCR420 ) + *k2_div =PIXEL_RATE_DIV_BY_2 ; +else + *k2_div =PIXEL_RATE_DIV_BY_4 ; + }else if (dc_is_dp_signal (pipe_ctx->stream->signal)) { +if (stream->timing.pixel_encoding ==PIXEL_ENCODING_YCBCR420 ) { + *k1_div =PIXEL_RATE_DIV_BY_1 ; + *k2_div =PIXEL_RATE_DIV_BY_2 ; + }else if (stream->timing.pixel_encoding ==PIXEL_ENCODING_YCBCR422 ) { + *k1_div =PIXEL_RATE_DIV_BY_2 ; + *k2_div =PIXEL_RATE_DIV_BY_2 ; + }else { +if (odm_combine_factor ==1 ) + *k2_div =PIXEL_RATE_DIV_BY_4 ; +else 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; +}
drivers/gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.h +2 -0
@@ -37,4 +37,6 @@ 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); +unsigned int dcn314_calculate_dccg_k1_k2_values (struct pipe_ctx *pipe_ctx,unsigned int *k1_div,unsigned int *k2_div); +#endif /* __DC_HWSS_DCN314_H__ */
drivers/gpu/drm/amd/display/dc/dcn314/dcn314_init.c +1 -0
@@ -144,6 +144,7 @@ static const struct hwseq_private_funcs dcn314_private_funcs = { .set_blend_lut = dcn30_set_blend_lut, .set_shaper_3dlut = dcn20_set_shaper_3dlut, .setup_hpo_hw_control = dcn31_setup_hpo_hw_control, + .calculate_dccg_k1_k2_values = dcn314_calculate_dccg_k1_k2_values, };void dcn314_hw_sequencer_construct (struct dc *dc)
Signature · 1 line
2.37.1
PATCH 17/31 drm/amd/display: Use correct DTO_SRC_SEL for 128b/132b encoding
In reply to Alex HungFrom: Michael Strauss <[email protected]>
[WHY]
DP DTO isn't used for 128b/132b encoding
[HOW]
Check current link rate to determine whether using 8b/10b or 128/132b encoding
--- .../gpu/drm/amd/display/dc/core/dc_link_dp.c | 1 + .../drm/amd/display/dc/dce/dce_clock_source.c | 20 ++++++++++++++----- .../display/dc/dce110/dce110_hw_sequencer.c | 1 + .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 1 + .../drm/amd/display/dc/dcn20/dcn20_hwseq.c | 1 + .../gpu/drm/amd/display/dc/inc/clock_source.h | 7 +++++-- 6 files changed, 24 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +1 -0
@@ -7064,6 +7064,7 @@ void dp_enable_link_phy( pipes[i].clock_source->funcs->program_pix_clk ( pipes[i].clock_source, &pipes[i].stream_res.pix_clk_params, +dp_get_link_encoding_format (link_settings), &pipes[i].pll_settings); } }
drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c +15 -5
@@ -838,6 +838,7 @@ static void dce112_program_pixel_clk_resync(static bool dce110_program_pix_clk (struct clock_source *clock_source,struct pixel_clk_params *pix_clk_params, +enum dp_link_encoding encoding,struct pll_settings *pll_settings) {struct dce110_clk_src *clk_src =TO_DCE110_CLK_SRC (clock_source);
@@ -911,6 +912,7 @@ static bool dce110_program_pix_clk(static bool dce112_program_pix_clk (struct clock_source *clock_source,struct pixel_clk_params *pix_clk_params, +enum dp_link_encoding encoding,struct pll_settings *pll_settings) {struct dce110_clk_src *clk_src =TO_DCE110_CLK_SRC (clock_source);
@@ -970,6 +972,7 @@ static bool dce112_program_pix_clk(static bool dcn31_program_pix_clk (struct clock_source *clock_source,struct pixel_clk_params *pix_clk_params, +enum dp_link_encoding encoding,struct pll_settings *pll_settings) {struct dce110_clk_src *clk_src =TO_DCE110_CLK_SRC (clock_source);
@@ -993,9 +996,14 @@ static bool dcn31_program_pix_clk(#if defined(CONFIG_DRM_AMD_DC_DCN )/* Enable DTO */ if (clk_src->cs_mask->PIPE0_DTO_SRC_SEL) -REG_UPDATE_2 (PIXEL_RATE_CNTL [inst], -DP_DTO0_ENABLE ,1 , -PIPE0_DTO_SRC_SEL ,1 ); +if (encoding == DP_128b_132b_ENCODING) +REG_UPDATE_2 (PIXEL_RATE_CNTL [inst], +DP_DTO0_ENABLE ,1 , +PIPE0_DTO_SRC_SEL ,2 ); +else +REG_UPDATE_2 (PIXEL_RATE_CNTL [inst], +DP_DTO0_ENABLE ,1 , +PIPE0_DTO_SRC_SEL ,1 );else REG_UPDATE (PIXEL_RATE_CNTL [inst],DP_DTO0_ENABLE ,1 );
@@ -1198,12 +1206,13 @@ const struct pixel_rate_range_table_entry *look_up_in_video_optimized_rate_tlb(static bool dcn20_program_pix_clk (struct clock_source *clock_source,struct pixel_clk_params *pix_clk_params, +enum dp_link_encoding encoding,struct pll_settings *pll_settings) {struct dce110_clk_src *clk_src =TO_DCE110_CLK_SRC (clock_source);unsigned int inst = pix_clk_params->controller_id -CONTROLLER_ID_D0 ; -dce112_program_pix_clk (clock_source, pix_clk_params, pll_settings); +dce112_program_pix_clk (clock_source, pix_clk_params, encoding, pll_settings);if (clock_source->ctx->dc->hwss.enable_vblanks_synchronization && clock_source->ctx->dc->config.vblank_alignment_max_frame_time_diff >0 ) {
@@ -1243,6 +1252,7 @@ static const struct clock_source_funcs dcn20_clk_src_funcs = {static bool dcn3_program_pix_clk (struct clock_source *clock_source,struct pixel_clk_params *pix_clk_params, +enum dp_link_encoding encoding,struct pll_settings *pll_settings) {struct dce110_clk_src *clk_src =TO_DCE110_CLK_SRC (clock_source);
@@ -1265,7 +1275,7 @@ static bool dcn3_program_pix_clk(REG_UPDATE (PIXEL_RATE_CNTL [inst],DP_DTO0_ENABLE ,1 ); }else // For other signal types(HDMI_TYPE_A, DVI) Driver still to call VBIOS Command table -dce112_program_pix_clk (clock_source, pix_clk_params, pll_settings); +dce112_program_pix_clk (clock_source, pix_clk_params, encoding, pll_settings);return true; }
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +1 -0
@@ -1435,6 +1435,7 @@ static enum dc_status dce110_enable_stream_timing(if (false == pipe_ctx->clock_source->funcs->program_pix_clk ( pipe_ctx->clock_source, &pipe_ctx->stream_res.pix_clk_params, +dp_get_link_encoding_format (&pipe_ctx->link_config.dp_link_settings), &pipe_ctx->pll_settings)) {BREAK_TO_DEBUGGER ();return DC_ERROR_UNEXPECTED ;
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +1 -0
@@ -892,6 +892,7 @@ enum dc_status dcn10_enable_stream_timing(if (false == pipe_ctx->clock_source->funcs->program_pix_clk ( pipe_ctx->clock_source, &pipe_ctx->stream_res.pix_clk_params, +dp_get_link_encoding_format (&pipe_ctx->link_config.dp_link_settings), &pipe_ctx->pll_settings)) {BREAK_TO_DEBUGGER ();return DC_ERROR_UNEXPECTED ;
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +1 -0
@@ -700,6 +700,7 @@ enum dc_status dcn20_enable_stream_timing(if (false == pipe_ctx->clock_source->funcs->program_pix_clk ( pipe_ctx->clock_source, &pipe_ctx->stream_res.pix_clk_params, +dp_get_link_encoding_format (&pipe_ctx->link_config.dp_link_settings), &pipe_ctx->pll_settings)) {BREAK_TO_DEBUGGER ();return DC_ERROR_UNEXPECTED ;
drivers/gpu/drm/amd/display/dc/inc/clock_source.h +5 -2
@@ -160,8 +160,11 @@ struct calc_pll_clock_source {struct clock_source_funcs {bool (*cs_power_down)(struct clock_source *); -bool (*program_pix_clk)(struct clock_source *, -struct pixel_clk_params *,struct pll_settings *); +bool (*program_pix_clk)( +struct clock_source *, +struct pixel_clk_params *, +enum dp_link_encoding encoding, +struct pll_settings *); uint32_t (*get_pix_clk_dividers)( struct clock_source *, struct pixel_clk_params *,
Signature · 1 line
2.37.1
PATCH 18/31 drm/amd/display: Use correct clock source constructor for DCN314
In reply to Alex HungFrom: Michael Strauss <[email protected]>
[WHY]
Previously was pointing to DCN3 clock constructor rather than DCN31's
--- drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c +1 -1
@@ -1782,7 +1782,7 @@ static struct clock_source *dcn31_clock_source_create(if (!clk_src)return NULL ; -if (dcn3_clk_src_construct (clk_src, ctx, bios, id, +if (dcn31_clk_src_construct (clk_src, ctx, bios, id, regs, &cs_shift, &cs_mask)) { clk_src->base.dp_clk_src = dp_clk_src;return &clk_src->base;
Signature · 1 line
2.37.1
PATCH 19/31 drm/amd/display: Add OTG/ODM functions
In reply to Alex HungFrom: Michael Strauss <[email protected]>
[WHY]
Required for correct OTG_H_TIMING_CNTL programming
--- .../drm/amd/display/dc/dcn314/dcn314_optc.c | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+)
drivers/gpu/drm/amd/display/dc/dcn314/dcn314_optc.c +34 -0
@@ -160,6 +160,37 @@ void optc314_phantom_crtc_post_enable(struct timing_generator *optc)REG_WAIT (OTG_CLOCK_CONTROL ,OTG_BUSY ,0 ,1 ,100000 ); } +static void optc314_set_odm_bypass (struct timing_generator *optc, +const struct dc_crtc_timing *dc_crtc_timing) +{ +struct optc *optc1 =DCN10TG_FROM_TG (optc); +enum h_timing_div_mode h_div =H_TIMING_NO_DIV ; + +REG_SET_5 (OPTC_DATA_SOURCE_SELECT ,0 , +OPTC_NUM_OF_INPUT_SEGMENT ,0 , +OPTC_SEG0_SRC_SEL , optc->inst, +OPTC_SEG1_SRC_SEL ,0xf , +OPTC_SEG2_SRC_SEL ,0xf , +OPTC_SEG3_SRC_SEL ,0xf + ); + + h_div =optc1_is_two_pixels_per_containter (dc_crtc_timing); +REG_UPDATE (OTG_H_TIMING_CNTL , +OTG_H_TIMING_DIV_MODE , h_div); + +REG_SET (OPTC_MEMORY_CONFIG ,0 , +OPTC_MEM_SEL ,0 ); + optc1->opp_count =1 ; +} + +static void optc314_set_h_timing_div_manual_mode (struct timing_generator *optc,bool manual_mode) +{ +struct optc *optc1 =DCN10TG_FROM_TG (optc); + +REG_UPDATE (OTG_H_TIMING_CNTL , +OTG_H_TIMING_DIV_MODE_MANUAL , manual_mode ?1 :0 ); +} +static struct timing_generator_funcs dcn314_tg_funcs = { .validate_timing = optc1_validate_timing,
@@ -222,6 +253,9 @@ static struct timing_generator_funcs dcn314_tg_funcs = { .setup_manual_trigger = optc2_setup_manual_trigger, .get_hw_timing = optc1_get_hw_timing, .init_odm = optc3_init_odm, + .set_odm_bypass = optc314_set_odm_bypass, + .set_odm_combine = optc314_set_odm_combine, + .set_h_timing_div_manual_mode = optc314_set_h_timing_div_manual_mode, };void dcn314_timing_generator_init (struct optc *optc1)
Signature · 1 line
2.37.1
PATCH 20/31 drm/amd/display: Add missing AUDIO_DTO_SEL reg field
In reply to Alex HungFrom: Michael Strauss <[email protected]>
[WHY]
Needed to program audio dto
--- drivers/gpu/drm/amd/display/dc/dcn314/dcn314_dccg.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn314/dcn314_dccg.h +2 -1
@@ -147,7 +147,8 @@DCCG_SF (DTBCLK_P_CNTL ,DTBCLK_P2_EN , mask_sh),\DCCG_SF (DTBCLK_P_CNTL ,DTBCLK_P3_SRC_SEL , mask_sh),\DCCG_SF (DTBCLK_P_CNTL ,DTBCLK_P3_EN , mask_sh),\ - DCCG_SF(DCCG_AUDIO_DTO_SOURCE, DCCG_AUDIO_DTO0_SOURCE_SEL, mask_sh) +DCCG_SF (DCCG_AUDIO_DTO_SOURCE ,DCCG_AUDIO_DTO0_SOURCE_SEL , mask_sh),\ + DCCG_SF(DCCG_AUDIO_DTO_SOURCE, DCCG_AUDIO_DTO_SEL, mask_sh) struct dccg *dccg314_create( struct dc_context *ctx,
Signature · 1 line
2.37.1
PATCH 21/31 drm/amd/display: Fix dpstreamclk programming
In reply to Alex HungFrom: Michael Strauss <[email protected]>
[WHY]
Currently programming incorrect hpo inst as well as selecting incorrect source
[HOW]
Use hpo inst instead of otg inst to select dpstreamclk inst
--- drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 8 +++++--- drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h | 8 ++------ drivers/gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c | 13 +++++++------ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c | 3 ++- drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 3 ++- .../gpu/drm/amd/display/dc/link/link_hwss_hpo_dp.c | 4 ++-- 6 files changed, 20 insertions(+), 19 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c +5 -3
@@ -158,9 +158,11 @@ static void dccg31_disable_dpstreamclk(struct dccg *dccg, int otg_inst) } } -void dccg31_set_dpstreamclk (struct dccg *dccg, -enum streamclk_source src, -int otg_inst) +void dccg31_set_dpstreamclk ( +struct dccg *dccg, +enum streamclk_source src, +int otg_inst, +int dp_hpo_inst) {if (src ==REFCLK )dccg31_disable_dpstreamclk (dccg, otg_inst);
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h +2 -6
@@ -161,11 +161,6 @@ struct dccg *dccg31_create(void dccg31_init (struct dccg *dccg); -void dccg31_set_dpstreamclk ( -struct dccg *dccg, -enum streamclk_source src, -int otg_inst); - void dccg31_enable_symclk32_se( struct dccg *dccg, int hpo_se_inst,
@@ -207,7 +202,8 @@ void dccg31_get_dccg_ref_freq(void dccg31_set_dpstreamclk (struct dccg *dccg,enum streamclk_source src, -int otg_inst); +int otg_inst, +int dp_hpo_inst); void dccg31_set_dtbclk_dto( struct dccg *dccg,
drivers/gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c +7 -6
@@ -184,7 +184,8 @@ void dccg314_set_dtbclk_dto(void dccg314_set_dpstreamclk (struct dccg *dccg,enum streamclk_source src, -int otg_inst) +int otg_inst, +int dp_hpo_inst) {struct dcn_dccg *dccg_dcn =TO_DCN_DCCG (dccg);
@@ -192,26 +193,26 @@ void dccg314_set_dpstreamclk(dccg314_set_dtbclk_p_src (dccg, src, otg_inst);/* enabled to select one of the DTBCLKs for pipe */ -switch (otg_inst) { +switch (dp_hpo_inst) {case 0 :REG_UPDATE_2 (DPSTREAMCLK_CNTL ,DPSTREAMCLK0_EN , (src ==REFCLK ) ?0 :1 , -DPSTREAMCLK0_SRC_SEL ,0 ); +DPSTREAMCLK0_SRC_SEL , otg_inst);break ;case 1 :REG_UPDATE_2 (DPSTREAMCLK_CNTL ,DPSTREAMCLK1_EN , (src ==REFCLK ) ?0 :1 , -DPSTREAMCLK1_SRC_SEL ,1 ); +DPSTREAMCLK1_SRC_SEL , otg_inst);break ;case 2 :REG_UPDATE_2 (DPSTREAMCLK_CNTL ,DPSTREAMCLK2_EN , (src ==REFCLK ) ?0 :1 , -DPSTREAMCLK2_SRC_SEL ,2 ); +DPSTREAMCLK2_SRC_SEL , otg_inst);break ;case 3 :REG_UPDATE_2 (DPSTREAMCLK_CNTL ,DPSTREAMCLK3_EN , (src ==REFCLK ) ?0 :1 , -DPSTREAMCLK3_SRC_SEL ,3 ); +DPSTREAMCLK3_SRC_SEL , otg_inst);break ;default :BREAK_TO_DEBUGGER ();
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c +2 -1
@@ -211,7 +211,8 @@ static void dccg32_get_dccg_ref_freq(struct dccg *dccg,void dccg32_set_dpstreamclk (struct dccg *dccg,enum streamclk_source src, -int otg_inst) +int otg_inst, +int dp_hpo_inst) {struct dcn_dccg *dccg_dcn =TO_DCN_DCCG (dccg);
drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h +2 -1
@@ -101,7 +101,8 @@ struct dccg_funcs {void (*set_dpstreamclk)(struct dccg *dccg,enum streamclk_source src, -int otg_inst); +int otg_inst, +int dp_hpo_inst); void (*enable_symclk32_se)( struct dccg *dccg,
drivers/gpu/drm/amd/display/dc/link/link_hwss_hpo_dp.c +2 -2
@@ -116,7 +116,7 @@ static void setup_hpo_dp_stream_encoder(struct pipe_ctx *pipe_ctx) dto_params.timing = &pipe_ctx->stream->timing; dto_params.ref_dtbclk_khz = dc->clk_mgr->funcs->get_dtb_ref_clk_frequency (dc->clk_mgr); - dccg->funcs->set_dpstreamclk (dccg,DTBCLK0 , tg->inst); + dccg->funcs->set_dpstreamclk (dccg,DTBCLK0 , tg->inst, link_enc->inst); dccg->funcs->enable_symclk32_se (dccg, stream_enc->inst, phyd32clk); dccg->funcs->set_dtbclk_dto (dccg, &dto_params); stream_enc->funcs->enable_stream (stream_enc);
@@ -137,7 +137,7 @@ static void reset_hpo_dp_stream_encoder(struct pipe_ctx *pipe_ctx) stream_enc->funcs->disable (stream_enc); dccg->funcs->set_dtbclk_dto (dccg, &dto_params); dccg->funcs->disable_symclk32_se (dccg, stream_enc->inst); - dccg->funcs->set_dpstreamclk (dccg,REFCLK , tg->inst); + dccg->funcs->set_dpstreamclk (dccg,REFCLK , tg->inst, pipe_ctx->link_res.hpo_dp_link_enc->inst); }static void setup_hpo_dp_stream_attribute (struct pipe_ctx *pipe_ctx)
Signature · 1 line
2.37.1
PATCH 22/31 drm/amd/display: Add support for manual DMUB FAMS trigger
In reply to Alex HungFrom: Anthony Koo <[email protected]>
- Add is_drr parameter to indicate DRR is enabled on the panel to determine whether SubVP MCLK switch logic should be enabled
- Add DRR manual trigger in FW (instead of driver) because manual trigger programming triggers DRR update pending and can block SubVP MCLK switches from taking place
--- drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h +8 -1
@@ -976,7 +976,8 @@ struct dmub_cmd_fw_assisted_mclk_switch_pipe_data_v2 {uint16_t vtotal;uint8_t main_pipe_index;uint8_t phantom_pipe_index; -uint8_t padding[2 ]; +uint8_t is_drr; +uint8_t padding; } subvp_data;struct {
@@ -1579,6 +1580,12 @@ enum dmub_cmd_fams_type {DMUB_CMD__FAMS_SETUP_FW_CTRL =0 ,DMUB_CMD__FAMS_DRR_UPDATE =1 ,DMUB_CMD__HANDLE_SUBVP_CMD =2 ,// specifically for SubVP cmd +/** +* For SubVP set manual trigger in FW because it +* triggers DRR_UPDATE_PENDING which SubVP relies +* on (for any SubVP cases that use a DRR display) +*/ + DMUB_CMD__FAMS_SET_MANUAL_TRIGGER = 3, };/**
Signature · 1 line
2.37.1
PATCH 23/31 drm/amd/display: Cache cursor when cursor exceeds 64x64
In reply to Alex HungFrom: Chris Park <[email protected]>
[Why]
When Static screen from MALL, the cursor needs to be cached if cursor exceeds 64x64 size.
[How]
Program the bit that cache cursor in MALL when size of the cursor exceeds 64x64.
--- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.c | 4 ++-- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.h | 2 +- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 9 +++++++-- drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.c +2 -2
@@ -47,13 +47,13 @@ void hubp32_update_force_pstate_disallow(struct hubp *hubp, bool pstate_disallow DATA_UCLK_PSTATE_FORCE_VALUE, 0); } -void hubp32_update_mall_sel (struct hubp *hubp,uint32_t mall_sel) +void hubp32_update_mall_sel (struct hubp *hubp,uint32_t mall_sel,bool c_cursor) {struct dcn20_hubp *hubp2 =TO_DCN20_HUBP (hubp);// Also cache cursor in MALL if using MALL for SS REG_UPDATE_2 (DCHUBP_MALL_CONFIG ,USE_MALL_SEL , mall_sel, -USE_MALL_FOR_CURSOR , mall_sel ==2 ?1 :0 ); +USE_MALL_FOR_CURSOR , c_cursor); }void hubp32_prepare_subvp_buffering (struct hubp *hubp,bool enable)
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.h +1 -1
@@ -52,7 +52,7 @@void hubp32_update_force_pstate_disallow (struct hubp *hubp,bool pstate_disallow); -void hubp32_update_mall_sel (struct hubp *hubp,uint32_t mall_sel); +void hubp32_update_mall_sel (struct hubp *hubp,uint32_t mall_sel,bool c_cursor);void hubp32_prepare_subvp_buffering (struct hubp *hubp,bool enable);
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c +7 -2
@@ -670,18 +670,23 @@ void dcn32_update_mall_sel(struct dc *dc, struct dc_state *context) {int i;unsigned int num_ways =dcn32_calculate_cab_allocation (dc, context); +bool cache_cursor = false;for (i =0 ; i < dc->res_pool->pipe_count; i++) {struct pipe_ctx *pipe = &context->res_ctx.pipe_ctx[i];struct hubp *hubp = pipe->plane_res.hubp;if (pipe->stream && pipe->plane_state && hubp && hubp->funcs->hubp_update_mall_sel) { +if (hubp->curs_attr.width * hubp->curs_attr.height *4 >16384 ) + cache_cursor = true; +if (pipe->stream->mall_stream_config.type ==SUBVP_PHANTOM ) { - hubp->funcs->hubp_update_mall_sel (hubp,1 ); + hubp->funcs->hubp_update_mall_sel (hubp,1 , false); }else { hubp->funcs->hubp_update_mall_sel (hubp, num_ways <= dc->caps.cache_num_ways && - pipe->stream->link->psr_settings.psr_version ==DC_PSR_VERSION_UNSUPPORTED ?2 :0 ); + pipe->stream->link->psr_settings.psr_version ==DC_PSR_VERSION_UNSUPPORTED ?2 :0 , + cache_cursor); } } }
drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h +1 -1
@@ -198,7 +198,7 @@ struct hubp_funcs {void (*hubp_soft_reset)(struct hubp *hubp,bool reset);void (*hubp_update_force_pstate_disallow)(struct hubp *hubp,bool allow); -void (*hubp_update_mall_sel)(struct hubp *hubp,uint32_t mall_sel); +void (*hubp_update_mall_sel)(struct hubp *hubp,uint32_t mall_sel,bool c_cursor);void (*hubp_prepare_subvp_buffering)(struct hubp *hubp,bool enable);void (*hubp_set_flip_int)(struct hubp *hubp);
Signature · 1 line
2.37.1
PATCH 24/31 drm/amd/display: Add dc_ctx to link_enc_create() parameters
In reply to Alex HungFrom: Aurabindo Pillai <[email protected]>
[Why&How]
Preparation to enable run time initialization of register offsets to add dc_context to the link_enc_create callback. This is needed to get the dc_ctx handle where register offset initialization routine is called.
--- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 2 +- drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 1 + drivers/gpu/drm/amd/display/dc/dcn201/dcn201_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c | 4 +++- drivers/gpu/drm/amd/display/dc/dcn303/dcn303_resource.c | 4 +++- drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dcn316/dcn316_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c | 1 + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 1 + 23 files changed, 27 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link.c +1 -1
@@ -1703,7 +1703,7 @@ static bool dc_link_construct_legacy(struct dc_link *link, enc_init_data.transmitter =translate_encoder_to_transmitter (enc_init_data.encoder); link->link_enc = - link->dc->res_pool->funcs->link_enc_create (&enc_init_data); + link->dc->res_pool->funcs->link_enc_create (dc_ctx, &enc_init_data);if (!link->link_enc) {DC_ERROR ("Failed to create link encoder!\n" );
drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c +1 -0
@@ -612,6 +612,7 @@ static const struct encoder_feature_support link_enc_feature = { };static struct link_encoder *dce100_link_encoder_create ( +struct dc_context *ctx,const struct encoder_init_data *enc_init_data) { struct dce110_link_encoder *enc110 =
drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c +1 -0
@@ -660,6 +660,7 @@ static const struct encoder_feature_support link_enc_feature = { };static struct link_encoder *dce110_link_encoder_create ( +struct dc_context *ctx,const struct encoder_init_data *enc_init_data) { struct dce110_link_encoder *enc110 =
drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c +1 -0
@@ -618,6 +618,7 @@ static const struct encoder_feature_support link_enc_feature = { };static struct link_encoder *dce112_link_encoder_create ( +struct dc_context *ctx,const struct encoder_init_data *enc_init_data) { struct dce110_link_encoder *enc110 =
drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c +1 -0
@@ -697,6 +697,7 @@ static const struct encoder_feature_support link_enc_feature = { };static struct link_encoder *dce120_link_encoder_create ( +struct dc_context *ctx,const struct encoder_init_data *enc_init_data) { struct dce110_link_encoder *enc110 =
drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.c +1 -0
@@ -710,6 +710,7 @@ static const struct encoder_feature_support link_enc_feature = { };static struct link_encoder *dce60_link_encoder_create ( +struct dc_context *ctx,const struct encoder_init_data *enc_init_data) { struct dce110_link_encoder *enc110 =
drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c +1 -0
@@ -713,6 +713,7 @@ static const struct encoder_feature_support link_enc_feature = { };static struct link_encoder *dce80_link_encoder_create ( +struct dc_context *ctx,const struct encoder_init_data *enc_init_data) { struct dce110_link_encoder *enc110 =
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c +1 -0
@@ -740,6 +740,7 @@ static const struct encoder_feature_support link_enc_feature = { };static struct link_encoder *dcn10_link_encoder_create ( +struct dc_context *ctx,const struct encoder_init_data *enc_init_data) { struct dcn10_link_encoder *enc10 =
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +1 -0
@@ -925,6 +925,7 @@ static const struct encoder_feature_support link_enc_feature = { };struct link_encoder *dcn20_link_encoder_create ( +struct dc_context *ctx,const struct encoder_init_data *enc_init_data) { struct dcn20_link_encoder *enc20 =
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h +1 -0
@@ -50,6 +50,7 @@ struct resource_pool *dcn20_create_resource_pool( struct dc *dc);struct link_encoder *dcn20_link_encoder_create ( +struct dc_context *ctx,const struct encoder_init_data *enc_init_data); unsigned int dcn20_calc_max_scaled_time(
drivers/gpu/drm/amd/display/dc/dcn201/dcn201_resource.c +1 -0
@@ -788,6 +788,7 @@ static const struct encoder_feature_support link_enc_feature = { };static struct link_encoder *dcn201_link_encoder_create ( +struct dc_context *ctx,const struct encoder_init_data *enc_init_data) { struct dcn20_link_encoder *enc20 =
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +1 -0
@@ -1325,6 +1325,7 @@ static int map_transmitter_id_to_phy_instance( }static struct link_encoder *dcn21_link_encoder_create ( +struct dc_context *ctx,const struct encoder_init_data *enc_init_data) { struct dcn21_link_encoder *enc21 =
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c +1 -0
@@ -927,6 +927,7 @@ static const struct encoder_feature_support link_enc_feature = { };static struct link_encoder *dcn30_link_encoder_create ( +struct dc_context *ctx,const struct encoder_init_data *enc_init_data) { struct dcn20_link_encoder *enc20 =
drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c +1 -0
@@ -890,6 +890,7 @@ static const struct encoder_feature_support link_enc_feature = { };static struct link_encoder *dcn301_link_encoder_create ( +struct dc_context *ctx,const struct encoder_init_data *enc_init_data) { struct dcn20_link_encoder *enc20 =
drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c +3 -1
@@ -891,7 +891,9 @@ static const struct dcn10_link_enc_hpd_registers link_enc_hpd_regs[] = { hpd_regs(4) }; -static struct link_encoder *dcn302_link_encoder_create (const struct encoder_init_data *enc_init_data) +static struct link_encoder *dcn302_link_encoder_create ( +struct dc_context *ctx, +const struct encoder_init_data *enc_init_data) {struct dcn20_link_encoder *enc20 =kzalloc (sizeof (struct dcn20_link_encoder ),GFP_KERNEL );
drivers/gpu/drm/amd/display/dc/dcn303/dcn303_resource.c +3 -1
@@ -819,7 +819,9 @@ static const struct dcn10_link_enc_hpd_registers link_enc_hpd_regs[] = { hpd_regs(1) }; -static struct link_encoder *dcn303_link_encoder_create (const struct encoder_init_data *enc_init_data) +static struct link_encoder *dcn303_link_encoder_create ( +struct dc_context *ctx, +const struct encoder_init_data *enc_init_data) {struct dcn20_link_encoder *enc20 =kzalloc (sizeof (struct dcn20_link_encoder ),GFP_KERNEL );
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c +1 -0
@@ -1093,6 +1093,7 @@ static const struct encoder_feature_support link_enc_feature = { };static struct link_encoder *dcn31_link_encoder_create ( +struct dc_context *ctx,const struct encoder_init_data *enc_init_data) { struct dcn20_link_encoder *enc20 =
drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c +1 -0
@@ -1262,6 +1262,7 @@ static const struct encoder_feature_support link_enc_feature = { };static struct link_encoder *dcn31_link_encoder_create ( +struct dc_context *ctx,const struct encoder_init_data *enc_init_data) { struct dcn20_link_encoder *enc20 =
drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.c +1 -0
@@ -1089,6 +1089,7 @@ static const struct encoder_feature_support link_enc_feature = { };static struct link_encoder *dcn31_link_encoder_create ( +struct dc_context *ctx,const struct encoder_init_data *enc_init_data) { struct dcn20_link_encoder *enc20 =
drivers/gpu/drm/amd/display/dc/dcn316/dcn316_resource.c +1 -0
@@ -1088,6 +1088,7 @@ static const struct encoder_feature_support link_enc_feature = { };static struct link_encoder *dcn31_link_encoder_create ( +struct dc_context *ctx,const struct encoder_init_data *enc_init_data) { struct dcn20_link_encoder *enc20 =
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c +1 -0
@@ -1117,6 +1117,7 @@ static const struct encoder_feature_support link_enc_feature = { };static struct link_encoder *dcn32_link_encoder_create ( +struct dc_context *ctx,const struct encoder_init_data *enc_init_data) { struct dcn20_link_encoder *enc20 =
drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c +1 -0
@@ -1119,6 +1119,7 @@ static const struct encoder_feature_support link_enc_feature = { };static struct link_encoder *dcn321_link_encoder_create ( +struct dc_context *ctx,const struct encoder_init_data *enc_init_data) { struct dcn20_link_encoder *enc20 =
drivers/gpu/drm/amd/display/dc/inc/core_types.h +1 -0
@@ -96,6 +96,7 @@ struct resource_funcs {struct panel_cntl *(*panel_cntl_create)(const struct panel_cntl_init_data *panel_cntl_init_data);struct link_encoder *(*link_enc_create)( +struct dc_context *ctx,const struct encoder_init_data *init);/* Create a minimal link encoder object with no dc_link object * associated with it. */
Signature · 1 line
2.37.1
PATCH 25/31 drm/amd/display: Add reinstate dram in the FPO logic
In reply to Alex HungFrom: Rodrigo Siqueira <[email protected]>
In order to handle FPO correctly, we need to reinstate the dram values. This function adds the required code to handle the vblank stretch and the dram calculation.
--- .../drm/amd/display/dc/dcn30/dcn30_resource.h | 3 + .../drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 67 ++++++++++++++++--- 2 files changed, 60 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.h +3 -0
@@ -99,6 +99,9 @@ enum dc_status dcn30_add_stream_to_ctx(void dcn30_update_bw_bounding_box (struct dc *dc,struct clk_bw_params *bw_params); +bool dcn30_can_support_mclk_switch_using_fw_based_vblank_stretch (struct dc *dc,struct dc_state *context);void dcn30_setup_mclk_switch_using_fw_based_vblank_stretch (struct dc *dc,struct dc_state *context); +int dcn30_find_dummy_latency_index_for_fw_based_mclk_switch (struct dc *dc,struct dc_state *context, +display_e2e_pipe_params_st *pipes,int pipe_cnt,int vlevel);#endif /* _DCN30_RESOURCE_H_ */
drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c +57 -10
100 lines not on this page · raw message
Signature · 1 line
2.37.1
PATCH 26/31 drm/amd/display: Update DCN32 and DCN321 SR latencies
In reply to Alex HungFrom: Alvin Lee <[email protected]>
Update worst case SR latencies according to values measured by hardware team.
--- drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 4 ++-- drivers/gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c +2 -2
@@ -121,8 +121,8 @@ struct _vcs_dpi_soc_bounding_box_st dcn3_2_soc = { }, }, .num_states = 1, - .sr_exit_time_us = 5.20, - .sr_enter_plus_exit_time_us = 9.60, + .sr_exit_time_us = 20.16, + .sr_enter_plus_exit_time_us = 27.13, .sr_exit_z8_time_us = 285.0, .sr_enter_plus_exit_z8_time_us = 320, .writeback_latency_us = 12.0,
drivers/gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c +2 -2
@@ -119,8 +119,8 @@ struct _vcs_dpi_soc_bounding_box_st dcn3_21_soc = { }, }, .num_states = 1, - .sr_exit_time_us = 5.20, - .sr_enter_plus_exit_time_us = 9.60, + .sr_exit_time_us = 12.36, + .sr_enter_plus_exit_time_us = 16.72, .sr_exit_z8_time_us = 285.0, .sr_enter_plus_exit_z8_time_us = 320, .writeback_latency_us = 12.0,
Signature · 1 line
2.37.1
PATCH 27/31 drm/amd/display: Add missing ODM 2:1 policy logic
In reply to Alex HungFrom: Samson Tam <[email protected]>
Phantom pipes must use the same configuration used in main pipes. This commit add this check.
--- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 1 - drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +0 -1
@@ -1269,7 +1269,6 @@ static void get_pixel_clock_parameters( pixel_clk_params->requested_pix_clk_100hz /=4 ; else if (optc2_is_two_pixels_per_containter(&stream->timing) || opp_cnt == 2) pixel_clk_params->requested_pix_clk_100hz /=2 ; - else if (hws->funcs.is_dp_dig_pixel_rate_div_policy) {if (hws->funcs.is_dp_dig_pixel_rate_div_policy (pipe_ctx)) pixel_clk_params->requested_pix_clk_100hz /=2 ;
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c +6 -1
@@ -1084,8 +1084,13 @@ unsigned int dcn32_calculate_dccg_k1_k2_values(struct pipe_ctx *pipe_ctx, unsignstruct dc_stream_state *stream = pipe_ctx->stream;unsigned int odm_combine_factor =0 ;struct dc *dc = pipe_ctx->stream->ctx->dc; -bool two_pix_per_container =optc2_is_two_pixels_per_containter (&stream->timing); +bool two_pix_per_container = false; +// For phantom pipes, use the same programming as the main pipes +if (pipe_ctx->stream->mall_stream_config.type ==SUBVP_PHANTOM ) { + 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 (is_dp_128b_132b_signal (pipe_ctx)) {
Signature · 1 line
2.37.1
PATCH 28/31 drm/amd/display: Disable MPC split for DCN32/321
In reply to Alex HungFrom: Alvin Lee <[email protected]>
Due to CRB, no need to rely on MPC splitting to maximize use of DET anymore.
--- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 2 +- drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c +1 -1
@@ -843,7 +843,7 @@ static const struct dc_debug_options debug_defaults_drv = { .timing_trace = false, .clock_trace = true, .disable_pplib_clock_request = false, - .pipe_split_policy = MPC_SPLIT_DYNAMIC, + .pipe_split_policy = MPC_SPLIT_AVOID, // Due to CRB, no need to MPC split anymore .force_single_disp_pipe_split = false, .disable_dcc = DCC_ENABLE, .vsr_support = true,
drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c +1 -1
@@ -844,7 +844,7 @@ static const struct dc_debug_options debug_defaults_drv = { .timing_trace = false, .clock_trace = true, .disable_pplib_clock_request = false, - .pipe_split_policy = MPC_SPLIT_DYNAMIC, + .pipe_split_policy = MPC_SPLIT_AVOID, .force_single_disp_pipe_split = false, .disable_dcc = DCC_ENABLE, .vsr_support = true,
Signature · 1 line
2.37.1
PATCH 29/31 drm/amd/display: Add debug option for idle optimizations on cursor updates
In reply to Alex HungFrom: Alvin Lee <[email protected]>
For optimizations and debug purposes we added an option to exit idle operations on cursor updates.
--- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c | 1 + 2 files changed, 2 insertions(+)
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c +1 -0
@@ -868,6 +868,7 @@ static const struct dc_debug_options debug_defaults_drv = { }, .use_max_lb = true, .force_disable_subvp = true, + .exit_idle_opt_for_cursor_updates = true, .enable_single_display_2to1_odm_policy = true, .enable_dp_dig_pixel_rate_div_policy = 1, };
drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c +1 -0
@@ -869,6 +869,7 @@ static const struct dc_debug_options debug_defaults_drv = { }, .use_max_lb = true, .force_disable_subvp = true, + .exit_idle_opt_for_cursor_updates = true, .enable_single_display_2to1_odm_policy = true, .enable_dp_dig_pixel_rate_div_policy = 1, };
Signature · 1 line
2.37.1
PATCH 30/31 drm/amd/display: Copy crc_skip_count when duplicating CRTC state
In reply to Alex HungFrom: Leo Li <[email protected]>
[Why]
crc_skip_count is used to track how many frames to skip to allow the OTG CRC engine to "warm up" before it outputs correct CRC values. Experimentally, this seems to be 2 frames.
When duplicating CRTC states, this value was not copied to the duplicated state. Therefore, when this state is committed, we will needlessly wait 2 frames before outputing CRC values. Even if the CRC engine is already warmed up.
[How]
Copy the crc_skip_count as part of dm_crtc_duplicate_state.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c +1 -0
@@ -243,6 +243,7 @@ static struct drm_crtc_state *dm_crtc_duplicate_state(struct drm_crtc *crtc) state->freesync_config = cur->freesync_config; state->cm_has_degamma = cur->cm_has_degamma; state->cm_is_degamma_srgb = cur->cm_is_degamma_srgb; + state->crc_skip_count = cur->crc_skip_count; state->mpo_requested = cur->mpo_requested;/* TODO Duplicate dc_stream after objects are stream object is flattened */
Signature · 1 line
2.37.1
PATCH 31/31 drm/amd/display: 3.2.196
In reply to Alex HungFrom: Anthony Koo <[email protected]>
This version brings along following fixes:
- Copy crc_skip_count when duplicating CRTC state
- Add debug option for idle optimizations on cursor updates
- Disable MPC split for DCN32/321
- Add missing ODM 2:1 policy logic
- Update DCN32 and DCN321 SR latencies
- Add reinstate dram in the FPO logic
- Add dc_ctx to link_enc_create() parameters
- Cache cursor when cursor exceeds 64x64
- Add support for manual DMUB FAMS trigger
- Fix dpstreamclk programming
- Add missing AUDIO_DTO_SEL reg field
- Add OTG/ODM functions
- Use correct clock source constructor for DCN314
- Use correct DTO_SRC_SEL for 128b/132b encoding
- Add pixel rate div calcs and programming
- Remove FPU flags from DCN30 Makefile
- Create patch bounding box function for isolate FPU
- Move mclk calculation function to DML
- Remove FPU operations from dcn201 resources
- Fallback to SW cursor if SubVP + cursor too big
- Drop unnecessary FPU flags on dcn302 files
- Reboot while unplug hdcp enabled dp from mst hub
- Reset pipe count when iterating for DET override
- Calculate MALL cache lines based on Mblks required
- Fix two MPO videos in single display ODM combine mode
- Guard against zero memory channels
- Updates SubVP + SubVP DRR cases updates
- Fix OPTC function pointers for DCN314
- Add enable/disable FIFO callbacks to stream setup
- Avoid MPC infinite loop
--- 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
@@ -47,7 +47,7 @@ struct aux_payload;struct set_config_cmd_payload ;struct dmub_notification ; -#define DC_VER "3.2.195" +#define DC_VER "3.2.196"#define MAX_SURFACES 3#define MAX_PLANES 6
Signature · 1 line
2.37.1
[Public]
Hi all,
This week this patchset was tested on the following systems:
HP Envy 360, with Ryzen 5 4500U
Lenovo Thinkpad T14s Gen2, with AMD Ryzen 5 5650U
Sapphire Pulse RX5700XT
Reference AMD RX6800
Engineering board with Ryzen 9 5900H
These systems were tested on the following display types:
eDP, (1080p 60hz [4500U, 5650U, 5900H])
VGA and DVI (1680x1050 60HZ [DP to VGA/DVI, USB-C to DVI/VGA]) DP/HDMI/USB-C (1440p 170hz, 4k 60hz, 4k 144hz [Includes USB-C to DP/HDMI adapters])
MST tested with Startech MST14DP123DP and 2x 4k 60Hz displays
DSC tested with Cable Matters 101075 (DP to 3x DP), and 201375 (USB-C to 3x DP) with 3x 4k60 displays
The testing is a mix of automated and manual tests. Manual testing includes (but is not limited to):
Changing display configurations and settings
Benchmark testing
Feature testing (Freesync, etc.)
Automated testing includes (but is not limited to):
Script testing (scripts to automate some of the manual checks) IGT testing
The patchset consists of the amd-staging-drm-next branch with new patches added on top of it. This branch is used for both Ubuntu and Chrome OS testing (ChromeOS on a bi-weekly basis).
Tested on Ubuntu 22.04
Thank you,
Dan Wheeler
Sr. Technologist | AMD
SW Display
------------------------------------------------------------------------------------------------------------------
1 Commerce Valley Dr E, T
-----Original Message-----
From: Hung, Alex <[email protected]>
Sent: July 22, 2022 4:31 PM
To: [email protected]
Cc: Wentland, Harry <[email protected]>; Li, Sun peng (Leo) <[email protected]>; Lakha, Bhawanpreet <[email protected]>; Siqueira, Rodrigo <[email protected]>; Pillai, Aurabindo <[email protected]>; Zhuo, Qingqing (Lillian) <[email protected]>; Li, Roman <[email protected]>; Lin, Wayne <[email protected]>; Wang, Chao-kai (Stylon) <[email protected]>; Chiu, Solomon <[email protected]>; Kotarac, Pavle <[email protected]>; Gutierrez, Agustin <[email protected]>; Wheeler, Daniel <[email protected]>; Broadworth, Mark <[email protected]>; Hung, Alex <[email protected]>
Subject: [PATCH 00/31] DC Patches July 22, 2022
This DC patchset brings improvements in multiple areas. In summary, we highlight:
* Copy crc_skip_count when duplicating CRTC state
* Add debug option for idle optimizations on cursor updates
* Disable MPC split for DCN32/321
* Add missing ODM 2:1 policy logic
* Update DCN32 and DCN321 SR latencies
* Add reinstate dram in the FPO logic
* Add dc_ctx to link_enc_create() parameters
* Cache cursor when cursor exceeds 64x64
* Add support for manual DMUB FAMS trigger
* Fix dpstreamclk programming
* Add missing AUDIO_DTO_SEL reg field
* Add OTG/ODM functions
* Use correct clock source constructor for DCN314
* Use correct DTO_SRC_SEL for 128b/132b encoding
* Add pixel rate div calcs and programming
* Remove FPU flags from DCN30 Makefile
* Create patch bounding box function for isolate FPU
* Move mclk calculation function to DML
* Remove FPU operations from dcn201 resources
* Fallback to SW cursor if SubVP + cursor too big
* Drop unnecessary FPU flags on dcn302 files
* Reboot while unplug hdcp enabled dp from mst hub
* Reset pipe count when iterating for DET override
* Calculate MALL cache lines based on Mblks required
* Fix two MPO videos in single display ODM combine mode
* Guard against zero memory channels
* Updates SubVP + SubVP DRR cases updates
* Fix OPTC function pointers for DCN314
* Add enable/disable FIFO callbacks to stream setup
* Avoid MPC infinite loop
Alvin Lee (6):
drm/amd/display: Updates SubVP and SubVP DRR cases drm/amd/display: Calculate MALL cache lines based on Mblks required drm/amd/display: Fallback to SW cursor if SubVP + cursor too big drm/amd/display: Update DCN32 and DCN321 SR latencies drm/amd/display: Disable MPC split for DCN32/321 drm/amd/display: Add debug option for idle optimizations on cursor
updates
Anthony Koo (2):
drm/amd/display: Add support for manual DMUB FAMS trigger drm/amd/display: 3.2.196
Aric Cyr (1):
drm/amd/display: Avoid MPC infinite loop
Aurabindo Pillai (1):
drm/amd/display: Add dc_ctx to link_enc_create() parameters
Chris Park (1):
drm/amd/display: Cache cursor when cursor exceeds 64x64
Leo Li (1):
drm/amd/display: Copy crc_skip_count when duplicating CRTC state
Michael Strauss (6):
drm/amd/display: Add pixel rate div calcs and programming drm/amd/display: Use correct DTO_SRC_SEL for 128b/132b encoding drm/amd/display: Use correct clock source constructor for DCN314 drm/amd/display: Add OTG/ODM functions drm/amd/display: Add missing AUDIO_DTO_SEL reg field drm/amd/display: Fix dpstreamclk programming
Nicholas Kazlauskas (3):
drm/amd/display: Add enable/disable FIFO callbacks to stream setup drm/amd/display: Fix OPTC function pointers for DCN314 drm/amd/display: Guard against zero memory channels
Rodrigo Siqueira (6):
drm/amd/display: Drop unnecessary FPU flags on dcn302 files drm/amd/display: Remove FPU operations from dcn201 resources drm/amd/display: Move mclk calculation function to DML drm/amd/display: Create patch bounding box function for isolate FPU drm/amd/display: Remove FPU flags from DCN30 Makefile drm/amd/display: Add reinstate dram in the FPO logic
Samson Tam (2):
drm/amd/display: Fix two MPO videos in single display ODM combine mode drm/amd/display: Add missing ODM 2:1 policy logic
Taimur Hassan (1):
drm/amd/display: Reset pipe count when iterating for DET override
hersen wu (1):
drm/amd/display: Reboot while unplug hdcp enabled dp from mst hub
.../amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 1 + .../amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 34 ++-- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 2 +- .../gpu/drm/amd/display/dc/core/dc_link_dp.c | 1 + .../gpu/drm/amd/display/dc/core/dc_resource.c | 136 +++++++++++++--- .../gpu/drm/amd/display/dc/core/dc_stream.c | 5 + drivers/gpu/drm/amd/display/dc/dc.h | 2 +- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 17 ++ drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 1 + .../drm/amd/display/dc/dce/dce_clock_source.c | 20 ++- .../amd/display/dc/dce100/dce100_resource.c | 1 + .../display/dc/dce110/dce110_hw_sequencer.c | 1 + .../amd/display/dc/dce110/dce110_resource.c | 1 + .../amd/display/dc/dce112/dce112_resource.c | 1 + .../amd/display/dc/dce120/dce120_resource.c | 1 + .../drm/amd/display/dc/dce60/dce60_resource.c | 1 + .../drm/amd/display/dc/dce80/dce80_resource.c | 1 + .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 1 + .../gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 5 + .../drm/amd/display/dc/dcn10/dcn10_resource.c | 1 + .../drm/amd/display/dc/dcn20/dcn20_hwseq.c | 1 + .../drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +- .../drm/amd/display/dc/dcn20/dcn20_resource.h | 1 + .../gpu/drm/amd/display/dc/dcn201/Makefile | 24 --- .../amd/display/dc/dcn201/dcn201_resource.c | 11 +- .../drm/amd/display/dc/dcn21/dcn21_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 30 ---- .../drm/amd/display/dc/dcn30/dcn30_resource.c | 58 +------ .../drm/amd/display/dc/dcn30/dcn30_resource.h | 3 + .../amd/display/dc/dcn301/dcn301_resource.c | 1 + .../gpu/drm/amd/display/dc/dcn302/Makefile | 25 --- .../amd/display/dc/dcn302/dcn302_resource.c | 4 +- .../amd/display/dc/dcn303/dcn303_resource.c | 4 +- .../gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 8 +- .../gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h | 8 +- .../gpu/drm/amd/display/dc/dcn31/dcn31_optc.c | 2 +- .../gpu/drm/amd/display/dc/dcn31/dcn31_optc.h | 2 + .../drm/amd/display/dc/dcn31/dcn31_resource.c | 1 + .../drm/amd/display/dc/dcn314/dcn314_dccg.c | 30 +++- .../drm/amd/display/dc/dcn314/dcn314_dccg.h | 3 +- .../dc/dcn314/dcn314_dio_stream_encoder.c | 38 +++-- .../drm/amd/display/dc/dcn314/dcn314_hwseq.c | 36 +++++ .../drm/amd/display/dc/dcn314/dcn314_hwseq.h | 2 + .../drm/amd/display/dc/dcn314/dcn314_init.c | 1 + .../drm/amd/display/dc/dcn314/dcn314_optc.c | 37 ++++- .../amd/display/dc/dcn314/dcn314_resource.c | 8 +- .../amd/display/dc/dcn315/dcn315_resource.c | 1 + .../amd/display/dc/dcn316/dcn316_resource.c | 1 + .../gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c | 3 +- .../gpu/drm/amd/display/dc/dcn32/dcn32_hubp.c | 4 +- .../gpu/drm/amd/display/dc/dcn32/dcn32_hubp.h | 2 +- .../drm/amd/display/dc/dcn32/dcn32_hwseq.c | 23 ++- .../gpu/drm/amd/display/dc/dcn32/dcn32_optc.c | 63 +++++++- .../drm/amd/display/dc/dcn32/dcn32_resource.c | 153 ++++++++++++++++-- .../drm/amd/display/dc/dcn32/dcn32_resource.h | 7 + .../display/dc/dcn32/dcn32_resource_helpers.c | 18 ++- .../amd/display/dc/dcn321/dcn321_resource.c | 4 +- .../drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 87 ++++++++++ .../drm/amd/display/dc/dml/dcn20/dcn20_fpu.h | 4 + .../drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 63 ++++++++ .../drm/amd/display/dc/dml/dcn30/dcn30_fpu.h | 8 + .../drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 71 ++++++-- .../amd/display/dc/dml/dcn321/dcn321_fpu.c | 4 +- .../gpu/drm/amd/display/dc/inc/clock_source.h | 7 +- .../gpu/drm/amd/display/dc/inc/core_types.h | 1 + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 3 +- drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 2 +- .../amd/display/dc/inc/hw/stream_encoder.h | 2 + .../drm/amd/display/dc/link/link_hwss_dio.c | 7 + .../amd/display/dc/link/link_hwss_hpo_dp.c | 4 +- .../gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 9 +- 71 files changed, 867 insertions(+), 258 deletions(-)
--
2.37.1