DC Patches 09 Sep 2019
cover DC Patches 09 Sep 2019
From: Leo Li <[email protected]>
Summary of change:
* Fix pipe split with DSC on high bandwidth timings (8k@60, 4k@144)
* Improve freesync low frame rate compensation (frame doubling) behavior
* Update ABM parameters, limit minimum adjustment
* Misc. refactors and fixes
Anthony Koo (1):
drm/amd/display: set minimum abm backlight level
Aric Cyr (4):
drm/amd/display: 3.2.50
drm/amd/display: 3.4.51
drm/amd/display: 3.4.51.1
drm/amd/display: Improve LFC behaviour
Dmytro Laktyushkin (5):
drm/amd/display: add additional flag consideration for surface update drm/amd/display: add vtg update after global sync update drm/amd/display: fix global sync param extraction indexing drm/amd/display: update odm mode validation to be in line with policy drm/amd/display: Add detile buffer size for DCN20
Ilya Bakoulin (1):
drm/amd/display: Fix HUBP secondary viewport programming
Josip Pavic (1):
drm/amd/display: define parameters for abm 2.3
Julian Parkin (1):
drm/amd/display: Separate hardware initialization from creation
Lewis Huang (1):
drm/amd/display: fix i2c wtire mot incorrect issue
Martin Leung (2):
drm/amd/display: enable single dp seamless boot drm/amd/display: fix use of uninitialized variable
Martin Tsai (1):
drm/amd/display: Handle virtual signal type in disable_link()
Mikita Lipski (1):
drm/amd/display: Rebuild mapped resources after pipe split
Nikola Cornij (1):
drm/amd/display: Set number of pipes to 1 if the second pipe was
disabled
Stylon Wang (1):
drm/amd/display: Add debugfs entry to force YUV420 output
Wesley Chalmers (4):
drm/amd/display: Replace for loop w/ function call drm/amd/display: Do not double-buffer DTO adjustments drm/amd/display: Revert fixup DPP programming sequence drm/amd/display: Optimize clocks on clock change
Zhan Liu (1):
drm/amd/display: Add missing HBM support and raise Vega20's uclk.
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 12 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 1 + .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 31 ++++ .../dc/clk_mgr/dce110/dce110_clk_mgr.c | 18 ++- .../display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 132 +++++------------- drivers/gpu/drm/amd/display/dc/core/dc.c | 38 ++--- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 63 ++++++--- .../gpu/drm/amd/display/dc/core/dc_link_ddc.c | 4 +- .../gpu/drm/amd/display/dc/core/dc_resource.c | 26 ++-- drivers/gpu/drm/amd/display/dc/dc.h | 12 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 8 ++ .../gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 12 ++ .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 3 +- .../gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c | 52 +------ .../gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 2 +- .../drm/amd/display/dc/dcn20/dcn20_hubbub.c | 12 +- .../drm/amd/display/dc/dcn20/dcn20_hubbub.h | 1 + .../drm/amd/display/dc/dcn20/dcn20_hwseq.c | 11 +- .../gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 4 + .../drm/amd/display/dc/dcn20/dcn20_resource.c | 29 +--- .../dc/dml/dcn20/display_mode_vba_20v2.c | 9 +- .../gpu/drm/amd/display/dc/inc/core_types.h | 1 + .../amd/display/dc/inc/hw/clk_mgr_internal.h | 10 +- drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 3 +- .../amd/display/modules/freesync/freesync.c | 32 +++-- .../amd/display/modules/inc/mod_freesync.h | 1 + .../amd/display/modules/power/power_helpers.c | 93 ++++++------ .../amd/display/modules/power/power_helpers.h | 1 + 28 files changed, 315 insertions(+), 306 deletions(-)
Signature · 6 lines
2.22.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/25 drm/amd/display: Fix HUBP secondary viewport programming
From: Ilya Bakoulin <[email protected]>
[Why]
Secondary viewport dimension/position registers are not programmed, which can cause issues in some stereo configurations.
[How]
Add register definitions and register programming.
--- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 8 ++++++++ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 12 ++++++++++++ 2 files changed, 20 insertions(+)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c +8 -0
@@ -841,6 +841,14 @@ void min_set_viewport(REG_SET_2 (DCSURF_PRI_VIEWPORT_START_C ,0 ,PRI_VIEWPORT_X_START_C , viewport_c->x,PRI_VIEWPORT_Y_START_C , viewport_c->y); + +REG_SET_2 (DCSURF_SEC_VIEWPORT_DIMENSION_C ,0 , +SEC_VIEWPORT_WIDTH_C , viewport_c->width, +SEC_VIEWPORT_HEIGHT_C , viewport_c->height); + +REG_SET_2 (DCSURF_SEC_VIEWPORT_START_C ,0 , +SEC_VIEWPORT_X_START_C , viewport_c->x, +SEC_VIEWPORT_Y_START_C , viewport_c->y); }void hubp1_read_state_common (struct hubp *hubp)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h +12 -0
@@ -47,6 +47,8 @@SRI (DCSURF_SEC_VIEWPORT_START ,HUBP , id), \SRI (DCSURF_PRI_VIEWPORT_DIMENSION_C ,HUBP , id), \SRI (DCSURF_PRI_VIEWPORT_START_C ,HUBP , id), \ +SRI (DCSURF_SEC_VIEWPORT_DIMENSION_C ,HUBP , id), \ +SRI (DCSURF_SEC_VIEWPORT_START_C ,HUBP , id), \SRI (DCSURF_PRIMARY_SURFACE_ADDRESS_HIGH ,HUBPREQ , id),\SRI (DCSURF_PRIMARY_SURFACE_ADDRESS ,HUBPREQ , id),\ SRI(DCSURF_SECONDARY_SURFACE_ADDRESS_HIGH, HUBPREQ, id),\
@@ -154,6 +156,8 @@uint32_t DCSURF_SEC_VIEWPORT_START ; \uint32_t DCSURF_PRI_VIEWPORT_DIMENSION_C ; \uint32_t DCSURF_PRI_VIEWPORT_START_C ; \ +uint32_t DCSURF_SEC_VIEWPORT_DIMENSION_C ; \ +uint32_t DCSURF_SEC_VIEWPORT_START_C ; \uint32_t DCSURF_PRIMARY_SURFACE_ADDRESS_HIGH ; \uint32_t DCSURF_PRIMARY_SURFACE_ADDRESS ; \uint32_t DCSURF_SECONDARY_SURFACE_ADDRESS_HIGH ; \
@@ -287,6 +291,10 @@HUBP_SF (HUBP0_DCSURF_PRI_VIEWPORT_DIMENSION_C ,PRI_VIEWPORT_HEIGHT_C , mask_sh),\HUBP_SF (HUBP0_DCSURF_PRI_VIEWPORT_START_C ,PRI_VIEWPORT_X_START_C , mask_sh),\HUBP_SF (HUBP0_DCSURF_PRI_VIEWPORT_START_C ,PRI_VIEWPORT_Y_START_C , mask_sh),\ +HUBP_SF (HUBP0_DCSURF_SEC_VIEWPORT_DIMENSION_C ,SEC_VIEWPORT_WIDTH_C , mask_sh),\ +HUBP_SF (HUBP0_DCSURF_SEC_VIEWPORT_DIMENSION_C ,SEC_VIEWPORT_HEIGHT_C , mask_sh),\ +HUBP_SF (HUBP0_DCSURF_SEC_VIEWPORT_START_C ,SEC_VIEWPORT_X_START_C , mask_sh),\ +HUBP_SF (HUBP0_DCSURF_SEC_VIEWPORT_START_C ,SEC_VIEWPORT_Y_START_C , mask_sh),\HUBP_SF (HUBPREQ0_DCSURF_PRIMARY_SURFACE_ADDRESS_HIGH ,PRIMARY_SURFACE_ADDRESS_HIGH , mask_sh),\HUBP_SF (HUBPREQ0_DCSURF_PRIMARY_SURFACE_ADDRESS ,PRIMARY_SURFACE_ADDRESS , mask_sh),\ HUBP_SF(HUBPREQ0_DCSURF_SECONDARY_SURFACE_ADDRESS_HIGH, SECONDARY_SURFACE_ADDRESS_HIGH, mask_sh),\
@@ -481,6 +489,10 @@type PRI_VIEWPORT_HEIGHT_C ; \type PRI_VIEWPORT_X_START_C ; \type PRI_VIEWPORT_Y_START_C ; \ +type SEC_VIEWPORT_WIDTH_C ; \ +type SEC_VIEWPORT_HEIGHT_C ; \ +type SEC_VIEWPORT_X_START_C ; \ +type SEC_VIEWPORT_Y_START_C ; \type PRIMARY_SURFACE_ADDRESS_HIGH ;\type PRIMARY_SURFACE_ADDRESS ;\type SECONDARY_SURFACE_ADDRESS_HIGH ;\
Signature · 6 lines
2.22.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/25 drm/amd/display: define parameters for abm 2.3
In reply to a message not in the archiveFrom: Josip Pavic <[email protected]>
[Why]
Current configuration 0 is just a placeholder, and final parameters needed. Also, configuration 1 is expected to emulate ABM 2.1 but is too aggressive.
[How]
Redefine configuration 0 with the finalized parameters, and increase the contrast gain of configuration 1 so that it properly emulates ABM 2.1.
--- .../amd/display/modules/power/power_helpers.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/display/modules/power/power_helpers.c +8 -8
@@ -80,18 +80,18 @@ struct abm_parameters {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 }, - {0xff ,0x85 ,0x20 ,0x00 ,0xff ,0x90 ,0xa8 ,0x40 ,0xE0 }, - {0xff ,0x40 ,0x20 ,0x00 ,0xff ,0x90 ,0x68 ,0x40 ,0xE0 }, - {0x82 ,0x4d ,0x20 ,0x00 ,0x00 ,0x90 ,0xb3 ,0x70 ,0x70 }, + {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 }, };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 ,0xa8 ,0xb3 ,0x70 ,0x70 }, - {0xcd ,0xa5 ,0x20 ,0x00 ,0x00 ,0xa8 ,0xb3 ,0x70 ,0x70 }, - {0x99 ,0x65 ,0x20 ,0x00 ,0x00 ,0xa8 ,0xb3 ,0x70 ,0x70 }, - {0x82 ,0x4d ,0x20 ,0x00 ,0x00 ,0xa8 ,0xb3 ,0x70 ,0x70 }, + {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 }, };static const struct abm_parameters *const abm_settings[] = {
Signature · 6 lines
2.22.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/25 drm/amd/display: 3.2.50
In reply to a message not in the archiveFrom: Aric Cyr <[email protected]>
--- 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
@@ -39,7 +39,7 @@#include "inc/hw/dmcu.h" #include "dml/display_mode_lib.h" -#define DC_VER "3.2.49" +#define DC_VER "3.2.50"#define MAX_SURFACES 3#define MAX_PLANES 6
Signature · 6 lines
2.22.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/25 drm/amd/display: Rebuild mapped resources after pipe split
In reply to a message not in the archiveFrom: Mikita Lipski <[email protected]>
[why]
The issue is specific for linux, as on timings such as 8K@60 or 4K@144 DSC should be working in combination with ODM Combine in order to ensure that we can run those timings. The validation for those timings was passing, but when pipe split was happening second pipe wasn't being programmed.
[how]
Rebuild mapped resources if we split stream for ODM.
--- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +1 -0
@@ -2466,6 +2466,7 @@ bool dcn20_fast_validate_bw( &context->res_ctx, dc->res_pool, pipe, hsplit_pipe)) goto validate_fail; +dcn20_build_mapped_resource (dc, context, pipe->stream); }else dcn20_split_stream_for_mpc( &context->res_ctx, dc->res_pool,
Signature · 6 lines
2.22.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/25 drm/amd/display: Replace for loop w/ function call
In reply to a message not in the archiveFrom: Wesley Chalmers <[email protected]>
[WHY]
A function to adjust DPP clocks with DTO already exists; function code is identical to the code replaced here
--- .../display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 25 ++----------------- 1 file changed, 2 insertions(+), 23 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c +2 -23
@@ -196,7 +196,6 @@ void dcn2_update_clocks(struct clk_mgr *clk_mgr_base,bool enter_display_off = false;struct dmcu *dmcu = clk_mgr_base->ctx->dc->res_pool->dmcu;bool force_reset = false; -int i;if (dc->work_arounds.skip_clock_update)return ;
@@ -278,34 +277,14 @@ void dcn2_update_clocks(struct clk_mgr *clk_mgr_base,request_voltage_and_program_global_dpp_clk (clk_mgr_base, new_clocks->dppclk_khz);// Then raise any dividers that need raising -for (i =0 ; i < clk_mgr->base.ctx->dc->res_pool->pipe_count; i++) { -int dpp_inst, dppclk_khz; - -if (!context->res_ctx.pipe_ctx[i].plane_state) -continue ; - - dpp_inst = context->res_ctx.pipe_ctx[i].plane_res.dpp->inst; - dppclk_khz = context->res_ctx.pipe_ctx[i].plane_res.bw.dppclk_khz; - - clk_mgr->dccg->funcs->update_dpp_dto (clk_mgr->dccg, dpp_inst, dppclk_khz, true); - } +dcn20_update_clocks_update_dpp_dto (clk_mgr, context); }else {// For post-programming, we can lower ref clk if needed, and unconditionally set all the DTOs if (new_clocks->dppclk_khz < clk_mgr_base->clks.dppclk_khz)request_voltage_and_program_global_dpp_clk (clk_mgr_base, new_clocks->dppclk_khz); +dcn20_update_clocks_update_dpp_dto (clk_mgr, context); -for (i =0 ; i < clk_mgr->base.ctx->dc->res_pool->pipe_count; i++) { -int dpp_inst, dppclk_khz; - -if (!context->res_ctx.pipe_ctx[i].plane_state) -continue ; - - dpp_inst = context->res_ctx.pipe_ctx[i].plane_res.dpp->inst; - dppclk_khz = context->res_ctx.pipe_ctx[i].plane_res.bw.dppclk_khz; - - clk_mgr->dccg->funcs->update_dpp_dto (clk_mgr->dccg, dpp_inst, dppclk_khz, false); - } } } if (update_dispclk &&
Signature · 6 lines
2.22.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/25 drm/amd/display: add additional flag consideration for surface update
In reply to a message not in the archiveFrom: Dmytro Laktyushkin <[email protected]>
Surface dchub/dpp update would not trigger if a stream update was the only cause. This change now allows stream flags to trigger this update.
--- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +1 -1
@@ -1375,7 +1375,7 @@ static void dcn20_program_pipe(if (pipe_ctx->update_flags.bits.enable)dcn20_enable_plane (dc, pipe_ctx, context); -if (pipe_ctx->update_flags.raw || pipe_ctx->plane_state->update_flags.raw) +if (pipe_ctx->update_flags.raw || pipe_ctx->plane_state->update_flags.raw || pipe_ctx->stream->update_flags.raw)dcn20_update_dchubp_dpp (dc, pipe_ctx, context); if (pipe_ctx->update_flags.bits.enable
Signature · 6 lines
2.22.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 7/25 drm/amd/display: Add debugfs entry to force YUV420 output
In reply to a message not in the archiveFrom: Stylon Wang <[email protected]>
[Why]
Even if YUV420 is available for video mode, YUV444 is still automatically selected. This poses a problem for compliance tests.
[How]
Add a per-connector debugfs entry "force_yuv420_output" to force selection of YUV420 mode.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 ++- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 1 + .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 31 +++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4 -1
@@ -3383,7 +3383,7 @@ static void fill_stream_properties_from_drm_display_mode( {struct dc_crtc_timing *timing_out = &stream->timing;const struct drm_display_info *info = &connector->display_info; - +struct amdgpu_dm_connector *aconnector =to_amdgpu_dm_connector (connector);memset (timing_out,0 ,sizeof (struct dc_crtc_timing )); timing_out->h_border_left =0 ;
@@ -3394,6 +3394,9 @@ static void fill_stream_properties_from_drm_display_mode(if (drm_mode_is_420_only (info, mode_in) && stream->signal ==SIGNAL_TYPE_HDMI_TYPE_A ) timing_out->pixel_encoding =PIXEL_ENCODING_YCBCR420 ; +else if (drm_mode_is_420_also (info, mode_in) + && aconnector->force_yuv420_output) + timing_out->pixel_encoding =PIXEL_ENCODING_YCBCR420 ;else if ((connector->display_info.color_formats &DRM_COLOR_FORMAT_YCRCB444 ) && stream->signal ==SIGNAL_TYPE_HDMI_TYPE_A ) timing_out->pixel_encoding =PIXEL_ENCODING_YCBCR444 ;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +1 -0
@@ -284,6 +284,7 @@ struct amdgpu_dm_connector {uint32_t debugfs_dpcd_address;uint32_t debugfs_dpcd_size;#endif +bool force_yuv420_output; };#define to_amdgpu_dm_connector (x) container_of(x, struct amdgpu_dm_connector, base)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +31 -0
@@ -940,6 +940,33 @@ static const struct { {"aux_dpcd_data", &dp_dpcd_data_debugfs_fops} }; +/* +* Force YUV420 output if available from the given mode +*/ +static int force_yuv420_output_set (void *data,u64 val) +{ +struct amdgpu_dm_connector *connector = data; + + connector->force_yuv420_output = (bool )val; + +return 0 ; +} + +/* +* Check if YUV420 is forced when available from the given mode +*/ +static int force_yuv420_output_get (void *data,u64 *val) +{ +struct amdgpu_dm_connector *connector = data; + + *val = connector->force_yuv420_output; + +return 0 ; +} + +DEFINE_DEBUGFS_ATTRIBUTE (force_yuv420_output_fops, force_yuv420_output_get, + force_yuv420_output_set,"%llu\n" ); +void connector_debugfs_init (struct amdgpu_dm_connector *connector) {int i;
@@ -953,6 +980,10 @@ void connector_debugfs_init(struct amdgpu_dm_connector *connector) dp_debugfs_entries[i].fops); } } + +debugfs_create_file_unsafe ("force_yuv420_output" ,0644 , dir, connector, + &force_yuv420_output_fops); + }/*
Signature · 6 lines
2.22.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 8/25 drm/amd/display: add vtg update after global sync update
In reply to a message not in the archiveFrom: Dmytro Laktyushkin <[email protected]>
Global sync update was missing vtg update resulting in underflow if vstartup decreased a significant amount.
--- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +5 -1
@@ -1361,7 +1361,7 @@ static void dcn20_program_pipe( && !pipe_ctx->top_pipe && !pipe_ctx->prev_odm_pipe) dc->hwss.blank_pixel_data(dc, pipe_ctx, !pipe_ctx->plane_state->visible); -if (pipe_ctx->update_flags.bits.global_sync) +if (pipe_ctx->update_flags.bits.global_sync) { pipe_ctx->stream_res.tg->funcs->program_global_sync( pipe_ctx->stream_res.tg, pipe_ctx->pipe_dlg_param.vready_offset,
@@ -1369,6 +1369,10 @@ 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->set_vtg_params ( + pipe_ctx->stream_res.tg, &pipe_ctx->stream->timing); + } +if (pipe_ctx->update_flags.bits.odm) dc->hwss.update_odm (dc, context, pipe_ctx);
Signature · 6 lines
2.22.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 9/25 drm/amd/display: fix global sync param extraction indexing
In reply to a message not in the archiveFrom: Dmytro Laktyushkin <[email protected]>
dcn20_calculate_dlg_params was incorrectly indexing pipe src and dst structs when extracting global sync params.
--- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +2 -2
@@ -2638,8 +2638,8 @@ void dcn20_calculate_dlg_params(continue ;if (!visited[pipe_idx]) { -display_pipe_source_params_st *src = &pipes[pipe_idx_unsplit].pipe.src; -display_pipe_dest_params_st *dst = &pipes[pipe_idx_unsplit].pipe.dest; +display_pipe_source_params_st *src = &pipes[pipe_idx].pipe.src; +display_pipe_dest_params_st *dst = &pipes[pipe_idx].pipe.dest; dst->vstartup_start = context->bw_ctx.dml.vba.VStartup[pipe_idx_unsplit]; dst->vupdate_offset = context->bw_ctx.dml.vba.VUpdateOffsetPix[pipe_idx_unsplit];
Signature · 6 lines
2.22.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 10/25 drm/amd/display: Handle virtual signal type in disable_link()
In reply to a message not in the archiveFrom: Martin Tsai <[email protected]>
[Why]
The new implementation changed the behavior to allow process setMode to DAL when DAL returns empty mode query for unplugged display. This will trigger additional disable_link().
When unplug HDMI from MST dock, driver will update stream->signal to "Virtual". disable_link() will call disable_output() if the signal type is not DP and induce other displays on MST dock show black screen.
[How]
Don't need to process disable_output() if the signal type is virtual.
--- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link.c +4 -2
@@ -2166,8 +2166,10 @@ static void disable_link(struct dc_link *link, enum signal_type signal) dp_set_fec_ready(link, false); }#endif - }else - link->link_enc->funcs->disable_output (link->link_enc, signal); + }else { +if (signal !=SIGNAL_TYPE_VIRTUAL ) + link->link_enc->funcs->disable_output (link->link_enc, signal); + }if (signal ==SIGNAL_TYPE_DISPLAY_PORT_MST ) {/* MST disable link only when no stream use the link */
Signature · 6 lines
2.22.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 11/25 drm/amd/display: fix i2c wtire mot incorrect issue
In reply to a message not in the archiveFrom: Lewis Huang <[email protected]>
[Why]
I2C write command always send mot = true will cause sink state incorrect.
[How]
1. Remove default i2c write mot = true.
2. Deciding mot flag by is_end_of_payload flag.
--- drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c +2 -2
@@ -523,7 +523,7 @@ bool dal_ddc_service_query_ddc_data(if (write_size !=0 ) { payload.write = true; - payload.mot = true; + payload.mot = false; payload.length = write_size; payload.data = write_buf;
@@ -592,7 +592,7 @@ bool dal_ddc_submit_aux_command(struct ddc_service *ddc, current_payload.i2c_over_aux = payload->i2c_over_aux; current_payload.length = is_end_of_payload ? payload->length - retrieved :DEFAULT_AUX_MAX_DATA_SIZE ; - current_payload.mot = payload->mot ? payload->mot : !is_end_of_payload; + current_payload.mot = !is_end_of_payload; current_payload.reply = payload->reply; current_payload.write = payload->write;
Signature · 6 lines
2.22.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 12/25 drm/amd/display: Separate hardware initialization from creation
In reply to a message not in the archiveFrom: Julian Parkin <[email protected]>
[Why]
Separating the hardware initialization from the creation of the dc structures gives greater flexibility to the dm to override options for debugging.
[How]
Move the hardware initialization call to a new function, dc_hardware_init. No functional change is intended.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 ++ drivers/gpu/drm/amd/display/dc/core/dc.c | 8 +++++--- drivers/gpu/drm/amd/display/dc/dc.h | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2 -0
@@ -711,6 +711,8 @@ static int amdgpu_dm_init(struct amdgpu_device *adev) goto error; } +dc_hardware_init (adev->dm.dc); + adev->dm.freesync_module =mod_freesync_create (adev->dm.dc);if (!adev->dm.freesync_module) { DRM_ERROR(
drivers/gpu/drm/amd/display/dc/core/dc.c +5 -3
@@ -787,9 +787,6 @@ struct dc *dc_create(const struct dc_init_data *init_params)if (false ==construct (dc, init_params)) goto construct_fail; -/*TODO: separate HW and SW initialization*/ - dc->hwss.init_hw (dc); - full_pipe_count = dc->res_pool->pipe_count;if (dc->res_pool->underlay_pipe_index !=NO_UNDERLAY_PIPE ) full_pipe_count--;
@@ -822,6 +819,11 @@ struct dc *dc_create(const struct dc_init_data *init_params)return NULL ; } +void dc_hardware_init (struct dc *dc) +{ + dc->hwss.init_hw (dc); +} +void dc_init_callbacks (struct dc *dc,const struct dc_callback_init *init_params) {
drivers/gpu/drm/amd/display/dc/dc.h +2 -0
@@ -556,6 +556,8 @@ struct dc_callback_init { };struct dc *dc_create (const struct dc_init_data *init_params); +void dc_hardware_init (struct dc *dc); +int dc_get_vmid_use_vector (struct dc *dc);#ifdef CONFIG_DRM_AMD_DC_DCN2_0 void dc_setup_vm_context (struct dc *dc,struct dc_virtual_addr_space_config *va_config,int vmid);
Signature · 6 lines
2.22.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 13/25 drm/amd/display: Do not double-buffer DTO adjustments
In reply to a message not in the archiveFrom: Wesley Chalmers <[email protected]>
[WHY]
When changing DPP global ref clock, DTO adjustments must take effect immediately, or else underflow may occur.
It appears the original decision to double-buffer DTO adjustments was made to prevent underflows that occur when raising DPP ref clock (which is not double-buffered), but that same decision causes similar issues when lowering DPP global ref clock. The better solution is to order the adjustments according to whether clocks are being raised or lowered.
--- .../gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c | 21 ------------------- 1 file changed, 21 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c +0 -21
@@ -117,27 +117,6 @@ void dccg2_get_dccg_ref_freq(struct dccg *dccg,void dccg2_init (struct dccg *dccg) { -struct dcn_dccg *dccg_dcn =TO_DCN_DCCG (dccg); - -// Fallthrough intentional to program all available dpp_dto's -switch (dccg_dcn->base.ctx->dc->res_pool->pipe_count) { -case 6 : -REG_UPDATE (DPPCLK_DTO_CTRL ,DPPCLK_DTO_DB_EN [5 ],1 ); -case 5 : -REG_UPDATE (DPPCLK_DTO_CTRL ,DPPCLK_DTO_DB_EN [4 ],1 ); -case 4 : -REG_UPDATE (DPPCLK_DTO_CTRL ,DPPCLK_DTO_DB_EN [3 ],1 ); -case 3 : -REG_UPDATE (DPPCLK_DTO_CTRL ,DPPCLK_DTO_DB_EN [2 ],1 ); -case 2 : -REG_UPDATE (DPPCLK_DTO_CTRL ,DPPCLK_DTO_DB_EN [1 ],1 ); -case 1 : -REG_UPDATE (DPPCLK_DTO_CTRL ,DPPCLK_DTO_DB_EN [0 ],1 ); -break ; -default : -ASSERT (false); -break ; - } }static const struct dccg_funcs dccg2_funcs = {
Signature · 6 lines
2.22.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 14/25 drm/amd/display: Revert fixup DPP programming sequence
In reply to a message not in the archiveFrom: Wesley Chalmers <[email protected]>
[WHY]
This change was made because DTO programming was double-buffered, which is itself an issue. After deactivating the DTO double buffer, this change becomes unnecessary.
This reverts commit 79a0feda4306a2e46872fffd1e5507b8e1785244
--- .../display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 111 ++++++------------ drivers/gpu/drm/amd/display/dc/core/dc.c | 3 - .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 3 +- .../gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c | 31 +---- .../gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 2 +- .../drm/amd/display/dc/dcn20/dcn20_hwseq.c | 3 +- .../drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +- .../gpu/drm/amd/display/dc/inc/core_types.h | 1 + .../amd/display/dc/inc/hw/clk_mgr_internal.h | 10 +- drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 3 +- 10 files changed, 48 insertions(+), 121 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c +36 -75
@@ -104,6 +104,7 @@ void dcn20_update_clocks_update_dpp_dto(struct clk_mgr_internal *clk_mgr, {int i; + clk_mgr->dccg->ref_dppclk = clk_mgr->base.clks.dppclk_khz;for (i =0 ; i < clk_mgr->base.ctx->dc->res_pool->pipe_count; i++) {int dpp_inst, dppclk_khz;
@@ -113,75 +114,28 @@ void dcn20_update_clocks_update_dpp_dto(struct clk_mgr_internal *clk_mgr, dpp_inst = context->res_ctx.pipe_ctx[i].plane_res.dpp->inst; dppclk_khz = context->res_ctx.pipe_ctx[i].plane_res.bw.dppclk_khz; clk_mgr->dccg->funcs->update_dpp_dto ( - clk_mgr->dccg, dpp_inst, dppclk_khz, false); + clk_mgr->dccg, dpp_inst, dppclk_khz); } } -static void update_global_dpp_clk (struct clk_mgr_internal *clk_mgr,unsigned int khz) +void dcn20_update_clocks_update_dentist (struct clk_mgr_internal *clk_mgr) {int dpp_divider =DENTIST_DIVIDER_RANGE_SCALE_FACTOR - * clk_mgr->dentist_vco_freq_khz / khz; - -uint32_t dppclk_wdivider =dentist_get_did_from_divider (dpp_divider); - -REG_UPDATE (DENTIST_DISPCLK_CNTL , -DENTIST_DPPCLK_WDIVIDER , dppclk_wdivider); -REG_WAIT (DENTIST_DISPCLK_CNTL ,DENTIST_DPPCLK_CHG_DONE ,1 ,5 ,100 ); -} - -static void update_display_clk (struct clk_mgr_internal *clk_mgr,unsigned int khz) -{ + * clk_mgr->dentist_vco_freq_khz / clk_mgr->base.clks.dppclk_khz;int disp_divider =DENTIST_DIVIDER_RANGE_SCALE_FACTOR - * clk_mgr->dentist_vco_freq_khz / khz; + * clk_mgr->dentist_vco_freq_khz / clk_mgr->base.clks.dispclk_khz; +uint32_t dppclk_wdivider =dentist_get_did_from_divider (dpp_divider);uint32_t dispclk_wdivider =dentist_get_did_from_divider (disp_divider);REG_UPDATE (DENTIST_DISPCLK_CNTL ,DENTIST_DISPCLK_WDIVIDER , dispclk_wdivider); +// REG_WAIT(DENTIST_DISPCLK_CNTL, DENTIST_DISPCLK_CHG_DONE, 1, 5, 100); +REG_UPDATE (DENTIST_DISPCLK_CNTL , +DENTIST_DPPCLK_WDIVIDER , dppclk_wdivider); +REG_WAIT (DENTIST_DISPCLK_CNTL ,DENTIST_DPPCLK_CHG_DONE ,1 ,5 ,100 ); } -static void request_voltage_and_program_disp_clk (struct clk_mgr *clk_mgr_base,unsigned int khz) -{ -struct clk_mgr_internal *clk_mgr =TO_CLK_MGR_INTERNAL (clk_mgr_base); -struct dc *dc = clk_mgr_base->ctx->dc; -struct pp_smu_funcs_nv *pp_smu =NULL ; -bool going_up = clk_mgr->base.clks.dispclk_khz < khz; - -if (dc->res_pool->pp_smu) - pp_smu = &dc->res_pool->pp_smu->nv_funcs; - - clk_mgr->base.clks.dispclk_khz = khz; - -if (going_up && pp_smu && pp_smu->set_voltage_by_freq) - pp_smu->set_voltage_by_freq (&pp_smu->pp_smu,PP_SMU_NV_DISPCLK , clk_mgr_base->clks.dispclk_khz /1000 ); - -update_display_clk (clk_mgr, khz); - -if (!going_up && pp_smu && pp_smu->set_voltage_by_freq) - pp_smu->set_voltage_by_freq (&pp_smu->pp_smu,PP_SMU_NV_DISPCLK , clk_mgr_base->clks.dispclk_khz /1000 ); -} - -static void request_voltage_and_program_global_dpp_clk (struct clk_mgr *clk_mgr_base,unsigned int khz) -{ -struct clk_mgr_internal *clk_mgr =TO_CLK_MGR_INTERNAL (clk_mgr_base); -struct dc *dc = clk_mgr_base->ctx->dc; -struct pp_smu_funcs_nv *pp_smu =NULL ; -bool going_up = clk_mgr->base.clks.dppclk_khz < khz; - -if (dc->res_pool->pp_smu) - pp_smu = &dc->res_pool->pp_smu->nv_funcs; - - clk_mgr->base.clks.dppclk_khz = khz; - clk_mgr->dccg->ref_dppclk = khz; - -if (going_up && pp_smu && pp_smu->set_voltage_by_freq) - pp_smu->set_voltage_by_freq (&pp_smu->pp_smu,PP_SMU_NV_PIXELCLK , clk_mgr_base->clks.dppclk_khz /1000 ); - -update_global_dpp_clk (clk_mgr, khz); - -if (!going_up && pp_smu && pp_smu->set_voltage_by_freq) - pp_smu->set_voltage_by_freq (&pp_smu->pp_smu,PP_SMU_NV_PIXELCLK , clk_mgr_base->clks.dppclk_khz /1000 ); -} void dcn2_update_clocks(struct clk_mgr *clk_mgr_base, struct dc_state *context,
@@ -192,8 +146,10 @@ void dcn2_update_clocks(struct clk_mgr *clk_mgr_base,struct dc *dc = clk_mgr_base->ctx->dc;struct pp_smu_funcs_nv *pp_smu =NULL ;int display_count; +bool update_dppclk = false;bool update_dispclk = false;bool enter_display_off = false; +bool dpp_clock_lowered = false;struct dmcu *dmcu = clk_mgr_base->ctx->dc->res_pool->dmcu;bool force_reset = false;
@@ -250,12 +206,10 @@ void dcn2_update_clocks(struct clk_mgr *clk_mgr_base,if (should_update_pstate_support (safe_to_lower, new_clocks->p_state_change_support, clk_mgr_base->clks.p_state_change_support)) { clk_mgr_base->clks.prev_p_state_change_support = clk_mgr_base->clks.p_state_change_support; - clk_mgr_base->clks.p_state_change_support = new_clocks->p_state_change_support;if (pp_smu && pp_smu->set_pstate_handshake_support) pp_smu->set_pstate_handshake_support (&pp_smu->pp_smu, clk_mgr_base->clks.p_state_change_support); } - clk_mgr_base->clks.prev_p_state_change_support = clk_mgr_base->clks.p_state_change_support;if (should_set_clock (safe_to_lower, new_clocks->dramclk_khz, clk_mgr_base->clks.dramclk_khz)) { clk_mgr_base->clks.dramclk_khz = new_clocks->dramclk_khz;
@@ -263,28 +217,35 @@ void dcn2_update_clocks(struct clk_mgr *clk_mgr_base, pp_smu->set_hard_min_uclk_by_freq (&pp_smu->pp_smu, clk_mgr_base->clks.dramclk_khz /1000 ); } -if (dc->config.forced_clocks == false) { -// First update display clock -if (should_set_clock (safe_to_lower, new_clocks->dispclk_khz, clk_mgr_base->clks.dispclk_khz)) -request_voltage_and_program_disp_clk (clk_mgr_base, new_clocks->dispclk_khz); +if (should_set_clock (safe_to_lower, new_clocks->dppclk_khz, clk_mgr->base.clks.dppclk_khz)) { +if (clk_mgr->base.clks.dppclk_khz > new_clocks->dppclk_khz) + dpp_clock_lowered = true; + clk_mgr->base.clks.dppclk_khz = new_clocks->dppclk_khz; -// Updating DPP clock requires some more logic -if (!safe_to_lower) { -// For pre-programming, we need to make sure any DPP clock that will go up has to go up +if (pp_smu && pp_smu->set_voltage_by_freq) + pp_smu->set_voltage_by_freq (&pp_smu->pp_smu,PP_SMU_NV_PIXELCLK , clk_mgr_base->clks.dppclk_khz /1000 ); -// First raise the global reference if needed -if (new_clocks->dppclk_khz > clk_mgr_base->clks.dppclk_khz) -request_voltage_and_program_global_dpp_clk (clk_mgr_base, new_clocks->dppclk_khz); + update_dppclk = true; + } -// Then raise any dividers that need raising -dcn20_update_clocks_update_dpp_dto (clk_mgr, context); - }else { -// For post-programming, we can lower ref clk if needed, and unconditionally set all the DTOs +if (should_set_clock (safe_to_lower, new_clocks->dispclk_khz, clk_mgr_base->clks.dispclk_khz)) { + clk_mgr_base->clks.dispclk_khz = new_clocks->dispclk_khz; +if (pp_smu && pp_smu->set_voltage_by_freq) + pp_smu->set_voltage_by_freq (&pp_smu->pp_smu,PP_SMU_NV_DISPCLK , clk_mgr_base->clks.dispclk_khz /1000 ); -if (new_clocks->dppclk_khz < clk_mgr_base->clks.dppclk_khz) -request_voltage_and_program_global_dpp_clk (clk_mgr_base, new_clocks->dppclk_khz); + update_dispclk = true; + } +if (dc->config.forced_clocks == false || (force_reset && safe_to_lower)) { +if (dpp_clock_lowered) { +// if clock is being lowered, increase DTO before lowering refclk dcn20_update_clocks_update_dpp_dto (clk_mgr, context); - +dcn20_update_clocks_update_dentist (clk_mgr); + }else { +// if clock is being raised, increase refclk before lowering DTO +if (update_dppclk || update_dispclk) +dcn20_update_clocks_update_dentist (clk_mgr); +if (update_dppclk) +dcn20_update_clocks_update_dpp_dto (clk_mgr, context); } } if (update_dispclk &&
drivers/gpu/drm/amd/display/dc/core/dc.c +0 -3
@@ -1643,9 +1643,6 @@ enum surface_update_type dc_check_update_surfaces_for_stream( updates[i].surface->update_flags.raw =0xFFFFFFFF ; } -if (type ==UPDATE_TYPE_FAST &&memcmp (&dc->current_state->bw_ctx.bw.dcn.clk, &dc->clk_mgr->clks, offsetof(struct dc_clocks , prev_p_state_change_support)) !=0 ) - dc->optimized_required = true; -return type; }
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +1 -2
@@ -2303,8 +2303,7 @@ void update_dchubp_dpp( dc->res_pool->dccg->funcs->update_dpp_dto ( dc->res_pool->dccg, dpp->inst, - pipe_ctx->plane_res.bw.dppclk_khz, - false); + pipe_ctx->plane_res.bw.dppclk_khz); else dc->clk_mgr->clks.dppclk_khz = should_divided_by_2 ? dc->clk_mgr->clks.dispclk_khz / 2 :
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c +4 -27
@@ -42,16 +42,12 @@#define DC_LOGGER \ dccg->ctx->logger -void dccg2_update_dpp_dto (struct dccg *dccg, -int dpp_inst, -int req_dppclk, -bool reduce_divider_only) +void dccg2_update_dpp_dto (struct dccg *dccg,int dpp_inst,int req_dppclk) {struct dcn_dccg *dccg_dcn =TO_DCN_DCCG (dccg);if (dccg->ref_dppclk && req_dppclk) {int ref_dppclk = dccg->ref_dppclk; -int current_phase, current_modulo;ASSERT (req_dppclk <= ref_dppclk);/* need to clamp to 8 bits */
@@ -63,28 +59,9 @@ void dccg2_update_dpp_dto(struct dccg *dccg,if (req_dppclk > ref_dppclk) req_dppclk = ref_dppclk; } - -REG_GET_2 (DPPCLK_DTO_PARAM [dpp_inst], -DPPCLK0_DTO_PHASE , ¤t_phase, -DPPCLK0_DTO_MODULO , ¤t_modulo); - -if (reduce_divider_only) { -// requested phase/modulo greater than current -if (req_dppclk * current_modulo >= current_phase * ref_dppclk) { -REG_SET_2 (DPPCLK_DTO_PARAM [dpp_inst],0 , -DPPCLK0_DTO_PHASE , req_dppclk, -DPPCLK0_DTO_MODULO , ref_dppclk); - }else { -REG_SET_2 (DPPCLK_DTO_PARAM [dpp_inst],0 , -DPPCLK0_DTO_PHASE , current_phase, -DPPCLK0_DTO_MODULO , current_modulo); - } - }else { -REG_SET_2 (DPPCLK_DTO_PARAM [dpp_inst],0 , -DPPCLK0_DTO_PHASE , req_dppclk, -DPPCLK0_DTO_MODULO , ref_dppclk); - } - +REG_SET_2 (DPPCLK_DTO_PARAM [dpp_inst],0 , +DPPCLK0_DTO_PHASE , req_dppclk, +DPPCLK0_DTO_MODULO , ref_dppclk);REG_UPDATE (DPPCLK_DTO_CTRL ,DPPCLK_DTO_ENABLE [dpp_inst],1 ); }else {
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h +1 -1
@@ -97,7 +97,7 @@ struct dcn_dccg {const struct dccg_mask *dccg_mask; }; -void dccg2_update_dpp_dto (struct dccg *dccg,int dpp_inst,int req_dppclk,bool raise_divider_only); +void dccg2_update_dpp_dto (struct dccg *dccg,int dpp_inst,int req_dppclk); void dccg2_get_dccg_ref_freq(struct dccg *dccg, unsigned int xtalin_freq_inKhz,
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +1 -2
@@ -1208,8 +1208,7 @@ static void dcn20_update_dchubp_dpp( dc->res_pool->dccg->funcs->update_dpp_dto ( dc->res_pool->dccg, dpp->inst, - pipe_ctx->plane_res.bw.dppclk_khz, - false); + pipe_ctx->plane_res.bw.dppclk_khz); }/* TODO: Need input parameter to tell current DCHUB pipe tie to which OTG
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +1 -1
@@ -2622,7 +2622,7 @@ void dcn20_calculate_dlg_params( context->bw_ctx.bw.dcn.clk.socclk_khz = context->bw_ctx.dml.vba.SOCCLK *1000 ; context->bw_ctx.bw.dcn.clk.dramclk_khz = context->bw_ctx.dml.vba.DRAMSpeed *1000 /16 ; context->bw_ctx.bw.dcn.clk.dcfclk_deep_sleep_khz = context->bw_ctx.dml.vba.DCFCLKDeepSleep *1000 ; - context->bw_ctx.bw.dcn.clk.fclk_khz =0 ; + context->bw_ctx.bw.dcn.clk.fclk_khz = context->bw_ctx.dml.vba.FabricClock *1000 ; context->bw_ctx.bw.dcn.clk.p_state_change_support = context->bw_ctx.dml.vba.DRAMClockChangeSupport[vlevel][context->bw_ctx.dml.vba.maxMpcComb] != dm_dram_clock_change_unsupported;
drivers/gpu/drm/amd/display/dc/inc/core_types.h +1 -0
@@ -231,6 +231,7 @@ struct resource_pool {struct dcn_fe_bandwidth {int dppclk_khz; + };struct stream_resource {
drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr_internal.h +2 -8
@@ -281,14 +281,8 @@ static inline bool should_set_clock(bool safe_to_lower, int calc_clk, int cur_clstatic inline bool should_update_pstate_support (bool safe_to_lower,bool calc_support,bool cur_support) { -if (cur_support != calc_support) { -if (calc_support == true && safe_to_lower) -return true; -else if (calc_support == false && !safe_to_lower) -return true; - } - -return false; +// Whenever we are transitioning pstate support, we always want to notify prior to committing state +return (calc_support != cur_support) ? !safe_to_lower : false; } int clk_mgr_helper_get_active_display_cnt(
drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h +1 -2
@@ -38,8 +38,7 @@ struct dccg {struct dccg_funcs {void (*update_dpp_dto)(struct dccg *dccg,int dpp_inst, -int req_dppclk, -bool reduce_divider_only); +int req_dppclk);void (*get_dccg_ref_freq)(struct dccg *dccg,unsigned int xtalin_freq_inKhz,unsigned int *dccg_ref_freq_inKhz);
Signature · 6 lines
2.22.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 15/25 drm/amd/display: set minimum abm backlight level
In reply to a message not in the archiveFrom: Anthony Koo <[email protected]>
[Why]
A lot of the time, the backlight characteristic curve maps min backlight to a non-zero value.
But there are cases where we want the curve to intersect at 0. In this scenario even if OS never asks to set 0% backlight, the ABM reduction can result in backlight being lowered close to 0. This particularly can cause problems in some LED drivers, and in general just looks like backlight is completely off.
[How]
Add default cap to disallow backlight from dropping below 1% even after ABM reduction is applied.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 ++ .../amd/display/modules/power/power_helpers.c | 77 +++++++++++-------- .../amd/display/modules/power/power_helpers.h | 1 + 3 files changed, 49 insertions(+), 34 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +5 -0
@@ -940,6 +940,11 @@ static int dm_late_init(void *handle) params.backlight_lut_array_size =16 ; params.backlight_lut_array = linear_lut; +/* Min backlight level after ABM reduction, Don't allow below 1% +* 0xFFFF x 0.01 = 0x28F +*/ + params.min_abm_backlight =0x28F ; +/* todo will enable for navi10 */ if (adev->asic_type <=CHIP_RAVEN ) { ret =dmcu_load_iram (dmcu, params);
drivers/gpu/drm/amd/display/modules/power/power_helpers.c +43 -34
121 lines not on this page · raw message
drivers/gpu/drm/amd/display/modules/power/power_helpers.h +1 -0
@@ -38,6 +38,7 @@ struct dmcu_iram_parameters {unsigned int backlight_lut_array_size;unsigned int backlight_ramping_reduction;unsigned int backlight_ramping_start; +unsigned int min_abm_backlight;unsigned int set; };
Signature · 6 lines
2.22.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 16/25 drm/amd/display: Set number of pipes to 1 if the second pipe was disabled
In reply to a message not in the archiveFrom: Nikola Cornij <[email protected]>
[why]
Some ODM-related register settings are inconsistently updated by VBIOS, causing the state in DC to be invalid, which would then end up crashing in certain use-cases (such as disable/enable device).
[how]
Check the enabled status of the second pipe when determining the number of OPTC sources. If the second pipe is disabled, set the number of sources to 1 regardless of other settings (that may not be updated correctly).
--- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c +4 -0
@@ -287,6 +287,10 @@ void optc2_get_optc_source(struct timing_generator *optc, *num_of_src_opp =2 ; else *num_of_src_opp =1 ; + +/* Work around VBIOS not updating OPTC_NUM_OF_INPUT_SEGMENT */ +if (*src_opp_id_1 ==0xf ) + *num_of_src_opp =1 ; } void optc2_set_dwb_source(struct timing_generator *optc,
Signature · 6 lines
2.22.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 17/25 drm/amd/display: Optimize clocks on clock change
In reply to a message not in the archiveFrom: Wesley Chalmers <[email protected]>
[WHY]
Presently, there is no way for clocks to be lowered, only raised.
[HOW]
Compare clock status against previous known clock status, and optimize if different.
This requires re-ordering the layout of the dc_clocks structure, as the current ordering allows identical clock states to appear different.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 3 +++ drivers/gpu/drm/amd/display/dc/dc.h | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +3 -0
@@ -1643,6 +1643,9 @@ enum surface_update_type dc_check_update_surfaces_for_stream( updates[i].surface->update_flags.raw =0xFFFFFFFF ; } +if (type ==UPDATE_TYPE_FAST &&memcmp (&dc->current_state->bw_ctx.bw.dcn.clk, &dc->clk_mgr->clks, offsetof(struct dc_clocks , prev_p_state_change_support)) !=0 ) + dc->optimized_required = true; +return type; }
drivers/gpu/drm/amd/display/dc/dc.h +4 -4
@@ -252,11 +252,7 @@ enum wm_report_mode {*/ struct dc_clocks {int dispclk_khz; -int max_supported_dppclk_khz; -int max_supported_dispclk_khz;int dppclk_khz; -int bw_dppclk_khz;/*a copy of dppclk_khz*/ -int bw_dispclk_khz;int dcfclk_khz;int socclk_khz;int dcfclk_deep_sleep_khz;
@@ -270,6 +266,10 @@ struct dc_clocks {* optimization required */ bool prev_p_state_change_support; +int max_supported_dppclk_khz; +int max_supported_dispclk_khz; +int bw_dppclk_khz;/*a copy of dppclk_khz*/ +int bw_dispclk_khz; };struct dc_bw_validation_profile {
Signature · 6 lines
2.22.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 18/25 drm/amd/display: update odm mode validation to be in line with policy
In reply to a message not in the archiveFrom: Dmytro Laktyushkin <[email protected]>
Previously 8k30 worked with dsc and odm combine due to a workaround that ran the formula a second time with dsc support enable should dsc validation fail. This worked when clocks were low enough for formula to enable odm to lower voltage, however now broke due to increased clocks.
This change updates the ODM combine policy within the formula to properly reflect our current policy within DC, only enabling ODM when we have to, as well as adding a check for viewport width when dsc is enabled.
As a side effect the redundant call to dml when odm is required is now unnecessary.
--- .../drm/amd/display/dc/dcn20/dcn20_resource.c | 22 +------------------ .../dc/dml/dcn20/display_mode_vba_20v2.c | 9 +++++++- 2 files changed, 9 insertions(+), 22 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +1 -21
@@ -2246,11 +2246,7 @@ bool dcn20_fast_validate_bw(bool out = false;int pipe_cnt, i, pipe_idx, vlevel, vlevel_unsplit; -bool odm_capable = context->bw_ctx.dml.ip.odm_capable;bool force_split = false; -#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT -bool failed_non_odm_dsc = false; -#endif int split_threshold = dc->res_pool->pipe_count /2 ;bool avoid_split = dc->debug.pipe_split_policy !=MPC_SPLIT_DYNAMIC ;
@@ -2327,24 +2323,8 @@ bool dcn20_fast_validate_bw( goto validate_out; } - context->bw_ctx.dml.ip.odm_capable =0 ; - vlevel =dml_get_voltage_level (&context->bw_ctx.dml, pipes, pipe_cnt); - context->bw_ctx.dml.ip.odm_capable = odm_capable; - -#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT -/* 1 dsc per stream dsc validation */ -if (vlevel <= context->bw_ctx.dml.soc.num_states) -if (!dcn20_validate_dsc (dc, context)) { - failed_non_odm_dsc = true; - vlevel = context->bw_ctx.dml.soc.num_states +1 ; - } -#endif - -if (vlevel > context->bw_ctx.dml.soc.num_states && odm_capable) - vlevel =dml_get_voltage_level (&context->bw_ctx.dml, pipes, pipe_cnt); -if (vlevel > context->bw_ctx.dml.soc.num_states) goto validate_fail;
@@ -2480,7 +2460,7 @@ bool dcn20_fast_validate_bw( }#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT /* Actual dsc count per stream dsc validation*/ -if (failed_non_odm_dsc && !dcn20_validate_dsc (dc, context)) { +if (!dcn20_validate_dsc (dc, context)) { context->bw_ctx.dml.vba.ValidationStatus[context->bw_ctx.dml.vba.soc.num_states] =DML_FAIL_DSC_VALIDATION_FAILURE ; goto validate_fail;
drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c +8 -1
@@ -38,6 +38,7 @@#define BPP_INVALID 0#define BPP_BLENDED_PIPE 0xffffffff +#define DCN20_MAX_DSC_IMAGE_WIDTH 5184 static double adjust_ReturnBW( struct display_mode_lib *mode_lib,
@@ -3901,6 +3902,10 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode mode_lib->vba.MaximumSwathWidthInLineBuffer); }for (i =0 ; i <= mode_lib->vba.soc.num_states; i++) { +double MaxMaxDispclkRoundedDown =RoundToDFSGranularityDown ( + mode_lib->vba.MaxDispclk[mode_lib->vba.soc.num_states], + mode_lib->vba.DISPCLKDPPCLKVCOSpeed); +for (j =0 ; j <2 ; j++) { mode_lib->vba.MaxDispclkRoundedDownToDFSGranularity = RoundToDFSGranularityDown( mode_lib->vba.MaxDispclk[i],
@@ -3925,7 +3930,9 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode && i == mode_lib->vba.soc.num_states) mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine = mode_lib->vba.PixelClock[k] /2 * (1 + mode_lib->vba.DISPCLKDPPCLKDSCCLKDownSpreading /100.0 ); -if (mode_lib->vba.ODMCapability == false || mode_lib->vba.PlaneRequiredDISPCLKWithoutODMCombine <= mode_lib->vba.MaxDispclkRoundedDownToDFSGranularity) { +if (mode_lib->vba.ODMCapability == false || + (locals->PlaneRequiredDISPCLKWithoutODMCombine <= MaxMaxDispclkRoundedDown + && (!locals->DSCEnabled[k] || locals->HActive[k] <=DCN20_MAX_DSC_IMAGE_WIDTH ))) { locals->ODMCombineEnablePerState[i][k] = false; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithoutODMCombine; }else {
Signature · 6 lines
2.22.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 19/25 drm/amd/display: enable single dp seamless boot
In reply to a message not in the archiveFrom: Martin Leung <[email protected]>
[why]
seamless boot didn't work for non edp's before
[how]
removed edp-specific code, made dp read uefi-set link settings. Also fixed a hubbub code line to be consistent with usage of function.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 30 +++++----- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 57 ++++++++++++------- .../gpu/drm/amd/display/dc/core/dc_resource.c | 26 ++++----- .../drm/amd/display/dc/dcn20/dcn20_hubbub.c | 5 +- 4 files changed, 71 insertions(+), 47 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +17 -13
@@ -971,29 +971,33 @@ bool dc_validate_seamless_boot_timing(const struct dc *dc, {struct timing_generator *tg;struct dc_link *link = sink->link; -unsigned int enc_inst, tg_inst; +unsigned int enc_inst, tg_inst, i; + +// Seamless port only support single DP and EDP so far +if (sink->sink_signal !=SIGNAL_TYPE_DISPLAY_PORT && + sink->sink_signal !=SIGNAL_TYPE_EDP ) +return false;/* Check for enabled DIG to identify enabled display */ if (!link->link_enc->funcs->is_dig_enabled (link->link_enc))return false; -/* Check for which front end is used by this encoder. -* Note the inst is 1 indexed, where 0 is undefined. -* Note that DIG_FE can source from different OTG but our -* current implementation always map 1-to-1, so this code makes -* the same assumption and doesn't check OTG source. -*/ enc_inst = link->link_enc->funcs->get_dig_frontend (link->link_enc); -/* Instance should be within the range of the pool */ -if (enc_inst >= dc->res_pool->pipe_count) +if (enc_inst ==ENGINE_ID_UNKNOWN )return false; -if (enc_inst >= dc->res_pool->stream_enc_count) -return false; +for (i =0 ; i < dc->res_pool->stream_enc_count; i++) { +if (dc->res_pool->stream_enc[i]->id == enc_inst) { + tg_inst = dc->res_pool->stream_enc[i]->funcs->dig_source_otg ( + dc->res_pool->stream_enc[i]); +break ; + } + } - tg_inst = dc->res_pool->stream_enc[enc_inst]->funcs->dig_source_otg ( - dc->res_pool->stream_enc[enc_inst]); +// tg_inst not found +if (i == dc->res_pool->stream_enc_count) +return false;if (tg_inst >= dc->res_pool->timing_generator_count)return false;
drivers/gpu/drm/amd/display/dc/core/dc_link.c +38 -19
99 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +13 -13
@@ -1845,28 +1845,28 @@ static int acquire_resource_from_hw_enabled_state( struct dc_stream_state *stream) {struct dc_link *link = stream->link; -unsigned int inst, tg_inst; +unsigned int inst, tg_inst, i;/* Check for enabled DIG to identify enabled display */ if (!link->link_enc->funcs->is_dig_enabled (link->link_enc))return -1 ; -/* Check for which front end is used by this encoder. -* Note the inst is 1 indexed, where 0 is undefined. -* Note that DIG_FE can source from different OTG but our -* current implementation always map 1-to-1, so this code makes -* the same assumption and doesn't check OTG source. -*/ inst = link->link_enc->funcs->get_dig_frontend (link->link_enc); -/* Instance should be within the range of the pool */ -if (inst >= pool->pipe_count) -return -1 ; +if (inst ==ENGINE_ID_UNKNOWN ) +return false; -if (inst >= pool->stream_enc_count) -return -1 ; +for (i =0 ; i < pool->stream_enc_count; i++) { +if (pool->stream_enc[i]->id == inst) { + tg_inst = pool->stream_enc[i]->funcs->dig_source_otg ( + pool->stream_enc[i]); +break ; + } + } - tg_inst = pool->stream_enc[inst]->funcs->dig_source_otg (pool->stream_enc[inst]); +// tg_inst not found +if (i == pool->stream_enc_count) +return false;if (tg_inst >= pool->timing_generator_count)return false;
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c +3 -2
@@ -588,7 +588,7 @@ static void hubbub2_program_watermarks( DCHUBBUB_ARB_SAT_LEVEL, 60 * refclk_mhz);REG_UPDATE (DCHUBBUB_ARB_DF_REQ_OUTSTAND ,DCHUBBUB_ARB_MIN_REQ_OUTSTAND ,180 ); -hubbub1_allow_self_refresh_control (hubbub, !hubbub->ctx->dc->debug.disable_stutter); + hubbub->funcs->allow_self_refresh_control (hubbub, !hubbub->ctx->dc->debug.disable_stutter); }static const struct hubbub_funcs hubbub2_funcs = {
@@ -600,7 +600,8 @@ static const struct hubbub_funcs hubbub2_funcs = { .get_dcc_compression_cap = hubbub2_get_dcc_compression_cap, .wm_read_state = hubbub2_wm_read_state, .get_dchub_ref_freq = hubbub2_get_dchub_ref_freq, - .program_watermarks = hubbub2_program_watermarks + .program_watermarks = hubbub2_program_watermarks, + .allow_self_refresh_control = hubbub1_allow_self_refresh_control }; void hubbub2_construct(struct dcn20_hubbub *hubbub,
Signature · 6 lines
2.22.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 20/25 drm/amd/display: 3.4.51
In reply to a message not in the archiveFrom: Aric Cyr <[email protected]>
--- 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
@@ -39,7 +39,7 @@#include "inc/hw/dmcu.h" #include "dml/display_mode_lib.h" -#define DC_VER "3.2.50" +#define DC_VER "3.2.51"#define MAX_SURFACES 3#define MAX_PLANES 6
Signature · 6 lines
2.22.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 21/25 drm/amd/display: Add missing HBM support and raise Vega20's uclk.
In reply to a message not in the archiveFrom: Zhan Liu <[email protected]>
[Why]
When more than 2 displays are connected to the graphics card, only the minimum memory clock is needed. However, when more displays are connected, the minimum memory clock is not sufficient enough to support the overwhelming bandwidth. System will hang under this circumstance.
Also, the old code didn't address HBM cards, which has 2 pseudo channels. We need to add the HBM part here.
[How]
When graphics card connects to 2 or more displays, switch to high memory clock. Also, choose memory multiplier based on whether its regular DRAM or HBM.
--- .../display/dc/clk_mgr/dce110/dce110_clk_mgr.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c +16 -2
@@ -174,6 +174,10 @@ void dce11_pplib_apply_display_requirements( struct dc_state *context) {struct dm_pp_display_configuration *pp_display_cfg = &context->pp_display_cfg; +int memory_type_multiplier =MEMORY_TYPE_MULTIPLIER_CZ ; + +if (dc->bw_vbios && dc->bw_vbios->memory_type == bw_def_hbm) + memory_type_multiplier =MEMORY_TYPE_HBM ; pp_display_cfg->all_displays_in_sync = context->bw_ctx.bw.dce.all_displays_in_sync;
@@ -186,8 +190,18 @@ void dce11_pplib_apply_display_requirements( pp_display_cfg->cpu_pstate_separation_time = context->bw_ctx.bw.dce.blackout_recovery_time_us; - pp_display_cfg->min_memory_clock_khz = context->bw_ctx.bw.dce.yclk_khz - /MEMORY_TYPE_MULTIPLIER_CZ ; +/* +* TODO: determine whether the bandwidth has reached memory's limitation +* , then change minimum memory clock based on real-time bandwidth +* limitation. +*/ +if (ASICREV_IS_VEGA20_P (dc->ctx->asic_id.hw_internal_rev) && (context->stream_count >=2 )) { + pp_display_cfg->min_memory_clock_khz =max (pp_display_cfg->min_memory_clock_khz, + (uint32_t ) (dc->bw_vbios->high_yclk.value / memory_type_multiplier /10000 )); + }else { + pp_display_cfg->min_memory_clock_khz = context->bw_ctx.bw.dce.yclk_khz + / memory_type_multiplier; + } pp_display_cfg->min_engine_clock_khz = determine_sclk_from_bounding_box( dc,
Signature · 6 lines
2.22.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 22/25 drm/amd/display: 3.4.51.1
In reply to a message not in the archiveFrom: Aric Cyr <[email protected]>
--- 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
@@ -39,7 +39,7 @@#include "inc/hw/dmcu.h" #include "dml/display_mode_lib.h" -#define DC_VER "3.2.51" +#define DC_VER "3.2.51.1"#define MAX_SURFACES 3#define MAX_PLANES 6
Signature · 6 lines
2.22.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH 22/25] drm/amd/display: 3.4.51.1
Looks like the subject is wrong for this and patch 20:
s/3.4/3.2/
Will modify before merge.
Leo
Quoted 14 lines · On 2019-09-10 9:54 a.m., [email protected] wrote:
From: Aric Cyr <[email protected]>
Signed-off-by Aric Cyr <[email protected]>Acked-by Leo Li <[email protected]>--- drivers/gpu/drm/amd/display/dc/dc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/amd/display/dc/dc.h +0
-0
drivers/gpu/drm/amd/display/dc/dc.h line 45
Quoted 8 lines
drivers/gpu/drm/amd/display/dc/dc.h +1
-1@@ -39,7 +39,7 @@#include "inc/hw/dmcu.h" #include "dml/display_mode_lib.h" -#define DC_VER "3.2.51" +#define DC_VER "3.2.51.1"#define MAX_SURFACES 3#define MAX_PLANES 6
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 23/25 drm/amd/display: fix use of uninitialized variable
In reply to a message not in the archiveFrom: Martin Leung <[email protected]>
tg_inst may be used uninitialized, so initialize it to 0.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +1 -1
@@ -971,7 +971,7 @@ bool dc_validate_seamless_boot_timing(const struct dc *dc, {struct timing_generator *tg;struct dc_link *link = sink->link; -unsigned int enc_inst, tg_inst, i; +unsigned int i, enc_inst, tg_inst =0 ;// Seamless port only support single DP and EDP so far if (sink->sink_signal != SIGNAL_TYPE_DISPLAY_PORT &&
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +1 -1
@@ -1845,7 +1845,7 @@ static int acquire_resource_from_hw_enabled_state( struct dc_stream_state *stream) {struct dc_link *link = stream->link; -unsigned int inst, tg_inst, i; +unsigned int i, inst, tg_inst =0 ;/* Check for enabled DIG to identify enabled display */ if (!link->link_enc->funcs->is_dig_enabled (link->link_enc))
Signature · 6 lines
2.22.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 24/25 drm/amd/display: Add detile buffer size for DCN20
In reply to a message not in the archiveFrom: Dmytro Laktyushkin <[email protected]>
Detile buffer size affects dcc caps and therefore needs to be corrected for each ip.
--- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 7 ++++--- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.h | 1 + 2 files changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c +4 -3
@@ -186,14 +186,13 @@ static void hubbub2_get_blk256_size(unsigned int *blk256_width, unsigned int *bl }static void hubbub2_det_request_size ( +unsigned int detile_buf_size,unsigned int height,unsigned int width,unsigned int bpe,bool *req128_horz_wc,bool *req128_vert_wc) { -unsigned int detile_buf_size =164 *1024 ;/* 164KB for DCN1.0 */ -unsigned int blk256_height =0 ;unsigned int blk256_width =0 ;unsigned int swath_bytes_horz_wc, swath_bytes_vert_wc;
@@ -236,7 +235,8 @@ bool hubbub2_get_dcc_compression_cap(struct hubbub *hubbub, &segment_order_horz, &segment_order_vert))return false; -hubbub2_det_request_size (input->surface_size.height, input->surface_size.width, +hubbub2_det_request_size (TO_DCN20_HUBBUB (hubbub)->detile_buf_size, + input->surface_size.height, input->surface_size.width, bpe, &req128_horz_wc, &req128_vert_wc);if (!req128_horz_wc && !req128_vert_wc) {
@@ -619,4 +619,5 @@ void hubbub2_construct(struct dcn20_hubbub *hubbub, hubbub->masks = hubbub_mask; hubbub->debug_test_index_pstate =0xB ; + hubbub->detile_buf_size =164 *1024 ;/* 164KB for DCN2.0 */ }
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.h +1 -0
@@ -81,6 +81,7 @@ struct dcn20_hubbub {unsigned int debug_test_index_pstate;struct dcn_watermark_set watermarks;struct dcn20_vmid vmid[16 ]; +unsigned int detile_buf_size; }; void hubbub2_construct(struct dcn20_hubbub *hubbub,
Signature · 6 lines
2.22.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 25/25 drm/amd/display: Improve LFC behaviour
In reply to a message not in the archiveFrom: Aric Cyr <[email protected]>
[Why]
There can be some unsynchronized frames when entering/exiting LFC. This may cause tearing or stuttering at such transitions.
[How]
Add a enter/exit margin to algorithm to smoothly transition into and out of LFC without desynchronizing frames.
--- .../amd/display/modules/freesync/freesync.c | 32 +++++++++++-------- .../amd/display/modules/inc/mod_freesync.h | 1 + 2 files changed, 20 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/display/modules/freesync/freesync.c +19 -13
@@ -35,8 +35,8 @@#define STATIC_SCREEN_RAMP_DELTA_REFRESH_RATE_PER_FRAME ((1000 / 60) * 65)/* Number of elements in the render times cache array */ #define RENDER_TIMES_MAX_COUNT 10 -/* Threshold to exit BTR (to avoid frequent enter-exits at the lower limit) */ -#define BTR_EXIT_MARGIN 2000 +/* Threshold to exit/exit BTR (to avoid frequent enter-exits at the lower limit) */ +#define BTR_MAX_MARGIN 2500/* Threshold to change BTR multiplier (to avoid frequent changes) */ #define BTR_DRIFT_MARGIN 2000/*Threshold to exit fixed refresh rate*/
@@ -248,24 +248,22 @@ static void apply_below_the_range(struct core_freesync *core_freesync,unsigned int delta_from_mid_point_in_us_1 =0xFFFFFFFF ;unsigned int delta_from_mid_point_in_us_2 =0xFFFFFFFF ;unsigned int frames_to_insert =0 ; -unsigned int min_frame_duration_in_ns =0 ; -unsigned int max_render_time_in_us = in_out_vrr->max_duration_in_us;unsigned int delta_from_mid_point_delta_in_us; - - min_frame_duration_in_ns = ((unsigned int ) (div64_u64 ( - (1000000000ULL *1000000 ), - in_out_vrr->max_refresh_in_uhz))); +unsigned int max_render_time_in_us = + in_out_vrr->max_duration_in_us - in_out_vrr->btr.margin_in_us;/* Program BTR */ -if (last_render_time_in_us +BTR_EXIT_MARGIN < max_render_time_in_us) { +if ((last_render_time_in_us + in_out_vrr->btr.margin_in_us /2 ) < max_render_time_in_us) {/* Exit Below the Range */ if (in_out_vrr->btr.btr_active) { in_out_vrr->btr.frame_counter =0 ; in_out_vrr->btr.btr_active = false; } - }else if (last_render_time_in_us > max_render_time_in_us) { + }else if (last_render_time_in_us > (max_render_time_in_us + in_out_vrr->btr.margin_in_us /2 )) {/* Enter Below the Range */ - in_out_vrr->btr.btr_active = true; +if (!in_out_vrr->btr.btr_active) { + in_out_vrr->btr.btr_active = true; + } }/* BTR set to "not active" so disengage */
@@ -321,7 +319,9 @@ static void apply_below_the_range(struct core_freesync *core_freesync,/* Choose number of frames to insert based on how close it * can get to the mid point of the variable range. */ -if (delta_from_mid_point_in_us_1 < delta_from_mid_point_in_us_2) { +if ((frame_time_in_us / mid_point_frames_ceil) > in_out_vrr->min_duration_in_us && + (delta_from_mid_point_in_us_1 < delta_from_mid_point_in_us_2 || + mid_point_frames_floor <2 )) { frames_to_insert = mid_point_frames_ceil; delta_from_mid_point_delta_in_us = delta_from_mid_point_in_us_2 - delta_from_mid_point_in_us_1;
@@ -337,7 +337,7 @@ static void apply_below_the_range(struct core_freesync *core_freesync,if (in_out_vrr->btr.frames_to_insert !=0 && delta_from_mid_point_delta_in_us <BTR_DRIFT_MARGIN ) {if (((last_render_time_in_us / in_out_vrr->btr.frames_to_insert) < - in_out_vrr->max_duration_in_us) && + max_render_time_in_us) && ((last_render_time_in_us / in_out_vrr->btr.frames_to_insert) > in_out_vrr->min_duration_in_us)) frames_to_insert = in_out_vrr->btr.frames_to_insert;
@@ -786,6 +786,11 @@ void mod_freesync_build_vrr_params(struct mod_freesync *mod_freesync, refresh_range = in_out_vrr->max_refresh_in_uhz - in_out_vrr->min_refresh_in_uhz; + in_out_vrr->btr.margin_in_us = in_out_vrr->max_duration_in_us - +2 * in_out_vrr->min_duration_in_us; +if (in_out_vrr->btr.margin_in_us >BTR_MAX_MARGIN ) + in_out_vrr->btr.margin_in_us =BTR_MAX_MARGIN ; + in_out_vrr->supported = true; }
@@ -801,6 +806,7 @@ void mod_freesync_build_vrr_params(struct mod_freesync *mod_freesync, in_out_vrr->btr.inserted_duration_in_us =0 ; in_out_vrr->btr.frames_to_insert =0 ; in_out_vrr->btr.frame_counter =0 ; + in_out_vrr->btr.mid_point_in_us = (in_out_vrr->min_duration_in_us + in_out_vrr->max_duration_in_us) /2 ;
drivers/gpu/drm/amd/display/modules/inc/mod_freesync.h +1 -0
@@ -92,6 +92,7 @@ struct mod_vrr_params_btr {uint32_t inserted_duration_in_us;uint32_t frames_to_insert;uint32_t frame_counter; +uint32_t margin_in_us; };struct mod_vrr_params_fixed_refresh {
Signature · 6 lines
2.22.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx