DC Patches January 14, 2022
cover DC Patches January 14, 2022
This DC patchset brings improvements in multiple areas. In summary, we highlight:
* Fix problem observed while assigning link encoder
* Constrain seamless boot on eDP only
* Improve Z9 interface
* Organize FPU associated code to DML
* Modify SMU_TIMEOUT macro
* Organize dcn201 code
* Address DS stays disabled problem under specific scenario
* Fix black screen issue
* Update DML to rev.99
* Address problem of eDP hot-plug feature
---
Anthony Koo (1):
drm/amd/display: [FW Promotion] Release 0.0.100.0
Aric Cyr (2):
drm/amd/display: 3.2.168
drm/amd/display: 3.2.169
Charlene Liu (1):
drm/amd/display: update dml to rev.99 and smu clk_table w/a
Chris Park (1):
drm/amd/display: DCEFCLK DS on CLK init
Dale Zhao (1):
drm/amd/display: Add signal type check when verify stream backends
same
Dhillon, Jasdeep (1):
drm/amd/display: move FPU associated DCN302 code to DML folder
Eric Yang (2):
drm/amd/display: adjust bit comparison to be more type safe drm/amd/display: support new PMFW interface to disable Z9 only
Felipe Clark (1):
drm/amd/display: Fix black screen issue on memory clock switch en
Ian Chen (1):
drm/amd/display: modify SMU_TIMEOUT macro.
Jarif Aftab (1):
drm/amd/display: Disabled seamless boots on DP and renamed
power_down_display_on_boot
Stylon Wang (1):
drm/amd/display: Reset link encoder assignments in atomic check
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 16 +- .../display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 1 + .../display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 6 +- .../amd/display/dc/clk_mgr/dcn31/dcn31_smu.c | 15 +- .../amd/display/dc/clk_mgr/dcn31/dcn31_smu.h | 2 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 12 - .../gpu/drm/amd/display/dc/core/dc_resource.c | 3 + drivers/gpu/drm/amd/display/dc/dc.h | 5 +- .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 5 +- .../drm/amd/display/dc/dcn20/dcn20_resource.c | 8 +- .../drm/amd/display/dc/dcn30/dcn30_hwseq.c | 12 +- .../drm/amd/display/dc/dcn30/dcn30_hwseq.h | 3 + .../gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 2 +- .../gpu/drm/amd/display/dc/dcn302/Makefile | 12 - .../amd/display/dc/dcn302/dcn302_resource.c | 316 +--------------- .../amd/display/dc/dcn302/dcn302_resource.h | 3 + .../drm/amd/display/dc/dcn31/dcn31_hwseq.c | 5 +- drivers/gpu/drm/amd/display/dc/dm_helpers.h | 4 +- drivers/gpu/drm/amd/display/dc/dml/Makefile | 2 + .../amd/display/dc/dml/dcn302/dcn302_fpu.c | 357 ++++++++++++++++++ .../amd/display/dc/dml/dcn302/dcn302_fpu.h | 32 ++ .../dc/dml/dcn31/display_mode_vba_31.c | 29 +- .../drm/amd/display/dc/dml/display_mode_vba.h | 2 + .../gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 4 +- .../gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 2 +- 25 files changed, 495 insertions(+), 363 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn302/dcn302_fpu.c create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn302/dcn302_fpu.h
Signature · 1 line
2.25.1
PATCH 1/13 drm/amd/display: Reset link encoder assignments in atomic check
From: Stylon Wang <[email protected]>
[Why]
The link encoder assignments must be "invalid" before commencing on the reassignment operation in DC. A failing atomic check from interruption of a signal could often leave the assignment change in place and trigger the assertion.
[How]
As a work-around the link encoder assignments are always reset before going into DC validation in DM atomic check.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +12 -0
@@ -11227,6 +11227,18 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,DRM_DEBUG_DRIVER ("drm_dp_mst_atomic_check() failed\n" ); goto fail; } + +/* +* A previously failing atomic check, for example due to a +* interruption from signal, could have changed the +* link encoder assignments in the DC state. +* +* DC expects that link encoder assignments are *not* valid +* when committing a state, so as a workaround it needs to be +* cleared here. +*/ +link_enc_cfg_init (dc, dm_state->context); + status =dc_validate_global_state (dc, dm_state->context, true);if (status !=DC_OK ) { DRM_DEBUG_DRIVER("DC global validation failure: %s (%d)",
Signature · 1 line
2.25.1
PATCH 2/13 drm/amd/display: Disabled seamless boots on DP and renamed power_down_display_on_boot
In reply to Wayne LinFrom: Jarif Aftab <[email protected]>
[WHY]
- We only ever want seamless boots on eDPs
- The naming and logic did not match the context
[HOW]
- Removed unnecessary if statements
- Renamed power_down_display_on_boot to seamless_boot_edp_requested and swapped the logic
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++-- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 12 ------------ drivers/gpu/drm/amd/display/dc/dc.h | 2 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 5 ++--- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 7 +++---- drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 5 ++--- 6 files changed, 10 insertions(+), 25 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2 -2
@@ -1496,10 +1496,10 @@ static int amdgpu_dm_init(struct amdgpu_device *adev) init_data.flags.allow_lttpr_non_transparent_mode.bits.DP2_0 = true;#endif - init_data.flags.power_down_display_on_boot = true; + init_data.flags.seamless_boot_edp_requested = false;if (check_seamless_boot_capability (adev)) { - init_data.flags.power_down_display_on_boot = false; + init_data.flags.seamless_boot_edp_requested = true; init_data.flags.allow_seamless_boot_optimization = true;DRM_INFO ("Seamless boot condition check passed\n" ); }
drivers/gpu/drm/amd/display/dc/core/dc_link.c +0 -12
@@ -1019,18 +1019,6 @@ static bool dc_link_detect_helper(struct dc_link *link, link->type != dc_connection_mst_branch)dm_helpers_dp_mst_stop_top_mgr (link->ctx, link); - -// For seamless boot, to skip verify link cap, we read UEFI settings and set them as verified. -if (reason ==DETECT_REASON_BOOT && - !dc_ctx->dc->config.power_down_display_on_boot && - link->link_status.link_active) - perform_dp_seamless_boot = true; - -if (perform_dp_seamless_boot) { -read_current_link_settings_on_detect (link); - link->verified_link_cap = link->reported_link_cap; - } -break ; }
drivers/gpu/drm/amd/display/dc/dc.h +1 -1
@@ -322,7 +322,7 @@ struct dc_config {bool fbc_support;bool disable_fractional_pwm;bool allow_seamless_boot_optimization; -bool power_down_display_on_boot; +bool seamless_boot_edp_requested;bool edp_not_connected;bool edp_no_power_sequencing;bool force_enum_edp;
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +2 -3
@@ -1505,8 +1505,7 @@ void dcn10_init_hw(struct dc *dc)dmub_enable_outbox_notification (dc);/* we want to turn off all dp displays before doing detection */ -if (dc->config.power_down_display_on_boot) -dc_link_blank_all_dp_displays (dc); +dc_link_blank_all_dp_displays (dc);/* If taking control over from VBIOS, we may want to optimize our first * mode set, so we need to skip powering down pipes until we know which
@@ -1514,7 +1513,7 @@ void dcn10_init_hw(struct dc *dc)* Otherwise, if taking control is not possible, we need to power * everything down. */ -if (dcb->funcs->is_accelerated_mode (dcb) || dc->config.power_down_display_on_boot) { +if (dcb->funcs->is_accelerated_mode (dcb) || !dc->config.seamless_boot_edp_requested) {if (!is_optimized_init_done) { hws->funcs.init_pipes (dc, dc->current_state);if (dc->res_pool->hubbub->funcs->allow_self_refresh_control)
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c +3 -4
@@ -545,8 +545,7 @@ void dcn30_init_hw(struct dc *dc) hws->funcs.dsc_pg_control (hws, res_pool->dscs[i]->inst, false);/* we want to turn off all dp displays before doing detection */ -if (dc->config.power_down_display_on_boot) -dc_link_blank_all_dp_displays (dc); +dc_link_blank_all_dp_displays (dc);/* If taking control over from VBIOS, we may want to optimize our first * mode set, so we need to skip powering down pipes until we know which
@@ -554,7 +553,7 @@ void dcn30_init_hw(struct dc *dc)* Otherwise, if taking control is not possible, we need to power * everything down. */ -if (dcb->funcs->is_accelerated_mode (dcb) || dc->config.power_down_display_on_boot) { +if (dcb->funcs->is_accelerated_mode (dcb) || !dc->config.seamless_boot_edp_requested) { hws->funcs.init_pipes (dc, dc->current_state);if (dc->res_pool->hubbub->funcs->allow_self_refresh_control) dc->res_pool->hubbub->funcs->allow_self_refresh_control(dc->res_pool->hubbub,
@@ -566,7 +565,7 @@ void dcn30_init_hw(struct dc *dc)* To avoid this, power down hardware on boot * if DIG is turned on and seamless boot not enabled */ -if (dc->config.power_down_display_on_boot) { +if (!dc->config.seamless_boot_edp_requested) {struct dc_link *edp_links[MAX_NUM_EDP ];struct dc_link *edp_link =NULL ;
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c +2 -3
@@ -197,8 +197,7 @@ void dcn31_init_hw(struct dc *dc)dmub_enable_outbox_notification (dc);/* we want to turn off all dp displays before doing detection */ -if (dc->config.power_down_display_on_boot) -dc_link_blank_all_dp_displays (dc); +dc_link_blank_all_dp_displays (dc);/* If taking control over from VBIOS, we may want to optimize our first * mode set, so we need to skip powering down pipes until we know which
@@ -206,7 +205,7 @@ void dcn31_init_hw(struct dc *dc)* Otherwise, if taking control is not possible, we need to power * everything down. */ -if (dcb->funcs->is_accelerated_mode (dcb) || dc->config.power_down_display_on_boot) { +if (dcb->funcs->is_accelerated_mode (dcb) || !dc->config.seamless_boot_edp_requested) { hws->funcs.init_pipes (dc, dc->current_state);if (dc->res_pool->hubbub->funcs->allow_self_refresh_control) dc->res_pool->hubbub->funcs->allow_self_refresh_control(dc->res_pool->hubbub,
Signature · 1 line
2.25.1
PATCH 3/13 drm/amd/display: adjust bit comparison to be more type safe
In reply to Wayne LinFrom: Eric Yang <[email protected]>
Might potentially have truncation problem with the implicit casting
--- drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c +1 -1
@@ -441,7 +441,7 @@ void dmub_dcn31_get_diagnostic_data(struct dmub_srv *dmub, struct dmub_diagnostibool dmub_dcn31_should_detect (struct dmub_srv *dmub) {uint32_t fw_boot_status =REG_READ (DMCUB_SCRATCH0 ); -bool should_detect = fw_boot_status &DMUB_FW_BOOT_STATUS_BIT_DETECTION_REQUIRED ; +bool should_detect = (fw_boot_status &DMUB_FW_BOOT_STATUS_BIT_DETECTION_REQUIRED ) !=0 ;return should_detect; }
Signature · 1 line
2.25.1
PATCH 4/13 drm/amd/display: support new PMFW interface to disable Z9 only
In reply to Wayne LinFrom: Eric Yang <[email protected]>
[Why]
Need to disable Z9 on configurations that only support Z10
[How]
Support new PMFW interface to disable Z9
--- .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 6 +++--- .../drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c | 15 ++++++++++----- .../drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.h | 2 +- drivers/gpu/drm/amd/display/dc/dc.h | 1 + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 8 +++++++- 5 files changed, 22 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c +3 -3
@@ -139,9 +139,9 @@ void dcn31_update_clocks(struct clk_mgr *clk_mgr_base,* also if safe to lower is false, we just go in the higher state */ if (safe_to_lower) { -if (new_clocks->zstate_support ==DCN_ZSTATE_SUPPORT_ALLOW && +if (new_clocks->zstate_support !=DCN_ZSTATE_SUPPORT_DISALLOW && new_clocks->zstate_support != clk_mgr_base->clks.zstate_support) { -dcn31_smu_set_Z9_support (clk_mgr, true); +dcn31_smu_set_zstate_support (clk_mgr, new_clocks->zstate_support);dm_helpers_enable_periodic_detection (clk_mgr_base->ctx, true); clk_mgr_base->clks.zstate_support = new_clocks->zstate_support; }
@@ -167,7 +167,7 @@ void dcn31_update_clocks(struct clk_mgr *clk_mgr_base, }else {if (new_clocks->zstate_support ==DCN_ZSTATE_SUPPORT_DISALLOW && new_clocks->zstate_support != clk_mgr_base->clks.zstate_support) { -dcn31_smu_set_Z9_support (clk_mgr, false); +dcn31_smu_set_zstate_support (clk_mgr,DCN_ZSTATE_SUPPORT_DISALLOW );dm_helpers_enable_periodic_detection (clk_mgr_base->ctx, false); clk_mgr_base->clks.zstate_support = new_clocks->zstate_support; }
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c +10 -5
@@ -306,23 +306,28 @@ void dcn31_smu_transfer_wm_table_dram_2_smu(struct clk_mgr_internal *clk_mgr) VBIOSSMC_MSG_TransferTableDram2Smu, TABLE_WATERMARKS); } -void dcn31_smu_set_Z9_support (struct clk_mgr_internal *clk_mgr,bool support) +void dcn31_smu_set_zstate_support (struct clk_mgr_internal *clk_mgr,enum dcn_zstate_support_state support) {//TODO: Work with smu team to define optimization options. -unsigned int msg_id; +unsigned int msg_id, param;if (!clk_mgr->smu_present)return ; -if (support) - msg_id = VBIOSSMC_MSG_AllowZstatesEntry; +if (support ==DCN_ZSTATE_SUPPORT_ALLOW_Z10_ONLY ) + param =1 ;else + param =0 ; + +if (support ==DCN_ZSTATE_SUPPORT_DISALLOW ) msg_id = VBIOSSMC_MSG_DisallowZstatesEntry; +else + msg_id = VBIOSSMC_MSG_AllowZstatesEntry;dcn31_smu_send_msg_with_param ( clk_mgr, msg_id, -0 ); + param); }
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.h +1 -1
@@ -265,7 +265,7 @@ void dcn31_smu_set_dram_addr_low(struct clk_mgr_internal *clk_mgr, uint32_t addrvoid dcn31_smu_transfer_dpm_table_smu_2_dram (struct clk_mgr_internal *clk_mgr);void dcn31_smu_transfer_wm_table_dram_2_smu (struct clk_mgr_internal *clk_mgr); -void dcn31_smu_set_Z9_support (struct clk_mgr_internal *clk_mgr,bool support); +void dcn31_smu_set_zstate_support (struct clk_mgr_internal *clk_mgr,enum dcn_zstate_support_state support);void dcn31_smu_set_dtbclk (struct clk_mgr_internal *clk_mgr,bool enable);#endif /* DAL_DC_31_SMU_H_ */
drivers/gpu/drm/amd/display/dc/dc.h +1 -0
@@ -396,6 +396,7 @@ enum dcn_pwr_state {enum dcn_zstate_support_state {DCN_ZSTATE_SUPPORT_UNKNOWN ,DCN_ZSTATE_SUPPORT_ALLOW , +DCN_ZSTATE_SUPPORT_ALLOW_Z10_ONLY ,DCN_ZSTATE_SUPPORT_DISALLOW , };#endif
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +7 -1
@@ -3093,8 +3093,14 @@ static enum dcn_zstate_support_state decide_zstate_support(struct dc *dc, strucelse if (context->stream_count ==1 && context->streams[0 ]->signal ==SIGNAL_TYPE_EDP ) {struct dc_link *link = context->streams[0 ]->sink->link; -if (link->link_index ==0 && context->bw_ctx.dml.vba.StutterPeriod >5000.0 ) +/* zstate only supported on PWRSEQ0 */ +if (link->link_index !=0 ) +return DCN_ZSTATE_SUPPORT_DISALLOW ; + +if (context->bw_ctx.dml.vba.StutterPeriod >5000.0 )return DCN_ZSTATE_SUPPORT_ALLOW ; +else if (link->psr_settings.psr_feature_enabled) +return DCN_ZSTATE_SUPPORT_ALLOW_Z10_ONLY ;else return DCN_ZSTATE_SUPPORT_DISALLOW ; }else
Signature · 1 line
2.25.1
PATCH 5/13 drm/amd/display: 3.2.168
In reply to Wayne LinFrom: Aric Cyr <[email protected]>
This version brings improvements in the following:
- Fix problem observed while assigning link encoder
- Constrain seamless boot on eDP only
- Improve Z9 interface
--- 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.167" +#define DC_VER "3.2.168"#define MAX_SURFACES 3#define MAX_PLANES 6
Signature · 1 line
2.25.1
PATCH 6/13 drm/amd/display: move FPU associated DCN302 code to DML folder
In reply to Wayne LinFrom: "Dhillon, Jasdeep" <[email protected]>
[Why & How]
As part of the FPU isolation work documented in
https://patchwork.freedesktop.org/series/93042/, isolate code that uses FPU in DCN302 to DML, where all FPU code should locate.
--- .../gpu/drm/amd/display/dc/dcn302/Makefile | 12 - .../amd/display/dc/dcn302/dcn302_resource.c | 316 +--------------- .../amd/display/dc/dcn302/dcn302_resource.h | 3 + drivers/gpu/drm/amd/display/dc/dml/Makefile | 2 + .../amd/display/dc/dml/dcn302/dcn302_fpu.c | 357 ++++++++++++++++++ .../amd/display/dc/dml/dcn302/dcn302_fpu.h | 32 ++ 6 files changed, 404 insertions(+), 318 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn302/dcn302_fpu.c create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn302/dcn302_fpu.h
drivers/gpu/drm/amd/display/dc/dcn302/Makefile +0 -12
@@ -1,11 +1,6 @@ # # (c) Copyright 2020 Advanced Micro Devices, Inc. All the rights reserved # -# All rights reserved. This notice is intended as a precaution against -# inadvertent publication and does not imply publication or any waiver -# of confidentiality. The year included in the foregoing notice is the -# year of creation of the work. -# # Authors: AMD # # Makefile for dcn302.
@@ -20,13 +15,6 @@ ifdef CONFIG_PPC64 CFLAGS_$(AMDDALPATH)/dc/dcn302/dcn302_resource.o := -mhard-float -maltivec endif -ifdef CONFIG_CC_IS_GCC -ifeq ($(call cc-ifversion, -lt, 0701, y), y) -IS_OLD_GCC = 1 -endif -CFLAGS_$(AMDDALPATH)/dc/dcn302/dcn302_resource.o += -mhard-float -endif - ifdef CONFIG_X86 ifdef IS_OLD_GCC # Stack alignment mismatch, proceed with caution.
drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c +10 -306
350 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.h +3 -0
@@ -28,6 +28,9 @@#include "core_types.h" +extern struct _vcs_dpi_ip_params_st dcn3_02_ip; +extern struct _vcs_dpi_soc_bounding_box_st dcn3_02_soc; +struct resource_pool *dcn302_create_resource_pool (const struct dc_init_data *init_data,struct dc *dc);void dcn302_update_bw_bounding_box (struct dc *dc,struct clk_bw_params *bw_params);
drivers/gpu/drm/amd/display/dc/dml/Makefile +2 -0
@@ -71,6 +71,7 @@ CFLAGS_$(AMDDALPATH)/dc/dml/dcn30/display_rq_dlg_calc_30.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn31/display_mode_vba_31.o := $(dml_ccflags) $(frame_warn_flag) CFLAGS_$(AMDDALPATH)/dc/dml/dcn31/display_rq_dlg_calc_31.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn301/dcn301_fpu.o := $(dml_ccflags) +CFLAGS_$(AMDDALPATH)/dc/dml/dcn302/dcn302_fpu.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dsc/rc_calc_fpu.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_lib.o := $(dml_ccflags) CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_mode_vba.o := $(dml_rcflags)
@@ -104,6 +105,7 @@ DML += dcn21/display_rq_dlg_calc_21.o dcn21/display_mode_vba_21.o DML += dcn30/display_mode_vba_30.o dcn30/display_rq_dlg_calc_30.o DML += dcn31/display_mode_vba_31.o dcn31/display_rq_dlg_calc_31.o DML += dcn301/dcn301_fpu.o +DML += dcn302/dcn302_fpu.o DML += dsc/rc_calc_fpu.o endif
drivers/gpu/drm/amd/display/dc/dml/dcn302/dcn302_fpu.c new file +357 -0
357 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dml/dcn302/dcn302_fpu.h new file +32 -0
@@ -0,0 +1,32 @@ +/* +* Copyright 2019-2021 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +* Authors: AMD +* +*/ + +#ifndef __DCN302_FPU_H__ +#define __DCN302_FPU_H__ + +void dcn302_fpu_init_soc_bounding_box (struct bp_soc_bb_info bb_info); +void dcn302_fpu_update_bw_bounding_box (struct dc *dc,struct clk_bw_params *bw_params); + +#endif /* __DCN302_FPU_H__*/
Signature · 1 line
2.25.1
PATCH 7/13 drm/amd/display: modify SMU_TIMEOUT macro.
In reply to Wayne LinFrom: Ian Chen <[email protected]>
[WHY]
If some SMU features are not enabled, SMU will return fail to that message.
[HOW]SMU_TIMEOUT macro will treat "return fail" as timeout also. Correct the macro to only report timeout case.
--- drivers/gpu/drm/amd/display/dc/dm_helpers.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/dm_helpers.h +2 -2
@@ -170,9 +170,9 @@ bool dm_helpers_dmub_outbox_interrupt_control(struct dc_context *ctx, bool enablvoid dm_helpers_smu_timeout (struct dc_context *ctx,unsigned int msg_id,unsigned int param,unsigned int timeout_us); -// 0x1 = Result_OK, 0xFE = Result_UnkmownCmd +// 0x1 = Result_OK, 0xFE = Result_UnkmownCmd, 0x0 = Status_Busy #define IS_SMU_TIMEOUT (result) \ - (!(result == 0x1 || result == 0xFE)) + (result == 0x0) int dm_helper_dmub_aux_transfer_sync( struct dc_context *ctx,
Signature · 1 line
2.25.1
PATCH 8/13 drm/amd/display: DCEFCLK DS on CLK init
In reply to Wayne LinFrom: Chris Park <[email protected]>
[Why]
On HG APU + dGPU scenario with no display to dGPU, DS stays disabled due to no display present. This problem can be worked around by DAL calling DCEFCLK DS message to SMU on clk init.
[How]
Call DCEFCLK DS message to SMU on clk init.
--- drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c +1 -0
@@ -184,6 +184,7 @@ void dcn3_init_clocks(struct clk_mgr *clk_mgr_base)dcn3_init_single_clock (clk_mgr,PPCLK_DCEFCLK , &clk_mgr_base->bw_params->clk_table.entries[0 ].dcfclk_mhz, &num_levels); +dcn30_smu_set_min_deep_sleep_dcef_clk (clk_mgr,0 );/* DTBCLK */ dcn3_init_single_clock(clk_mgr, PPCLK_DTBCLK,
Signature · 1 line
2.25.1
PATCH 9/13 drm/amd/display: Fix black screen issue on memory clock switch en
In reply to Wayne LinFrom: Felipe Clark <[email protected]>
[WHY]
With some monitors when multi plane overlay is enabled the memory clock switching mechanism has to change and, due to an error in the initialization sequence, it may cause a black screen.
[HOW]
Change the firmware assisted memory clock switch initialization and tear-down sequence utilizing the prepare_bandwidth and optimize_bandwidth contexts.
--- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 5 +++++ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h | 3 +++ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c +5 -0
@@ -355,6 +355,11 @@ void dcn30_prepare_bandwidth(struct dc *dc,dcn20_prepare_bandwidth (dc, context); } +void dcn30_optimize_bandwidth (struct dc *dc,struct dc_state *context) +{ +dcn20_optimize_bandwidth (dc, context); +} +void dcn30_disable_writeback (struct dc *dc,unsigned int dwb_pipe_inst)
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h +3 -0
@@ -50,6 +50,9 @@ void dcn30_disable_writeback(void dcn30_prepare_bandwidth (struct dc *dc,struct dc_state *context); +void dcn30_optimize_bandwidth (struct dc *dc, +struct dc_state *context); + bool dcn30_mmhubbub_warmup( struct dc *dc, unsigned int num_dwb,
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c +1 -1
@@ -60,7 +60,7 @@ static const struct hw_sequencer_funcs dcn30_funcs = { .interdependent_update_lock = dcn10_lock_all_pipes, .cursor_lock = dcn10_cursor_lock, .prepare_bandwidth = dcn20_prepare_bandwidth, - .optimize_bandwidth = dcn20_optimize_bandwidth, + .optimize_bandwidth = dcn30_optimize_bandwidth, .update_bandwidth = dcn20_update_bandwidth, .set_drr = dcn10_set_drr, .get_position = dcn10_get_position,
Signature · 1 line
2.25.1
PATCH 10/13 drm/amd/display: update dml to rev.99 and smu clk_table w/a
In reply to Wayne LinFrom: Charlene Liu <[email protected]>
[why]
1. update dml to rev.99
2. add smu clk table w/a: smu gives 1 dtm level with mismatch voltage table which causes multiple issues.
--- .../dc/dml/dcn31/display_mode_vba_31.c | 29 +++++++++++++++++-- .../drm/amd/display/dc/dml/display_mode_vba.h | 2 ++ 2 files changed, 28 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c +26 -3
@@ -64,6 +64,8 @@ typedef struct {double DCFCLKDeepSleep;unsigned int DPPPerPlane;bool ScalerEnabled; +double VRatio; +double VRatioChroma;enum scan_direction_class SourceScan;unsigned int BlockWidth256BytesY;unsigned int BlockHeight256BytesY;
@@ -942,6 +944,7 @@ static bool CalculatePrefetchSchedule(double dst_y_prefetch_equ;double Tsw_oto;double prefetch_bw_oto; +double prefetch_bw_pr;double Tvm_oto;double Tr0_oto;double Tvm_oto_lines;
@@ -971,6 +974,7 @@ static bool CalculatePrefetchSchedule(double min_Lsw;double Tsw_est1 =0 ;double Tsw_est3 =0 ; +double max_Tsw =0 ;if (GPUVMEnable == true && HostVMEnable == true) { HostVMDynamicLevelsTrips = HostVMMaxNonCachedPageTableLevels;
@@ -1111,11 +1115,14 @@ static bool CalculatePrefetchSchedule( bytes_pp = myPipe->BytePerPixelY + myPipe->BytePerPixelC /4 ; else bytes_pp = myPipe->BytePerPixelY + myPipe->BytePerPixelC; - +/*rev 99*/ + prefetch_bw_pr =dml_min (1 , bytes_pp * myPipe->PixelClock / (double ) myPipe->DPPPerPlane); + max_Tsw =dml_max (PrefetchSourceLinesY, PrefetchSourceLinesC) * LineTime; prefetch_sw_bytes = PrefetchSourceLinesY * swath_width_luma_ub * myPipe->BytePerPixelY + PrefetchSourceLinesC * swath_width_chroma_ub * myPipe->BytePerPixelC; prefetch_bw_oto =dml_max (bytes_pp * myPipe->PixelClock / myPipe->DPPPerPlane, prefetch_sw_bytes / (dml_max (PrefetchSourceLinesY, PrefetchSourceLinesC) * LineTime)); + prefetch_bw_oto =dml_max (prefetch_bw_pr, prefetch_sw_bytes / max_Tsw); - min_Lsw =dml_max (PrefetchSourceLinesY, PrefetchSourceLinesC) / max_vratio_pre; + min_Lsw =dml_max (1 ,dml_max (PrefetchSourceLinesY, PrefetchSourceLinesC) / max_vratio_pre); Lsw_oto =dml_ceil (4 *dml_max (prefetch_sw_bytes / prefetch_bw_oto / LineTime, min_Lsw),1 ) /4 ; Tsw_oto = Lsw_oto * LineTime;
@@ -1389,7 +1396,7 @@ static bool CalculatePrefetchSchedule(dml_print ("DML::%s: SwathHeightC = %d\n" , __func__, SwathHeightC);dml_print ("DML::%s: VInitPreFillC = %f\n" , __func__, VInitPreFillC);#endif -if ((SwathHeightC >4 )) { +if ((SwathHeightC >4 ) || VInitPreFillC >3 ) {if (LinesToRequestPrefetchPixelData > (VInitPreFillC -3.0 ) /2.0 ) { *VRatioPrefetchC = dml_max( *VRatioPrefetchC,
@@ -2663,6 +2670,8 @@ static void DISPCLKDPPCLKDCFCLKDeepSleepPrefetchParametersWatermarksAndPerforman myPipe.DCFCLKDeepSleep = v->DCFCLKDeepSleep; myPipe.DPPPerPlane = v->DPPPerPlane[k]; myPipe.ScalerEnabled = v->ScalerEnabled[k]; + myPipe.VRatio = v->VRatio[k]; + myPipe.VRatioChroma = v->VRatioChroma[k]; myPipe.SourceScan = v->SourceScan[k]; myPipe.BlockWidth256BytesY = v->BlockWidth256BytesY[k]; myPipe.BlockHeight256BytesY = v->BlockHeight256BytesY[k];
@@ -3911,6 +3920,9 @@ static noinline void CalculatePrefetchSchedulePerPlane( myPipe.DCFCLKDeepSleep = v->ProjectedDCFCLKDeepSleep[i][j]; myPipe.DPPPerPlane = v->NoOfDPP[i][j][k]; myPipe.ScalerEnabled = v->ScalerEnabled[k]; + myPipe.VRatio = mode_lib->vba.VRatio[k]; + myPipe.VRatioChroma = mode_lib->vba.VRatioChroma[k]; + myPipe.SourceScan = v->SourceScan[k]; myPipe.BlockWidth256BytesY = v->Read256BlockWidthY[k]; myPipe.BlockHeight256BytesY = v->Read256BlockHeightY[k];
@@ -4987,6 +4999,17 @@ void dml31_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l &v->meta_row_bandwidth[i][j][k], &v->dpte_row_bandwidth[i][j][k]); } +/*DCCMetaBufferSizeSupport(i, j) = True +For k = 0 To NumberOfActivePlanes - 1 +If MetaRowBytes(i, j, k) > 24064 Then +DCCMetaBufferSizeSupport(i, j) = False +End If +Next k*/ + v->DCCMetaBufferSizeSupport[i][j] = true; +for (k =0 ; k < v->NumberOfActivePlanes; ++k) { +if (v->MetaRowBytes[i][j][k] >24064 ) + v->DCCMetaBufferSizeSupport[i][j] = false; + } v->UrgLatency[i] = CalculateUrgentLatency( v->UrgentLatencyPixelDataOnly, v->UrgentLatencyPixelMixedWithVMData,
drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h +2 -0
@@ -544,6 +544,8 @@ struct vba_vars_st {bool DTBCLKRequiredMoreThanSupported[DC__VOLTAGE_STATES ];double UrgentRoundTripAndOutOfOrderLatencyPerState[DC__VOLTAGE_STATES ];bool ROBSupport[DC__VOLTAGE_STATES ][2 ]; +//based on rev 99: Dim DCCMetaBufferSizeSupport(NumberOfStates, 1) As Boolean +bool DCCMetaBufferSizeSupport[DC__VOLTAGE_STATES ][2 ];bool PTEBufferSizeNotExceeded[DC__VOLTAGE_STATES ][2 ];bool TotalVerticalActiveBandwidthSupport[DC__VOLTAGE_STATES ][2 ];double MaxTotalVerticalActiveAvailableBandwidth[DC__VOLTAGE_STATES ][2 ];
Signature · 1 line
2.25.1
PATCH 11/13 drm/amd/display: Add signal type check when verify stream backends same
In reply to Wayne LinFrom: Dale Zhao <[email protected]>
[Why]
For allow eDP hot-plug feature, the stream signal may change to VIRTUAL when plug-out and back to eDP when plug-in. OS will still setPathMode with same timing for each plugging, but eDP gets no stream update as we don't check signal type changing back as keeping it VIRTUAL. It's also unsafe for future cases that stream signal is switched with same timing.
[How]
Check stream signal type change include previous HDMI signal case.
--- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +3 -0
@@ -1640,6 +1640,9 @@ static bool are_stream_backends_same(if (is_timing_changed (stream_a, stream_b))return false; +if (stream_a->signal != stream_b->signal) +return false; +if (stream_a->dpms_off != stream_b->dpms_off)return false;
Signature · 1 line
2.25.1
PATCH 12/13 drm/amd/display: [FW Promotion] Release 0.0.100.0
In reply to Wayne LinFrom: Anthony Koo <[email protected]>
--- drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h +2 -2
@@ -47,10 +47,10 @@/* Firmware versioning. */ #ifdef DMUB_EXPOSE_VERSION -#define DMUB_FW_VERSION_GIT_HASH 0xbaf06b95 +#define DMUB_FW_VERSION_GIT_HASH 0x56a29f36#define DMUB_FW_VERSION_MAJOR 0#define DMUB_FW_VERSION_MINOR 0 -#define DMUB_FW_VERSION_REVISION 98 +#define DMUB_FW_VERSION_REVISION 100#define DMUB_FW_VERSION_TEST 0#define DMUB_FW_VERSION_VBIOS 0#define DMUB_FW_VERSION_HOTFIX 0
Signature · 1 line
2.25.1
PATCH 13/13 drm/amd/display: 3.2.169
In reply to Wayne LinFrom: Aric Cyr <[email protected]>
This version brings along following fixes:
- Organize FPU associated code to DML
- Modify SMU_TIMEOUT macro
- Organize dcn201 code
- Address DS stays disabled problem under specific scenario
- Fix black screen issue
- Update DML to rev.99
- Address problem of eDP hot-plug feature
--- 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.168" +#define DC_VER "3.2.169"#define MAX_SURFACES 3#define MAX_PLANES 6
Signature · 1 line
2.25.1