DC Patches December 21, 2020
Subsystems (3)
cover DC Patches December 21, 2020
This DC patchset brings improvements in multiple areas. In summary, we highlight:
* Ramp down ABM intensity.
* Firmware version 0.0.47.
* Updation of wm table for Renoir.
* Extend smu response timeout,Interfaces for hubp blank and soft reset.
Aric Cyr (1):
drm/amd/display: Multi-display underflow observed
Eryk Brol (1):
drm/amd/display: Remove unnecessary NULL check
Jake Wang (2):
drm/amd/display: updated wm table for Renoir drm/amd/display: always program DPPDTO unless not safe to lower
Josip Pavic (1):
drm/amd/display: add getter routine to retrieve mpcc mux
Martin Tsai (2):
drm/amd/display: Modify the hdcp device count check condition drm/amd/display: To modify the condition in indicating branch device
Michael Strauss (1):
drm/amd/display: Update RN/VGH active display count workaround
Qingqing Zhuo (1):
drm/amd/display: handler not correctly checked at remove_irq_handler
Rizvi (1):
drm/amd/display: gradually ramp ABM intensity
Sung Lee (1):
drm/amd/display: Acquire DSC during split stream for ODM only if
top_pipe
Wesley Chalmers (1):
drm/amd/display: Interfaces for hubp blank and soft reset
Yongqiang Sun (2):
drm/amd/display: change SMU repsonse timeout to 2s. drm/amd/display: [FW Promotion] Release 0.0.47
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 5 ++- .../amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 36 ++++++++----------- .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 2 +- .../display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 9 +---- drivers/gpu/drm/amd/display/dc/core/dc.c | 20 ----------- .../gpu/drm/amd/display/dc/core/dc_link_dp.c | 8 +---- .../gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 18 ++++++++++ .../gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 4 +++ .../gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 12 +++++++ .../gpu/drm/amd/display/dc/dcn10/dcn10_mpc.h | 1 + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 2 ++ .../drm/amd/display/dc/dcn20/dcn20_hwseq.c | 12 +++++-- .../gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 1 + .../drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +- .../gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c | 2 ++ .../gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 1 + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 2 ++ drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 4 +++ .../gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 4 +-- .../display/modules/hdcp/hdcp1_execution.c | 8 +++-- .../display/modules/hdcp/hdcp2_execution.c | 7 ++-- .../amd/display/modules/power/power_helpers.c | 35 ++++++++++++------ .../amd/display/modules/power/power_helpers.h | 1 + 24 files changed, 118 insertions(+), 80 deletions(-)
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 1/14 drm/amd/display: handler not correctly checked at remove_irq_handler
From: Qingqing Zhuo <[email protected]>
[why]
handler is supposedly passed in as a function pointer; however, the entire struct amdgpu_dm_irq_handler_data gets from the list is used to check match.
[how]
use the interrupt_handler within amdgpu_dm_irq_handler_data for checking match.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +4 -1
@@ -165,7 +165,10 @@ static struct list_head *remove_irq_handler(struct amdgpu_device *adev, handler = list_entry(entry, struct amdgpu_dm_irq_handler_data, list); -if (ih == handler) { +if (handler ==NULL ) +continue ; + +if (ih == handler->handler) {/* Found our handler. Remove it from the list. */ list_del (&handler->list); handler_removed = true;
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/14 drm/amd/display: Interfaces for hubp blank and soft reset
In reply to Bindu RamamurthyFrom: Wesley Chalmers <[email protected]>
[WHY]
HUBP blanking sequence on DCN30 requires us to check if HUBP is in blank and also toggle HUBP_DISABLE, which should instead be called HUBP_SOFT_RESET for what it does in HW.
--- .../gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 18 ++++++++++++++++++ .../gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 4 ++++ .../gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 2 ++ .../gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c | 2 ++ drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 2 ++ 5 files changed, 28 insertions(+)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c +18 -0
@@ -1241,6 +1241,22 @@ void hubp1_vtg_sel(struct hubp *hubp, uint32_t otg_inst)REG_UPDATE (DCHUBP_CNTL ,HUBP_VTG_SEL , otg_inst); } +bool hubp1_in_blank (struct hubp *hubp) +{ +uint32_t in_blank; +struct dcn10_hubp *hubp1 =TO_DCN10_HUBP (hubp); + +REG_GET (DCHUBP_CNTL ,HUBP_IN_BLANK , &in_blank); +return in_blank ? true : false; +} + +void hubp1_soft_reset (struct hubp *hubp,bool reset) +{ +struct dcn10_hubp *hubp1 =TO_DCN10_HUBP (hubp); + +REG_UPDATE (DCHUBP_CNTL ,HUBP_DISABLE , reset ?1 :0 ); +} +void hubp1_init (struct hubp *hubp) {//do nothing
@@ -1272,6 +1288,8 @@ static const struct hubp_funcs dcn10_hubp_funcs = { .dmdata_set_attributes = NULL, .dmdata_load = NULL, + .hubp_soft_reset = hubp1_soft_reset, + .hubp_in_blank = hubp1_in_blank, };/*****************************************/
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h +4 -0
@@ -260,6 +260,7 @@HUBP_SF (HUBP0_DCHUBP_CNTL ,HUBP_NO_OUTSTANDING_REQ , mask_sh),\HUBP_SF (HUBP0_DCHUBP_CNTL ,HUBP_VTG_SEL , mask_sh),\HUBP_SF (HUBP0_DCHUBP_CNTL ,HUBP_DISABLE , mask_sh),\ +HUBP_SF (HUBP0_DCHUBP_CNTL ,HUBP_IN_BLANK , mask_sh),\HUBP_SF (HUBP0_DCSURF_ADDR_CONFIG ,NUM_PIPES , mask_sh),\HUBP_SF (HUBP0_DCSURF_ADDR_CONFIG ,NUM_BANKS , mask_sh),\ HUBP_SF(HUBP0_DCSURF_ADDR_CONFIG, PIPE_INTERLEAVE, mask_sh),\
@@ -455,6 +456,7 @@type HUBP_VTG_SEL ;\type HUBP_UNDERFLOW_STATUS ;\type HUBP_UNDERFLOW_CLEAR ;\ +type HUBP_IN_BLANK ;\type NUM_PIPES ;\type NUM_BANKS ;\type PIPE_INTERLEAVE ;\
@@ -772,5 +774,7 @@ void hubp1_vready_workaround(struct hubp *hubp,void hubp1_init (struct hubp *hubp);void hubp1_read_state_common (struct hubp *hubp); +bool hubp1_in_blank (struct hubp *hubp); +void hubp1_soft_reset (struct hubp *hubp,bool reset);#endif
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c +2 -0
@@ -1595,6 +1595,8 @@ static struct hubp_funcs dcn20_hubp_funcs = { .hubp_set_flip_control_surface_gsl = hubp2_set_flip_control_surface_gsl, .hubp_init = hubp1_init, .validate_dml_output = hubp2_validate_dml_output, + .hubp_in_blank = hubp1_in_blank, + .hubp_soft_reset = hubp1_soft_reset, };
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c +2 -0
@@ -509,6 +509,8 @@ static struct hubp_funcs dcn30_hubp_funcs = { .hubp_clear_underflow = hubp2_clear_underflow, .hubp_set_flip_control_surface_gsl = hubp2_set_flip_control_surface_gsl, .hubp_init = hubp3_init, + .hubp_in_blank = hubp1_in_blank, + .hubp_soft_reset = hubp1_soft_reset, }; bool hubp3_construct(
drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h +2 -0
@@ -188,6 +188,8 @@ struct hubp_funcs {void (*set_unbounded_requesting)(struct hubp *hubp,bool enable); +bool (*hubp_in_blank)(struct hubp *hubp); +void (*hubp_soft_reset)(struct hubp *hubp,bool reset); };
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/14 drm/amd/display: Modify the hdcp device count check condition
In reply to Bindu RamamurthyFrom: Martin Tsai <[email protected]>
[why]
Some MST display may not report the internal panel to DEVICE_COUNT, that makes the check condition always failed.
[how]
To update this condition with the reported device count + 1 (because the immediate repeater's internal panel is possibly not included in DEVICE_COUNT)
--- .../gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c | 8 ++++++-- .../gpu/drm/amd/display/modules/hdcp/hdcp2_execution.c | 7 +++++-- 2 files changed, 11 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c +6 -2
@@ -128,8 +128,12 @@ static inline uint8_t get_device_count(struct mod_hdcp *hdcp)static inline enum mod_hdcp_status check_device_count (struct mod_hdcp *hdcp) { -/* device count must be greater than or equal to tracked hdcp displays */ -return (get_device_count (hdcp) <get_active_display_count (hdcp)) ? +/* Some MST display may choose to report the internal panel as an HDCP RX. +* To update this condition with 1(because the immediate repeater's internal +* panel is possibly not included in DEVICE_COUNT) + get_device_count(hdcp). +* Device count must be greater than or equal to tracked hdcp displays. +*/ +return ((1 +get_device_count (hdcp)) <get_active_display_count (hdcp)) ?MOD_HDCP_STATUS_HDCP1_DEVICE_COUNT_MISMATCH_FAILURE :MOD_HDCP_STATUS_SUCCESS ; }
drivers/gpu/drm/amd/display/modules/hdcp/hdcp2_execution.c +5 -2
@@ -207,8 +207,11 @@ static inline uint8_t get_device_count(struct mod_hdcp *hdcp)static enum mod_hdcp_status check_device_count (struct mod_hdcp *hdcp) { -/* device count must be greater than or equal to tracked hdcp displays */ -return (get_device_count (hdcp) <get_active_display_count (hdcp)) ? +/* Some MST display may choose to report the internal panel as an HDCP RX. */ +/* To update this condition with 1(because the immediate repeater's internal */ +/* panel is possibly not included in DEVICE_COUNT) + get_device_count(hdcp). */ +/* Device count must be greater than or equal to tracked hdcp displays. */ +return ((1 +get_device_count (hdcp)) <get_active_display_count (hdcp)) ?MOD_HDCP_STATUS_HDCP2_DEVICE_COUNT_MISMATCH_FAILURE :MOD_HDCP_STATUS_SUCCESS ; }
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/14 drm/amd/display: To modify the condition in indicating branch device
In reply to Bindu RamamurthyFrom: Martin Tsai <[email protected]>
[why]
The sink count change HPD_IRQ will be ignored if the branch device has only DP DFP.
[how]
To remove the port type restriction.
--- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +1 -7
@@ -3173,13 +3173,7 @@ static void get_active_converter_info( }/* DPCD 0x5 bit 0 = 1, it indicate it's branch device */ -if (ds_port.fields.PORT_TYPE ==DOWNSTREAM_DP ) { - link->dpcd_caps.is_branch_dev = false; - } - -else { - link->dpcd_caps.is_branch_dev = ds_port.fields.PORT_PRESENT; - } + link->dpcd_caps.is_branch_dev = ds_port.fields.PORT_PRESENT;switch (ds_port.fields.PORT_TYPE) {case DOWNSTREAM_VGA :
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/14 drm/amd/display: gradually ramp ABM intensity
In reply to Bindu RamamurthyFrom: Rizvi <[email protected]>
[Why]
Need driver to pass values of backlight ramp start and ramp reduction so that intensity can be ramped down appropriately.
[How]
Using abm_parameters structure to get these values from driver.
--- .../amd/display/modules/power/power_helpers.c | 35 +++++++++++++------ .../amd/display/modules/power/power_helpers.h | 1 + 2 files changed, 26 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/display/modules/power/power_helpers.c +25 -10
@@ -82,22 +82,24 @@ struct abm_parameters {unsigned char deviation_gain;unsigned char min_knee;unsigned char max_knee; +unsigned short blRampReduction; +unsigned short blRampStart; };static const struct abm_parameters abm_settings_config0[abm_defines_max_level] = { -// min_red max_red bright_pos dark_pos brightness_gain contrast deviation min_knee max_knee - {0xff ,0xbf ,0x20 ,0x00 ,0xff ,0x99 ,0xb3 ,0x40 ,0xe0 }, - {0xde ,0x85 ,0x20 ,0x00 ,0xff ,0x90 ,0xa8 ,0x40 ,0xdf }, - {0xb0 ,0x50 ,0x20 ,0x00 ,0xc0 ,0x88 ,0x78 ,0x70 ,0xa0 }, - {0x82 ,0x40 ,0x20 ,0x00 ,0x00 ,0xff ,0xb3 ,0x70 ,0x70 }, +// min_red max_red bright_pos dark_pos bright_gain contrast dev min_knee max_knee blStart blRed + {0xff ,0xbf ,0x20 ,0x00 ,0xff ,0x99 ,0xb3 ,0x40 ,0xe0 ,0xCCCC ,0xCCCC }, + {0xde ,0x85 ,0x20 ,0x00 ,0xff ,0x90 ,0xa8 ,0x40 ,0xdf ,0xCCCC ,0xCCCC }, + {0xb0 ,0x50 ,0x20 ,0x00 ,0xc0 ,0x88 ,0x78 ,0x70 ,0xa0 ,0xCCCC ,0xCCCC }, + {0x82 ,0x40 ,0x20 ,0x00 ,0x00 ,0xff ,0xb3 ,0x70 ,0x70 ,0xCCCC ,0xCCCC }, };static const struct abm_parameters abm_settings_config1[abm_defines_max_level] = { -// min_red max_red bright_pos dark_pos brightness_gain contrast deviation min_knee max_knee - {0xf0 ,0xd9 ,0x20 ,0x00 ,0x00 ,0xff ,0xb3 ,0x70 ,0x70 }, - {0xcd ,0xa5 ,0x20 ,0x00 ,0x00 ,0xff ,0xb3 ,0x70 ,0x70 }, - {0x99 ,0x65 ,0x20 ,0x00 ,0x00 ,0xff ,0xb3 ,0x70 ,0x70 }, - {0x82 ,0x4d ,0x20 ,0x00 ,0x00 ,0xff ,0xb3 ,0x70 ,0x70 }, +// min_red max_red bright_pos dark_pos bright_gain contrast dev min_knee max_knee blStart blRed + {0xf0 ,0xd9 ,0x20 ,0x00 ,0x00 ,0xff ,0xb3 ,0x70 ,0x70 ,0xCCCC ,0xCCCC }, + {0xcd ,0xa5 ,0x20 ,0x00 ,0x00 ,0xff ,0xb3 ,0x70 ,0x70 ,0xCCCC ,0xCCCC }, + {0x99 ,0x65 ,0x20 ,0x00 ,0x00 ,0xff ,0xb3 ,0x70 ,0x70 ,0xCCCC ,0xCCCC }, + {0x82 ,0x4d ,0x20 ,0x00 ,0x00 ,0xff ,0xb3 ,0x70 ,0x70 ,0xCCCC ,0xCCCC }, };static const struct abm_parameters *const abm_settings[] = {
@@ -662,6 +664,7 @@ bool dmub_init_abm_config(struct resource_pool *res_pool, {struct iram_table_v_2_2 ram_table;struct abm_config_table config; +unsigned int set = params.set;bool result = false;uint32_t i, j =0 ;
@@ -710,6 +713,18 @@ bool dmub_init_abm_config(struct resource_pool *res_pool, config.max_knee[i] = ram_table.max_knee[i]; } +if (params.backlight_ramping_override) { +for (i =0 ; i <NUM_AGGR_LEVEL ; i++) { + config.blRampReduction[i] = params.backlight_ramping_reduction; + config.blRampStart[i] = params.backlight_ramping_start; + } + }else { +for (i =0 ; i <NUM_AGGR_LEVEL ; i++) { + config.blRampReduction[i] = abm_settings[set][i].blRampReduction; + config.blRampStart[i] = abm_settings[set][i].blRampStart; + } + } + config.min_abm_backlight = ram_table.min_abm_backlight;#if defined(CONFIG_DRM_AMD_DC_DCN )
drivers/gpu/drm/amd/display/modules/power/power_helpers.h +1 -0
@@ -39,6 +39,7 @@ enum abm_defines {struct dmcu_iram_parameters {unsigned int *backlight_lut_array;unsigned int backlight_lut_array_size; +bool backlight_ramping_override;unsigned int backlight_ramping_reduction;unsigned int backlight_ramping_start;unsigned int min_abm_backlight;
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/14 drm/amd/display: change SMU repsonse timeout to 2s.
In reply to Bindu RamamurthyFrom: Yongqiang Sun <[email protected]>
[Why]
there is some garbage showing up during reboot test.
Reason:
SMU might handle display driver msg defered and driver will send next msg to SMU after 10ms timeout, once SMU FW handle previous msg, parameters are changed to next one, which result in a wrong value be programmed.
[How]
Extend timeout to 2s so SMU will have enough time to handle driver msg.
--- .../gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c +1 -1
@@ -99,7 +99,7 @@ int rn_vbios_smu_send_msg_with_param(struct clk_mgr_internal *clk_mgr, unsigned/* Trigger the message transaction by writing the message ID */ REG_WRITE (MP1_SMN_C2PMSG_67 , msg_id); - result =rn_smu_wait_for_response (clk_mgr,10 ,1000 ); + result =rn_smu_wait_for_response (clk_mgr,10 ,200000 );ASSERT (result == VBIOSSMC_Result_OK || result == VBIOSSMC_Result_UnknownCmd);
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 7/14 drm/amd/display: Update RN/VGH active display count workaround
In reply to Bindu RamamurthyFrom: Michael Strauss <[email protected]>
[WHY]
Virtual signals were previously counted as a workaround to S0i2 hang which is fixed on Renoir. This blocks S0i3 diags testing.
[HOW]
Stop counting virtual signals as S0i2 hang is fixed on Renoir.
--- .../gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 9 +-------- .../gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c +1 -8
@@ -75,15 +75,8 @@ int rn_get_active_display_cnt_wa(for (i =0 ; i < dc->link_count; i++) {const struct dc_link *link = dc->links[i]; -/* -* Only notify active stream or virtual stream. -* Need to notify virtual stream to work around -* headless case. HPD does not fire when system is in -* S0i2. -*/ /* abusing the fact that the dig and phy are coupled to see if the phy is enabled */ -if (link->connector_signal ==SIGNAL_TYPE_VIRTUAL || - link->link_enc->funcs->is_dig_enabled (link->link_enc)) +if (link->link_enc->funcs->is_dig_enabled (link->link_enc)) display_count++; }
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c +1 -8
@@ -74,15 +74,8 @@ int vg_get_active_display_cnt_wa(for (i =0 ; i < dc->link_count; i++) {const struct dc_link *link = dc->links[i]; -/* -* Only notify active stream or virtual stream. -* Need to notify virtual stream to work around -* headless case. HPD does not fire when system is in -* S0i2. -*/ /* abusing the fact that the dig and phy are coupled to see if the phy is enabled */ -if (link->connector_signal ==SIGNAL_TYPE_VIRTUAL || - link->link_enc->funcs->is_dig_enabled (link->link_enc)) +if (link->link_enc->funcs->is_dig_enabled (link->link_enc)) display_count++; }
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 8/14 drm/amd/display: Remove unnecessary NULL check
In reply to Bindu RamamurthyFrom: Eryk Brol <[email protected]>
[Why]new_crtc_state is already dereferenced earlier in the function
[How]
Remove the check
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1 -1
@@ -9455,7 +9455,7 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,if (ret) goto fail; -if (dm_old_crtc_state->dsc_force_changed && new_crtc_state) +if (dm_old_crtc_state->dsc_force_changed) new_crtc_state->mode_changed = true; }
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 9/14 drm/amd/display: Multi-display underflow observed
In reply to Bindu RamamurthyFrom: Aric Cyr <[email protected]>
[Why]
FP2 programming not happening when topology changes occur with multiple displays.
[How]
Ensure FP2 is programmed whenever global sync changes occur but wait for VACTIVE first to avoid underflow.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 20 ------------------- .../drm/amd/display/dc/dcn20/dcn20_hwseq.c | 12 ++++++++--- 2 files changed, 9 insertions(+), 23 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +0 -20
@@ -2625,26 +2625,6 @@ static void commit_planes_for_stream(struct dc *dc, } } -if (update_type !=UPDATE_TYPE_FAST ) { -// If changing VTG FP2: wait until back in vactive to program FP2 -// Need to ensure that pipe unlock happens soon after to minimize race condition -for (i =0 ; i < dc->res_pool->pipe_count; i++) { -struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i]; - -if (pipe_ctx->top_pipe || pipe_ctx->stream != stream) -continue ; - -if (!pipe_ctx->update_flags.bits.global_sync) -continue ; - - pipe_ctx->stream_res.tg->funcs->wait_for_state (pipe_ctx->stream_res.tg,CRTC_STATE_VBLANK ); - pipe_ctx->stream_res.tg->funcs->wait_for_state (pipe_ctx->stream_res.tg,CRTC_STATE_VACTIVE ); - - pipe_ctx->stream_res.tg->funcs->set_vtg_params ( - pipe_ctx->stream_res.tg, &pipe_ctx->stream->timing, true); - } - } -if ((update_type !=UPDATE_TYPE_FAST ) && dc->hwss.interdependent_update_lock) dc->hwss.interdependent_update_lock (dc, context, false);else
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +9 -3
@@ -1586,7 +1586,10 @@ static void dcn20_program_pipe( && !pipe_ctx->top_pipe && !pipe_ctx->prev_odm_pipe) hws->funcs.blank_pixel_data(dc, pipe_ctx, !pipe_ctx->plane_state->visible); -if (pipe_ctx->update_flags.bits.global_sync) { +/* Only update TG on top pipe */ +if (pipe_ctx->update_flags.bits.global_sync && !pipe_ctx->top_pipe + && !pipe_ctx->prev_odm_pipe) { + pipe_ctx->stream_res.tg->funcs->program_global_sync( pipe_ctx->stream_res.tg, pipe_ctx->pipe_dlg_param.vready_offset,
@@ -1594,8 +1597,11 @@ static void dcn20_program_pipe( pipe_ctx->pipe_dlg_param.vupdate_offset, pipe_ctx->pipe_dlg_param.vupdate_width); + pipe_ctx->stream_res.tg->funcs->wait_for_state (pipe_ctx->stream_res.tg,CRTC_STATE_VBLANK ); + pipe_ctx->stream_res.tg->funcs->wait_for_state (pipe_ctx->stream_res.tg,CRTC_STATE_VACTIVE ); + pipe_ctx->stream_res.tg->funcs->set_vtg_params ( - pipe_ctx->stream_res.tg, &pipe_ctx->stream->timing, false); + pipe_ctx->stream_res.tg, &pipe_ctx->stream->timing, true);if (hws->funcs.setup_vupdate_interrupt) hws->funcs.setup_vupdate_interrupt (dc, pipe_ctx);
@@ -2570,4 +2576,4 @@ void dcn20_set_disp_pattern_generator(const struct dc *dc, { pipe_ctx->stream_res.opp->funcs->opp_set_disp_pattern_generator (pipe_ctx->stream_res.opp, test_pattern, color_space, color_depth, solid_color, width, height, offset); -} +}
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 10/14 drm/amd/display: Acquire DSC during split stream for ODM only if top_pipe
In reply to Bindu RamamurthyFrom: Sung Lee <[email protected]>
[WHY]
DSC should only be acquired per OPP. Therefore, DSC should only be acquired for the top_pipe when ODM is enabled.
Not doing this check may lead to acquiring more DSC's than needed when doing MPO + ODM Combine.
[HOW]
Only acquire DSC if pipe is top_pipe.
--- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +1 -1
@@ -1933,7 +1933,7 @@ bool dcn20_split_stream_for_odm( next_odm_pipe->stream_res.opp = pool->opps[next_odm_pipe->pipe_idx]; else next_odm_pipe->stream_res.opp = next_odm_pipe->top_pipe->stream_res.opp; -if (next_odm_pipe->stream->timing.flags.DSC ==1 ) { +if (next_odm_pipe->stream->timing.flags.DSC ==1 && !next_odm_pipe->top_pipe) {dcn20_acquire_dsc (dc, res_ctx, &next_odm_pipe->stream_res.dsc, next_odm_pipe->pipe_idx);ASSERT (next_odm_pipe->stream_res.dsc);if (next_odm_pipe->stream_res.dsc ==NULL )
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 11/14 drm/amd/display: updated wm table for Renoir
In reply to Bindu RamamurthyFrom: Jake Wang <[email protected]>
[Why]
For certain timings, Renoir may underflow due to sr exit latency being too slow.
[How]
Updated wm table for renoir.
--- .../amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c +8 -8
@@ -731,32 +731,32 @@ static struct wm_table ddr4_wm_table_rn = { .wm_inst = WM_A, .wm_type = WM_TYPE_PSTATE_CHG, .pstate_latency_us = 11.72, - .sr_exit_time_us = 9.09, - .sr_enter_plus_exit_time_us = 10.14, + .sr_exit_time_us = 11.90, + .sr_enter_plus_exit_time_us = 12.80, .valid = true, }, { .wm_inst = WM_B, .wm_type = WM_TYPE_PSTATE_CHG, .pstate_latency_us = 11.72, - .sr_exit_time_us = 11.12, - .sr_enter_plus_exit_time_us = 12.48, + .sr_exit_time_us = 13.18, + .sr_enter_plus_exit_time_us = 14.30, .valid = true, }, { .wm_inst = WM_C, .wm_type = WM_TYPE_PSTATE_CHG, .pstate_latency_us = 11.72, - .sr_exit_time_us = 11.12, - .sr_enter_plus_exit_time_us = 12.48, + .sr_exit_time_us = 13.18, + .sr_enter_plus_exit_time_us = 14.30, .valid = true, }, { .wm_inst = WM_D, .wm_type = WM_TYPE_PSTATE_CHG, .pstate_latency_us = 11.72, - .sr_exit_time_us = 11.12, - .sr_enter_plus_exit_time_us = 12.48, + .sr_exit_time_us = 13.18, + .sr_enter_plus_exit_time_us = 14.30, .valid = true, }, }
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 12/14 drm/amd/display: [FW Promotion] Release 0.0.47
In reply to Bindu RamamurthyFrom: Yongqiang Sun <[email protected]>
- restore lvtma_pwrseq_delay2 from vbios integrated info table
- restore MVID/NVID after power up.
- Enable timer wake up mask when enable timer interrupt.
--- drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h +2 -2
@@ -47,10 +47,10 @@/* Firmware versioning. */ #ifdef DMUB_EXPOSE_VERSION -#define DMUB_FW_VERSION_GIT_HASH 0xa18e25995 +#define DMUB_FW_VERSION_GIT_HASH 0xf51b86a#define DMUB_FW_VERSION_MAJOR 0#define DMUB_FW_VERSION_MINOR 0 -#define DMUB_FW_VERSION_REVISION 46 +#define DMUB_FW_VERSION_REVISION 47#define DMUB_FW_VERSION_TEST 0#define DMUB_FW_VERSION_VBIOS 0#define DMUB_FW_VERSION_HOTFIX 0
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 13/14 drm/amd/display: always program DPPDTO unless not safe to lower
In reply to Bindu RamamurthyFrom: Jake Wang <[email protected]>
[Why]
We defer clock updates to after pipes have been programmed. In some instances we use DPPCLK that have been previously set to be "unused". This results in a brief window of time where underflow could occur.
[How]
During prepare bandwidth allow rn_update_clocks_update_dpp_dto to check each instance and compare previous clock to new clock. If new clock is higher than previous clock, program DPPDTO.
--- .../gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c +5 -6
@@ -227,12 +227,11 @@ void rn_update_clocks(struct clk_mgr *clk_mgr_base,rn_vbios_smu_set_dppclk (clk_mgr, clk_mgr_base->clks.dppclk_khz);// always update dtos unless clock is lowered and not safe to lower -if (new_clocks->dppclk_khz >= dc->current_state->bw_ctx.bw.dcn.clk.dppclk_khz) -rn_update_clocks_update_dpp_dto ( - clk_mgr, - context, - clk_mgr_base->clks.actual_dppclk_khz, - safe_to_lower); +rn_update_clocks_update_dpp_dto ( + clk_mgr, + context, + clk_mgr_base->clks.actual_dppclk_khz, + safe_to_lower); } if (update_dispclk &&
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 14/14 drm/amd/display: add getter routine to retrieve mpcc mux
In reply to Bindu RamamurthyFrom: Josip Pavic <[email protected]>
[Why & How]
Add function to identify which MPCC is providing input to a specified OPP
--- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 12 ++++++++++++ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.h | 1 + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 1 + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 1 + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 4 ++++ 5 files changed, 19 insertions(+)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c +12 -0
@@ -467,6 +467,17 @@ void mpc1_cursor_lock(struct mpc *mpc, int opp_id, bool lock)REG_SET (CUR [opp_id],0 ,CUR_VUPDATE_LOCK_SET , lock ?1 :0 ); } +unsigned int mpc1_get_mpc_out_mux (struct mpc *mpc,int opp_id) +{ +struct dcn10_mpc *mpc10 =TO_DCN10_MPC (mpc); +uint32_t val; + +if (opp_id <MAX_OPP &® (MUX [opp_id])) +REG_GET (MUX [opp_id],MPC_OUT_MUX , &val); + +return val; +} +static const struct mpc_funcs dcn10_mpc_funcs = { .read_mpcc_state = mpc1_read_mpcc_state, .insert_plane = mpc1_insert_plane,
@@ -483,6 +494,7 @@ static const struct mpc_funcs dcn10_mpc_funcs = { .set_denorm_clamp = NULL, .set_output_csc = NULL, .set_output_gamma = NULL, + .get_mpc_out_mux = mpc1_get_mpc_out_mux, }; void dcn10_mpc_construct(struct dcn10_mpc *mpc10,
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.h +1 -0
@@ -200,4 +200,5 @@ void mpc1_read_mpcc_state(void mpc1_cursor_lock (struct mpc *mpc,int opp_id,bool lock); +unsigned int mpc1_get_mpc_out_mux (struct mpc *mpc,int opp_id);#endif
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c +1 -0
@@ -556,6 +556,7 @@ const struct mpc_funcs dcn20_mpc_funcs = { .set_ocsc_default = mpc2_set_ocsc_default, .set_output_gamma = mpc2_set_output_gamma, .power_on_mpc_mem_pwr = mpc20_power_on_ogam_lut, + .get_mpc_out_mux = mpc1_get_mpc_out_mux, }; void dcn20_mpc_construct(struct dcn20_mpc *mpc20,
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c +1 -0
@@ -1428,6 +1428,7 @@ const struct mpc_funcs dcn30_mpc_funcs = { .program_3dlut = mpc3_program_3dlut, .release_rmu = mpcc3_release_rmu, .power_on_mpc_mem_pwr = mpc20_power_on_ogam_lut, + .get_mpc_out_mux = mpc1_get_mpc_out_mux, };
drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h +4 -0
@@ -359,6 +359,10 @@ struct mpc_funcs {int (*release_rmu)(struct mpc *mpc,int mpcc_id); +unsigned int (*get_mpc_out_mux)( +struct mpc *mpc, + int opp_id); + };#endif
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx