DC Patches 11 09,2020
cover DC Patches 11 09,2020
This DC patchset brings improvements in multiple areas. In summary, we have:
Alvin Lee (1):
drm/amd/display: Check other planes for iflip only if GSL already
enabled
Anthony Koo (1):
drm/amd/display: [FW Promotion] Release 0.0.41
Aric Cyr (2):
drm/amd/display: Only wait for flip pending on immediate flips drm/amd/display: 3.2.111
Dmytro Laktyushkin (1):
drm/amd/display: correct dml dsc bpc assignment
Eric Bernstein (1):
drm/amd/display: Move common speakersToChannels definition to
hw_shared.h
Isabel Zhang (2):
drm/amd/display: Add fallback to prefetch mode 1 if 0 fails drm/amd/display: Prevent freesync power optimization during validation
Jing Zhou (1):
drm/amd/display: force use sRGB for video TF is sRGB or BT709
Krunoslav Kovac (1):
drm/amd/display: Engage PSR synchronously
Victor Lu (1):
drm/amd/display: Explicitly disable cursor when disabling CRTC
Yongqiang Sun (3):
drm/amd/display: update dpp dto phase and modulo. drm/amd/display: check actual clock value. drm/amd/display: cap dpp dto phase not more than modulo.
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 14 +- .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 6 +- .../gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 5 +- .../amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 15 +- .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 8 ++ drivers/gpu/drm/amd/display/dc/core/dc.c | 4 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 18 ++- .../gpu/drm/amd/display/dc/core/dc_link_dp.c | 4 +- drivers/gpu/drm/amd/display/dc/dc.h | 5 +- drivers/gpu/drm/amd/display/dc/dc_link.h | 5 +- drivers/gpu/drm/amd/display/dc/dc_types.h | 19 +++ drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 24 ++-- .../amd/display/dc/dce/dce_stream_encoder.c | 82 ----------- drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 111 +++++++++------ drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h | 3 +- .../drm/amd/display/dc/dcn10/dcn10_resource.c | 1 + .../display/dc/dcn10/dcn10_stream_encoder.c | 82 ----------- .../drm/amd/display/dc/dcn20/dcn20_hwseq.c | 35 ++--- .../drm/amd/display/dc/dcn20/dcn20_resource.c | 23 ++-- .../drm/amd/display/dc/dcn20/dcn20_resource.h | 8 +- drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 2 +- .../gpu/drm/amd/display/dc/dcn21/dcn21_dccg.c | 129 ++++++++++++++++++ .../gpu/drm/amd/display/dc/dcn21/dcn21_dccg.h | 36 +++++ .../drm/amd/display/dc/dcn21/dcn21_resource.c | 60 +++++--- .../gpu/drm/amd/display/dc/dcn30/dcn30_afmt.c | 1 + .../gpu/drm/amd/display/dc/dcn30/dcn30_afmt.h | 83 ----------- .../drm/amd/display/dc/dcn30/dcn30_resource.c | 10 +- .../drm/amd/display/dc/dcn30/dcn30_resource.h | 3 +- .../amd/display/dc/dcn301/dcn301_resource.c | 1 + .../amd/display/dc/dcn302/dcn302_resource.c | 1 + .../dc/dml/dcn21/display_mode_vba_21.c | 2 +- .../drm/amd/display/dc/dml/display_mode_vba.c | 3 +- .../gpu/drm/amd/display/dc/inc/core_types.h | 3 +- drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 2 +- .../gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 84 ++++++++++++ .../gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 4 +- 36 files changed, 510 insertions(+), 386 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_dccg.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_dccg.h
Signature · 8 lines
2.25.1 Thanks, Bindu R _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 1/14 drm/amd/display: Add fallback to prefetch mode 1 if 0 fails
From: Isabel Zhang <[email protected]>
[Why]
In some cases, prefetch mode 0 is unsupported but prefetch 1 is supported. Due to previous change always forcing prefetch mode to 0, we are failing bandwidth validation in cases where we should not.
[How]
By default try prefetch mode 0 but in the case validation fails, attempt to do prefetch mode 1 to see if it is supported.
--- .../drm/amd/display/dc/dcn21/dcn21_resource.c | 28 +++++++++++++++---- .../dc/dml/dcn21/display_mode_vba_21.c | 2 +- 2 files changed, 23 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +22 -6
@@ -301,9 +301,7 @@ struct _vcs_dpi_soc_bounding_box_st dcn2_1_soc = { .xfc_bus_transport_time_us = 4, .xfc_xbuf_latency_tolerance_us = 4, .use_urgent_burst_bw = 1, - .num_states = 8, - .allow_dram_self_refresh_or_dram_clock_change_in_vblank - = dm_allow_self_refresh_and_mclk_switch + .num_states = 8 };#ifndef MAX
@@ -1199,11 +1197,29 @@ static bool dcn21_fast_validate_bw( out = true; goto validate_out; } - +/* +* DML favors voltage over p-state, but we're more interested in +* supporting p-state over voltage. We can't support p-state in +* prefetch mode > 0 so try capping the prefetch mode to start. +*/ + context->bw_ctx.dml.soc.allow_dram_self_refresh_or_dram_clock_change_in_vblank = + dm_allow_self_refresh_and_mclk_switch; vlevel =dml_get_voltage_level (&context->bw_ctx.dml, pipes, pipe_cnt); -if (vlevel > context->bw_ctx.dml.soc.num_states) - goto validate_fail; +if (vlevel > context->bw_ctx.dml.soc.num_states) { +/* +* If mode is unsupported or there's still no p-state support then +* fall back to favoring voltage. +* +* We don't actually support prefetch mode 2, so require that we +* at least support prefetch mode 1. +*/ + context->bw_ctx.dml.soc.allow_dram_self_refresh_or_dram_clock_change_in_vblank = + dm_allow_self_refresh; + vlevel =dml_get_voltage_level (&context->bw_ctx.dml, pipes, pipe_cnt); +if (vlevel > context->bw_ctx.dml.soc.num_states) + goto validate_fail; + } vlevel =dcn20_validate_apply_pipe_split_flags (dc, context, vlevel, split,NULL );
drivers/gpu/drm/amd/display/dc/dml/dcn21/display_mode_vba_21.c +1 -1
@@ -5477,7 +5477,7 @@ static void CalculateWatermarksAndDRAMSpeedChangeSupport( } } -if (mode_lib->vba.MinActiveDRAMClockChangeMargin >0 ) { +if (mode_lib->vba.MinActiveDRAMClockChangeMargin >0 && PrefetchMode ==0 ) { *DRAMClockChangeSupport = dm_dram_clock_change_vactive; } else if (((mode_lib->vba.SynchronizedVBlank == true || mode_lib->vba.TotalNumberOfActiveOTG == 1
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/14 drm/amd/display: Prevent freesync power optimization during validation
In reply to Bindu RFrom: Isabel Zhang <[email protected]>
[Why]
Due to the freesync power optimization increasing vtotal, the driver believes that MPO is supported. MPO is turned on. Freesync then exits, MPO can no longer be supported and immediate flip fails. This causes corruption on the panel.
[How]
Avoid the freesync optimization when doing validation so in the case freesync exits, driver can still support the configuration.
--- .../drm/amd/display/dc/dcn20/dcn20_resource.c | 22 +++++++++------ .../drm/amd/display/dc/dcn20/dcn20_resource.h | 8 ++++-- .../drm/amd/display/dc/dcn21/dcn21_resource.c | 28 ++++++++++++------- .../drm/amd/display/dc/dcn30/dcn30_resource.c | 9 +++--- .../drm/amd/display/dc/dcn30/dcn30_resource.h | 3 +- .../gpu/drm/amd/display/dc/inc/core_types.h | 3 +- 6 files changed, 47 insertions(+), 26 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +14 -8
@@ -2012,7 +2012,10 @@ void dcn20_populate_dml_writeback_from_context( }int dcn20_populate_dml_pipes_from_context ( -struct dc *dc,struct dc_state *context,display_e2e_pipe_params_st *pipes) +struct dc *dc, +struct dc_state *context, +display_e2e_pipe_params_st *pipes, +bool fast_validate) {int pipe_cnt, i;bool synchronized_vblank = true;
@@ -2052,6 +2055,7 @@ int dcn20_populate_dml_pipes_from_context( v_total = timing->v_total; front_porch = timing->v_front_porch; +/* todo: pipes[pipe_cnt].pipe.src.dynamic_metadata_enable = 0; pipes[pipe_cnt].pipe.src.dcc = 0;
@@ -2846,7 +2850,8 @@ bool dcn20_fast_validate_bw( display_e2e_pipe_params_st *pipes, int *pipe_cnt_out, int *pipe_split_from, - int *vlevel_out) + int *vlevel_out, + bool fast_validate) {bool out = false;int split[MAX_PIPES ] = {0 };
@@ -2858,7 +2863,7 @@ bool dcn20_fast_validate_bw(dcn20_merge_pipes_for_validate (dc, context); - pipe_cnt = dc->res_pool->funcs->populate_dml_pipes (dc, context, pipes); + pipe_cnt = dc->res_pool->funcs->populate_dml_pipes (dc, context, pipes, fast_validate); *pipe_cnt_out = pipe_cnt;
@@ -2962,7 +2967,8 @@ static void dcn20_calculate_wm( display_e2e_pipe_params_st *pipes, int *out_pipe_cnt, int *pipe_split_from, - int vlevel) + int vlevel, + bool fast_validate) {int pipe_cnt, i, pipe_idx;
@@ -3007,10 +3013,10 @@ static void dcn20_calculate_wm(if (pipe_cnt != pipe_idx) {if (dc->res_pool->funcs->populate_dml_pipes) pipe_cnt = dc->res_pool->funcs->populate_dml_pipes (dc, - context, pipes); + context, pipes, fast_validate);else pipe_cnt =dcn20_populate_dml_pipes_from_context (dc, - context, pipes); + context, pipes, fast_validate); } *out_pipe_cnt = pipe_cnt;
@@ -3155,7 +3161,7 @@ static bool dcn20_validate_bandwidth_internal(struct dc *dc, struct dc_state *coBW_VAL_TRACE_COUNT (); - out =dcn20_fast_validate_bw (dc, context, pipes, &pipe_cnt, pipe_split_from, &vlevel); + out =dcn20_fast_validate_bw (dc, context, pipes, &pipe_cnt, pipe_split_from, &vlevel, fast_validate);if (pipe_cnt ==0 ) goto validate_out;
@@ -3170,7 +3176,7 @@ static bool dcn20_validate_bandwidth_internal(struct dc *dc, struct dc_state *co goto validate_out; } -dcn20_calculate_wm (dc, context, pipes, &pipe_cnt, pipe_split_from, vlevel); +dcn20_calculate_wm (dc, context, pipes, &pipe_cnt, pipe_split_from, vlevel, fast_validate);dcn20_calculate_dlg_params (dc, context, pipes, pipe_cnt, vlevel);BW_VAL_TRACE_END_WATERMARKS ();
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h +6 -2
@@ -50,7 +50,10 @@ unsigned int dcn20_calc_max_scaled_time(enum mmhubbub_wbif_mode mode, unsigned int urgent_watermark);int dcn20_populate_dml_pipes_from_context ( -struct dc *dc,struct dc_state *context,display_e2e_pipe_params_st *pipes); +struct dc *dc, +struct dc_state *context, +display_e2e_pipe_params_st *pipes, +bool fast_validate); struct pipe_ctx *dcn20_acquire_idle_pipe_for_layer( struct dc_state *state, const struct resource_pool *pool,
@@ -155,7 +158,8 @@ bool dcn20_fast_validate_bw( display_e2e_pipe_params_st *pipes, int *pipe_cnt_out, int *pipe_split_from, - int *vlevel_out); + int *vlevel_out, + bool fast_validate); void dcn20_calculate_dlg_params( struct dc *dc, struct dc_state *context, display_e2e_pipe_params_st *pipes,
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +18 -10
@@ -704,7 +704,10 @@ static const struct dcn10_stream_encoder_mask se_mask = {static void dcn21_pp_smu_destroy (struct pp_smu_funcs **pp_smu);static int dcn21_populate_dml_pipes_from_context ( -struct dc *dc,struct dc_state *context,display_e2e_pipe_params_st *pipes); +struct dc *dc, +struct dc_state *context, +display_e2e_pipe_params_st *pipes, +bool fast_validate);static struct input_pixel_processor *dcn21_ipp_create (struct dc_context *ctx,uint32_t inst)
@@ -1091,7 +1094,8 @@ void dcn21_calculate_wm( display_e2e_pipe_params_st *pipes, int *out_pipe_cnt, int *pipe_split_from, - int vlevel_req) + int vlevel_req, + bool fast_validate) {int pipe_cnt, i, pipe_idx;int vlevel, vlevel_max;
@@ -1133,10 +1137,10 @@ void dcn21_calculate_wm(if (pipe_cnt != pipe_idx) {if (dc->res_pool->funcs->populate_dml_pipes) pipe_cnt = dc->res_pool->funcs->populate_dml_pipes (dc, - context, pipes); + context, pipes, fast_validate);else pipe_cnt =dcn21_populate_dml_pipes_from_context (dc, - context, pipes); + context, pipes, fast_validate); } *out_pipe_cnt = pipe_cnt;
@@ -1177,7 +1181,8 @@ static bool dcn21_fast_validate_bw( display_e2e_pipe_params_st *pipes, int *pipe_cnt_out, int *pipe_split_from, - int *vlevel_out) + int *vlevel_out, + bool fast_validate) {bool out = false;int split[MAX_PIPES ] = {0 };
@@ -1189,7 +1194,7 @@ static bool dcn21_fast_validate_bw(dcn20_merge_pipes_for_validate (dc, context); - pipe_cnt = dc->res_pool->funcs->populate_dml_pipes (dc, context, pipes); + pipe_cnt = dc->res_pool->funcs->populate_dml_pipes (dc, context, pipes, fast_validate); *pipe_cnt_out = pipe_cnt;
@@ -1339,7 +1344,7 @@ bool dcn21_validate_bandwidth(struct dc *dc, struct dc_state *context,/*Unsafe due to current pipe merge and split logic*/ ASSERT (context != dc->current_state); - out =dcn21_fast_validate_bw (dc, context, pipes, &pipe_cnt, pipe_split_from, &vlevel); + out =dcn21_fast_validate_bw (dc, context, pipes, &pipe_cnt, pipe_split_from, &vlevel, fast_validate);if (pipe_cnt ==0 ) goto validate_out;
@@ -1354,7 +1359,7 @@ bool dcn21_validate_bandwidth(struct dc *dc, struct dc_state *context, goto validate_out; } -dcn21_calculate_wm (dc, context, pipes, &pipe_cnt, pipe_split_from, vlevel); +dcn21_calculate_wm (dc, context, pipes, &pipe_cnt, pipe_split_from, vlevel, fast_validate);dcn20_calculate_dlg_params (dc, context, pipes, pipe_cnt, vlevel);BW_VAL_TRACE_END_WATERMARKS ();
@@ -1870,9 +1875,12 @@ static uint32_t read_pipe_fuses(struct dc_context *ctx) }static int dcn21_populate_dml_pipes_from_context ( -struct dc *dc,struct dc_state *context,display_e2e_pipe_params_st *pipes) +struct dc *dc, +struct dc_state *context, +display_e2e_pipe_params_st *pipes, +bool fast_validate) { -uint32_t pipe_cnt =dcn20_populate_dml_pipes_from_context (dc, context, pipes); +uint32_t pipe_cnt =dcn20_populate_dml_pipes_from_context (dc, context, pipes, fast_validate);int i;for (i =0 ; i < pipe_cnt; i++) {
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c +5 -4
@@ -1451,12 +1451,13 @@ static struct clock_source *dcn30_clock_source_create(int dcn30_populate_dml_pipes_from_context (struct dc *dc,struct dc_state *context, -display_e2e_pipe_params_st *pipes) +display_e2e_pipe_params_st *pipes, +bool fast_validate) {int i, pipe_cnt;struct resource_context *res_ctx = &context->res_ctx; -dcn20_populate_dml_pipes_from_context (dc, context, pipes); +dcn20_populate_dml_pipes_from_context (dc, context, pipes, fast_validate);for (i =0 , pipe_cnt =0 ; i < dc->res_pool->pipe_count; i++) {if (!res_ctx->pipe_ctx[i].stream)
@@ -1976,7 +1977,7 @@ static bool dcn30_internal_validate_bw(if (!pipes)return false; - pipe_cnt = dc->res_pool->funcs->populate_dml_pipes (dc, context, pipes); + pipe_cnt = dc->res_pool->funcs->populate_dml_pipes (dc, context, pipes, fast_validate);if (!pipe_cnt) { out = true;
@@ -2190,7 +2191,7 @@ static bool dcn30_internal_validate_bw( }if (repopulate_pipes) - pipe_cnt = dc->res_pool->funcs->populate_dml_pipes (dc, context, pipes); + pipe_cnt = dc->res_pool->funcs->populate_dml_pipes (dc, context, pipes, fast_validate); *vlevel_out = vlevel; *pipe_cnt_out = pipe_cnt;
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.h +2 -1
@@ -65,7 +65,8 @@ void dcn30_populate_dml_writeback_from_context(int dcn30_populate_dml_pipes_from_context (struct dc *dc,struct dc_state *context, -display_e2e_pipe_params_st *pipes); +display_e2e_pipe_params_st *pipes, +bool fast_validate); bool dcn30_acquire_post_bldn_3dlut( struct resource_context *res_ctx,
drivers/gpu/drm/amd/display/dc/inc/core_types.h +2 -1
@@ -109,7 +109,8 @@ struct resource_funcs {int (*populate_dml_pipes)(struct dc *dc,struct dc_state *context, -display_e2e_pipe_params_st *pipes); +display_e2e_pipe_params_st *pipes, +bool fast_validate); enum dc_status (*validate_global)( struct dc *dc,
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/14 drm/amd/display: Engage PSR synchronously
In reply to Bindu RFrom: Krunoslav Kovac <[email protected]>
[Why & How]
The intended use is to force PSR into active state and ignore all events until explicit EXIT.
A new event force_static is added to power module. It is then sent to FW.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +- .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 6 +- .../gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 5 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 4 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 18 ++- .../gpu/drm/amd/display/dc/core/dc_link_dp.c | 4 +- drivers/gpu/drm/amd/display/dc/dc_link.h | 5 +- drivers/gpu/drm/amd/display/dc/dc_types.h | 19 +++ drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 24 ++-- drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 111 +++++++++++------- drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h | 3 +- drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 2 +- 12 files changed, 129 insertions(+), 76 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2 -2
@@ -9738,7 +9738,7 @@ bool amdgpu_dm_psr_enable(struct dc_stream_state *stream) &stream,1 , ¶ms); -return dc_link_set_psr_allow_active (link, true, false); +return dc_link_set_psr_allow_active (link, true, false, false); }/*
@@ -9752,7 +9752,7 @@ static bool amdgpu_dm_psr_disable(struct dc_stream_state *stream)DRM_DEBUG_DRIVER ("Disabling psr...\n" ); -return dc_link_set_psr_allow_active (stream->link, false, true); +return dc_link_set_psr_allow_active (stream->link, false, true, false); }/*
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +3 -3
@@ -2333,11 +2333,11 @@ static int psr_get(void *data, u64 *val) {struct amdgpu_dm_connector *connector = data;struct dc_link *link = connector->dc_link; -uint32_t psr_state =0 ; +enum dc_psr_state state =PSR_STATE0 ; -dc_link_get_psr_state (link, &psr_state); +dc_link_get_psr_state (link, &state); - *val = psr_state; + *val = state;return 0 ; }
drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c +3 -2
@@ -98,7 +98,7 @@ void clk_mgr_exit_optimized_pwr_state(const struct dc *dc, struct clk_mgr *clk_mif (edp_link) { clk_mgr->psr_allow_active_cache = edp_link->psr_settings.psr_allow_active; -dc_link_set_psr_allow_active (edp_link, false, false); +dc_link_set_psr_allow_active (edp_link, false, false, false); } }
@@ -108,7 +108,8 @@ void clk_mgr_optimize_pwr_state(const struct dc *dc, struct clk_mgr *clk_mgr)struct dc_link *edp_link =get_edp_link (dc);if (edp_link) -dc_link_set_psr_allow_active (edp_link, clk_mgr->psr_allow_active_cache, false); +dc_link_set_psr_allow_active (edp_link, + clk_mgr->psr_allow_active_cache, false, false);if (dc->hwss.optimize_pwr_state) dc->hwss.optimize_pwr_state (dc, dc->current_state);
drivers/gpu/drm/amd/display/dc/core/dc.c +2 -2
@@ -3058,9 +3058,9 @@ bool dc_set_psr_allow_active(struct dc *dc, bool enable)if (link->psr_settings.psr_feature_enabled) {if (enable && !link->psr_settings.psr_allow_active) -return dc_link_set_psr_allow_active (link, true, false); +return dc_link_set_psr_allow_active (link, true, false, false);else if (!enable && link->psr_settings.psr_allow_active) -return dc_link_set_psr_allow_active (link, false, true); +return dc_link_set_psr_allow_active (link, false, true, false); } }
drivers/gpu/drm/amd/display/dc/core/dc_link.c +12 -6
@@ -2565,17 +2565,23 @@ bool dc_link_set_backlight_level(const struct dc_link *link,return true; } -bool dc_link_set_psr_allow_active (struct dc_link *link,bool allow_active,bool wait) +bool dc_link_set_psr_allow_active (struct dc_link *link,bool allow_active, +bool wait,bool force_static) {struct dc *dc = link->ctx->dc;struct dmcu *dmcu = dc->res_pool->dmcu;struct dmub_psr *psr = dc->res_pool->psr; +if (psr ==NULL && force_static) +return false; + link->psr_settings.psr_allow_active = allow_active; -if (psr !=NULL && link->psr_settings.psr_feature_enabled) +if (psr !=NULL && link->psr_settings.psr_feature_enabled) { +if (force_static && psr->funcs->psr_force_static) + psr->funcs->psr_force_static (psr); psr->funcs->psr_enable (psr, allow_active, wait); -else if ((dmcu !=NULL && dmcu->funcs->is_dmcu_initialized (dmcu)) && link->psr_settings.psr_feature_enabled) + }else if ((dmcu !=NULL && dmcu->funcs->is_dmcu_initialized (dmcu)) && link->psr_settings.psr_feature_enabled) dmcu->funcs->set_psr_enable (dmcu, allow_active, wait);else return false;
@@ -2583,16 +2589,16 @@ bool dc_link_set_psr_allow_active(struct dc_link *link, bool allow_active, boolreturn true; } -bool dc_link_get_psr_state (const struct dc_link *link,uint32_t *psr_state) +bool dc_link_get_psr_state (const struct dc_link *link,enum dc_psr_state *state) {struct dc *dc = link->ctx->dc;struct dmcu *dmcu = dc->res_pool->dmcu;struct dmub_psr *psr = dc->res_pool->psr;if (psr !=NULL && link->psr_settings.psr_feature_enabled) - psr->funcs->psr_get_state (psr, psr_state); + psr->funcs->psr_get_state (psr, state);else if (dmcu !=NULL && link->psr_settings.psr_feature_enabled) - dmcu->funcs->get_psr_state (dmcu, psr_state); + dmcu->funcs->get_psr_state (dmcu, state);return true; }
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +2 -2
@@ -2575,8 +2575,8 @@ static bool handle_hpd_irq_psr_sink(struct dc_link *link) sizeof(psr_error_status.raw));/* PSR error, disable and re-enable PSR */ -dc_link_set_psr_allow_active (link, false, true); -dc_link_set_psr_allow_active (link, true, true); +dc_link_set_psr_allow_active (link, false, true, false); +dc_link_set_psr_allow_active (link, true, true, false);return true; } else if (psr_sink_psr_status.bits.SINK_SELF_REFRESH_STATUS ==
drivers/gpu/drm/amd/display/dc/dc_link.h +3 -2
@@ -219,9 +219,10 @@ int dc_link_get_backlight_level(const struct dc_link *dc_link);int dc_link_get_target_backlight_pwm (const struct dc_link *link); -bool dc_link_set_psr_allow_active (struct dc_link *dc_link,bool enable,bool wait); +bool dc_link_set_psr_allow_active (struct dc_link *dc_link,bool enable, +bool wait,bool force_static); -bool dc_link_get_psr_state (const struct dc_link *dc_link,uint32_t *psr_state); +bool dc_link_get_psr_state (const struct dc_link *dc_link,enum dc_psr_state *state); bool dc_link_setup_psr(struct dc_link *dc_link, const struct dc_stream_state *stream, struct psr_config *psr_config,
drivers/gpu/drm/amd/display/dc/dc_types.h +19 -0
@@ -676,6 +676,25 @@ struct dc_plane_flip_time {unsigned int prev_update_time_in_us; }; +enum dc_psr_state { +PSR_STATE0 =0x0 , +PSR_STATE1 , + PSR_STATE1a, +PSR_STATE2 , + PSR_STATE2a, +PSR_STATE3 , + PSR_STATE3Init, +PSR_STATE4 , + PSR_STATE4a, + PSR_STATE4b, + PSR_STATE4c, + PSR_STATE4d, +PSR_STATE5 , + PSR_STATE5a, + PSR_STATE5b, + PSR_STATE5c +}; +struct psr_config {unsigned char psr_version;unsigned int psr_rfb_setup_time;
drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c +12 -12
@@ -99,7 +99,7 @@ bool dce_dmcu_load_iram(struct dmcu *dmcu,return true; } -static void dce_get_dmcu_psr_state (struct dmcu *dmcu,uint32_t *psr_state) +static void dce_get_dmcu_psr_state (struct dmcu *dmcu,enum dc_psr_state *state) {struct dce_dmcu *dmcu_dce =TO_DCE_DMCU (dmcu);
@@ -114,7 +114,7 @@ static void dce_get_dmcu_psr_state(struct dmcu *dmcu, uint32_t *psr_state)REG_WRITE (DMCU_IRAM_RD_CTRL , psr_state_offset);/* Read data from IRAM_RD_DATA in DMCU_IRAM_RD_DATA*/ - *psr_state =REG_READ (DMCU_IRAM_RD_DATA ); + *state = (enum dc_psr_state )REG_READ (DMCU_IRAM_RD_DATA );/* Disable write access to IRAM after finished using IRAM * in order to allow dynamic sleep state
@@ -129,7 +129,7 @@ static void dce_dmcu_set_psr_enable(struct dmcu *dmcu, bool enable, bool wait)unsigned int dmcu_wait_reg_ready_interval =100 ;unsigned int retryCount; -uint32_t psr_state =0 ; +enum dc_psr_state state =PSR_STATE0 ;/* waitDMCUReadyForCmd */ REG_WAIT(MASTER_COMM_CNTL_REG, MASTER_COMM_INTERRUPT, 0,
@@ -148,12 +148,12 @@ static void dce_dmcu_set_psr_enable(struct dmcu *dmcu, bool enable, bool wait)REG_UPDATE (MASTER_COMM_CNTL_REG ,MASTER_COMM_INTERRUPT ,1 );if (wait == true) {for (retryCount =0 ; retryCount <=100 ; retryCount++) { -dce_get_dmcu_psr_state (dmcu, &psr_state); +dce_get_dmcu_psr_state (dmcu, &state);if (enable) { -if (psr_state !=0 ) +if (state !=PSR_STATE0 )break ; }else { -if (psr_state ==0 ) +if (state ==PSR_STATE0 )break ; }udelay (10 );
@@ -513,7 +513,7 @@ static bool dcn10_dmcu_load_iram(struct dmcu *dmcu,return true; } -static void dcn10_get_dmcu_psr_state (struct dmcu *dmcu,uint32_t *psr_state) +static void dcn10_get_dmcu_psr_state (struct dmcu *dmcu,enum dc_psr_state *state) {struct dce_dmcu *dmcu_dce =TO_DCE_DMCU (dmcu);
@@ -532,7 +532,7 @@ static void dcn10_get_dmcu_psr_state(struct dmcu *dmcu, uint32_t *psr_state)REG_WRITE (DMCU_IRAM_RD_CTRL , psr_state_offset);/* Read data from IRAM_RD_DATA in DMCU_IRAM_RD_DATA*/ - *psr_state =REG_READ (DMCU_IRAM_RD_DATA ); + *state = (enum dc_psr_state )REG_READ (DMCU_IRAM_RD_DATA );/* Disable write access to IRAM after finished using IRAM * in order to allow dynamic sleep state
@@ -547,7 +547,7 @@ static void dcn10_dmcu_set_psr_enable(struct dmcu *dmcu, bool enable, bool wait)unsigned int dmcu_wait_reg_ready_interval =100 ;unsigned int retryCount; -uint32_t psr_state =0 ; +enum dc_psr_state state =PSR_STATE0 ;/* If microcontroller is not running, do nothing */ if (dmcu->dmcu_state !=DMCU_RUNNING )
@@ -575,12 +575,12 @@ static void dcn10_dmcu_set_psr_enable(struct dmcu *dmcu, bool enable, bool wait)*/ if (wait == true) {for (retryCount =0 ; retryCount <=1000 ; retryCount++) { -dcn10_get_dmcu_psr_state (dmcu, &psr_state); +dcn10_get_dmcu_psr_state (dmcu, &state);if (enable) { -if (psr_state !=0 ) +if (state !=PSR_STATE0 )break ; }else { -if (psr_state ==0 ) +if (state ==PSR_STATE0 )break ; }udelay (500 );
drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c +68 -43
166 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h +2 -1
@@ -37,8 +37,9 @@ struct dmub_psr {struct dmub_psr_funcs {bool (*psr_copy_settings)(struct dmub_psr *dmub,struct dc_link *link,struct psr_context *psr_context);void (*psr_enable)(struct dmub_psr *dmub,bool enable,bool wait); -void (*psr_get_state)(struct dmub_psr *dmub,uint32_t *psr_state); +void (*psr_get_state)(struct dmub_psr *dmub,enum dc_psr_state *dc_psr_state);void (*psr_set_level)(struct dmub_psr *dmub,uint16_t psr_level); +void (*psr_force_static)(struct dmub_psr *dmub); };struct dmub_psr *dmub_psr_create (struct dc_context *ctx);
drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h +1 -1
@@ -66,7 +66,7 @@ struct dmcu_funcs {bool (*setup_psr)(struct dmcu *dmcu,struct dc_link *link,struct psr_context *psr_context); -void (*get_psr_state)(struct dmcu *dmcu,uint32_t *psr_state); +void (*get_psr_state)(struct dmcu *dmcu,enum dc_psr_state *dc_psr_state);void (*set_psr_wait_loop)(struct dmcu *dmcu,unsigned int wait_loop_number); void (*get_psr_wait_loop)(struct dmcu *dmcu,
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/14 drm/amd/display: correct dml dsc bpc assignment
In reply to Bindu RFrom: Dmytro Laktyushkin <[email protected]>
--- drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c +1 -2
@@ -471,8 +471,7 @@ static void fetch_pipe_params(struct display_mode_lib *mode_lib) mode_lib->vba.DSCEnable[mode_lib->vba.NumberOfActivePlanes] = dout->dsc_enable; mode_lib->vba.NumberOfDSCSlices[mode_lib->vba.NumberOfActivePlanes] = dout->dsc_slices; - mode_lib->vba.DSCInputBitPerComponent[mode_lib->vba.NumberOfActivePlanes] = - dout->output_bpc ==0 ?12 : dout->output_bpc; + mode_lib->vba.DSCInputBitPerComponent[mode_lib->vba.NumberOfActivePlanes] = dout->output_bpc; mode_lib->vba.WritebackEnable[mode_lib->vba.NumberOfActivePlanes] = dout->wb_enable; mode_lib->vba.ActiveWritebacksPerPlane[mode_lib->vba.NumberOfActivePlanes] = dout->num_active_wb;
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/14 drm/amd/display: Move common speakersToChannels definition to hw_shared.h
In reply to Bindu RFrom: Eric Bernstein <[email protected]>
--- .../amd/display/dc/dce/dce_stream_encoder.c | 82 ------------------ .../display/dc/dcn10/dcn10_stream_encoder.c | 82 ------------------ .../gpu/drm/amd/display/dc/dcn30/dcn30_afmt.c | 1 + .../gpu/drm/amd/display/dc/dcn30/dcn30_afmt.h | 83 ------------------ .../gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 84 +++++++++++++++++++ 5 files changed, 85 insertions(+), 247 deletions(-)
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c +0 -82
@@ -1062,88 +1062,6 @@ static void dce110_reset_hdmi_stream_attribute(#include "include/audio_types.h" -/** -* speakersToChannels -* -* @brief -* translate speakers to channels -* -* FL - Front Left -* FR - Front Right -* RL - Rear Left -* RR - Rear Right -* RC - Rear Center -* FC - Front Center -* FLC - Front Left Center -* FRC - Front Right Center -* RLC - Rear Left Center -* RRC - Rear Right Center -* LFE - Low Freq Effect -* -* FC -* FLC FRC -* FL FR -* -* LFE -* () -* -* -* RL RR -* RLC RRC -* RC -* -* ch 8 7 6 5 4 3 2 1 -* 0b00000011 - - - - - - FR FL -* 0b00000111 - - - - - LFE FR FL -* 0b00001011 - - - - FC - FR FL -* 0b00001111 - - - - FC LFE FR FL -* 0b00010011 - - - RC - - FR FL -* 0b00010111 - - - RC - LFE FR FL -* 0b00011011 - - - RC FC - FR FL -* 0b00011111 - - - RC FC LFE FR FL -* 0b00110011 - - RR RL - - FR FL -* 0b00110111 - - RR RL - LFE FR FL -* 0b00111011 - - RR RL FC - FR FL -* 0b00111111 - - RR RL FC LFE FR FL -* 0b01110011 - RC RR RL - - FR FL -* 0b01110111 - RC RR RL - LFE FR FL -* 0b01111011 - RC RR RL FC - FR FL -* 0b01111111 - RC RR RL FC LFE FR FL -* 0b11110011 RRC RLC RR RL - - FR FL -* 0b11110111 RRC RLC RR RL - LFE FR FL -* 0b11111011 RRC RLC RR RL FC - FR FL -* 0b11111111 RRC RLC RR RL FC LFE FR FL -* 0b11000011 FRC FLC - - - - FR FL -* 0b11000111 FRC FLC - - - LFE FR FL -* 0b11001011 FRC FLC - - FC - FR FL -* 0b11001111 FRC FLC - - FC LFE FR FL -* 0b11010011 FRC FLC - RC - - FR FL -* 0b11010111 FRC FLC - RC - LFE FR FL -* 0b11011011 FRC FLC - RC FC - FR FL -* 0b11011111 FRC FLC - RC FC LFE FR FL -* 0b11110011 FRC FLC RR RL - - FR FL -* 0b11110111 FRC FLC RR RL - LFE FR FL -* 0b11111011 FRC FLC RR RL FC - FR FL -* 0b11111111 FRC FLC RR RL FC LFE FR FL -* -* @param -* speakers - speaker information as it comes from CEA audio block -*/ -/* translate speakers to channels */ - -union audio_cea_channels { -uint8_t all; -struct audio_cea_channels_bits { -uint32_t FL:1 ; -uint32_t FR:1 ; -uint32_t LFE:1 ; -uint32_t FC:1 ; -uint32_t RL_RC:1 ; -uint32_t RR:1 ; -uint32_t RC_RLC_FLC:1 ; -uint32_t RRC_FRC:1 ; - } channels; -};/* 25.2MHz/1.001*/ /* 25.2MHz/1.001*/
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c +0 -82
88 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.c +1 -0
@@ -25,6 +25,7 @@#include "dc_bios_types.h" +#include "hw_shared.h" #include "dcn30_afmt.h" #include "reg_helper.h"
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.h +0 -83
89 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h +84 -0
88 lines not on this page · raw message
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/14 drm/amd/display: Only wait for flip pending on immediate flips
In reply to Bindu RFrom: Aric Cyr <[email protected]>
[Why]
We want to make sure all immediate flips are completed before locking the pipes, but not pipes that are not flip immediate as they will be locked by the OTG
[How]
Skip non flip immediate pipes when checking for flip pending.
--- .../drm/amd/display/dc/dcn20/dcn20_hwseq.c | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +15 -14
@@ -1172,27 +1172,28 @@ void dcn20_pipe_control_lock( temp_pipe = pipe->bottom_pipe;while (!flip_immediate && temp_pipe) { -if (temp_pipe->plane_state !=NULL ) - flip_immediate = temp_pipe->plane_state->flip_immediate; - temp_pipe = temp_pipe->bottom_pipe; +if (temp_pipe->plane_state !=NULL ) + flip_immediate = temp_pipe->plane_state->flip_immediate; + temp_pipe = temp_pipe->bottom_pipe; }if (flip_immediate && lock) {const int TIMEOUT_FOR_FLIP_PENDING =100000 ;int i; -for (i =0 ; i <TIMEOUT_FOR_FLIP_PENDING ; ++i) { -if (!pipe->plane_res.hubp->funcs->hubp_is_flip_pending (pipe->plane_res.hubp)) -break ; -udelay (1 ); - } - -if (pipe->bottom_pipe !=NULL ) { -for (i =0 ; i <TIMEOUT_FOR_FLIP_PENDING ; ++i) { -if (!pipe->bottom_pipe->plane_res.hubp->funcs->hubp_is_flip_pending (pipe->bottom_pipe->plane_res.hubp)) -break ; -udelay (1 ); + temp_pipe = pipe; +while (temp_pipe) { +if (temp_pipe->plane_state && temp_pipe->plane_state->flip_immediate) { +for (i =0 ; i <TIMEOUT_FOR_FLIP_PENDING ; ++i) { +if (!temp_pipe->plane_res.hubp->funcs->hubp_is_flip_pending (temp_pipe->plane_res.hubp)) +break ; +udelay (1 ); + } + +/* no reason it should take this long for immediate flips */ +ASSERT (i !=TIMEOUT_FOR_FLIP_PENDING ); } + temp_pipe = temp_pipe->bottom_pipe; } }
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 7/14 drm/amd/display: force use sRGB for video TF is sRGB or BT709
In reply to Bindu RFrom: Jing Zhou <[email protected]>
[Why]
When mpo enabled, video comes is 709. Desktop use sRGB. So color change easily noticeable especially when switch between mpo/non-mpo.
[How]
Force use sRGB for video TF is sRGB or BT709. DCN1/DCN2 use predefined type with YUV.
DCN3 use distributed points type with YUV.
--- drivers/gpu/drm/amd/display/dc/dc.h | 1 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c | 1 + 7 files changed, 7 insertions(+)
drivers/gpu/drm/amd/display/dc/dc.h +1 -0
@@ -125,6 +125,7 @@ struct dpp_color_caps { uint16_t hw_3d_lut : 1; uint16_t ogam_ram : 1; // blnd gam uint16_t ocsc : 1; + uint16_t dgam_rom_for_yuv : 1;struct rom_curve_caps dgam_rom_caps;struct rom_curve_caps ogam_rom_caps; };
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c +1 -0
@@ -1439,6 +1439,7 @@ static bool dcn10_resource_construct( dc->caps.color.dpp.dgam_rom_caps.hlg =0 ; dc->caps.color.dpp.post_csc =0 ; dc->caps.color.dpp.gamma_corr =0 ; + dc->caps.color.dpp.dgam_rom_for_yuv =1 ; dc->caps.color.dpp.hw_3d_lut =0 ; dc->caps.color.dpp.ogam_ram =1 ;// RGAM on DCN1
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +1 -0
@@ -3839,6 +3839,7 @@ static bool dcn20_resource_construct( dc->caps.color.dpp.dgam_rom_caps.hlg =0 ; dc->caps.color.dpp.post_csc =0 ; dc->caps.color.dpp.gamma_corr =0 ; + dc->caps.color.dpp.dgam_rom_for_yuv =1 ; dc->caps.color.dpp.hw_3d_lut =1 ; dc->caps.color.dpp.ogam_ram =1 ;
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +1 -0
@@ -1978,6 +1978,7 @@ static bool dcn21_resource_construct( dc->caps.color.dpp.dgam_rom_caps.hlg =0 ; dc->caps.color.dpp.post_csc =0 ; dc->caps.color.dpp.gamma_corr =0 ; + dc->caps.color.dpp.dgam_rom_for_yuv =1 ; dc->caps.color.dpp.hw_3d_lut =1 ; dc->caps.color.dpp.ogam_ram =1 ;
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c +1 -0
@@ -2621,6 +2621,7 @@ static bool dcn30_resource_construct( dc->caps.color.dpp.dgam_rom_caps.hlg =1 ; dc->caps.color.dpp.post_csc =1 ; dc->caps.color.dpp.gamma_corr =1 ; + dc->caps.color.dpp.dgam_rom_for_yuv =0 ; dc->caps.color.dpp.hw_3d_lut =1 ; dc->caps.color.dpp.ogam_ram =1 ;
drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c +1 -0
@@ -1748,6 +1748,7 @@ static bool dcn301_resource_construct( dc->caps.color.dpp.dgam_rom_caps.hlg =1 ; dc->caps.color.dpp.post_csc =1 ; dc->caps.color.dpp.gamma_corr =1 ; + dc->caps.color.dpp.dgam_rom_for_yuv =0 ; dc->caps.color.dpp.hw_3d_lut =1 ; dc->caps.color.dpp.ogam_ram =1 ;
drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c +1 -0
@@ -1327,6 +1327,7 @@ static bool dcn302_resource_construct( dc->caps.color.dpp.dgam_rom_caps.hlg =1 ; dc->caps.color.dpp.post_csc =1 ; dc->caps.color.dpp.gamma_corr =1 ; + dc->caps.color.dpp.dgam_rom_for_yuv =0 ; dc->caps.color.dpp.hw_3d_lut =1 ; dc->caps.color.dpp.ogam_ram =1 ;
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 8/14 drm/amd/display: update dpp dto phase and modulo.
In reply to Bindu RFrom: Yongqiang Sun <[email protected]>
[Why & How]
Program modulo with ref dpp clk Mhz/10.
Program phase with pipe dpp clk Mhz /10.
DMUB FW could use these value to determine optimization clk for PSR power saving.
--- .../amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 6 +- drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 2 +- .../gpu/drm/amd/display/dc/dcn21/dcn21_dccg.c | 125 ++++++++++++++++++ .../gpu/drm/amd/display/dc/dcn21/dcn21_dccg.h | 36 +++++ .../drm/amd/display/dc/dcn21/dcn21_resource.c | 3 +- 5 files changed, 166 insertions(+), 6 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_dccg.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_dccg.h
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c +2 -4
@@ -158,10 +158,8 @@ void rn_update_clocks(struct clk_mgr *clk_mgr_base,// workaround: Limit dppclk to 100Mhz to avoid lower eDP panel switch to plus 4K monitor underflow. // Do not adjust dppclk if dppclk is 0 to avoid unexpected result -if (!IS_DIAG_DC (dc->ctx->dce_environment)) { -if (new_clocks->dppclk_khz <100000 && new_clocks->dppclk_khz >0 ) - new_clocks->dppclk_khz =100000 ; - } +if (new_clocks->dppclk_khz <100000 && new_clocks->dppclk_khz >0 ) + new_clocks->dppclk_khz =100000 ;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)
drivers/gpu/drm/amd/display/dc/dcn21/Makefile +1 -1
@@ -3,7 +3,7 @@ # Makefile for DCN21. DCN21 = dcn21_init.o dcn21_hubp.o dcn21_hubbub.o dcn21_resource.o \ - dcn21_hwseq.o dcn21_link_encoder.o + dcn21_hwseq.o dcn21_link_encoder.o dcn21_dccg.o ifdef CONFIG_X86 CFLAGS_$(AMDDALPATH)/dc/dcn21/dcn21_resource.o := -mhard-float -msse
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_dccg.c new file +125 -0
125 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_dccg.h new file +36 -0
@@ -0,0 +1,36 @@ +/* +* Copyright 2018 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 __DCN21_DCCG_H__ +#define __DCN21_DCCG_H__ + +struct dccg *dccg21_create ( +struct dc_context *ctx, +const struct dccg_registers *regs, +const struct dccg_shift *dccg_shift, +const struct dccg_mask *dccg_mask); + + +#endif /* __DCN21_DCCG_H__ */
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +2 -1
@@ -58,6 +58,7 @@#include "dce110/dce110_resource.h" #include "dml/display_mode_vba.h" #include "dcn20/dcn20_dccg.h" +#include "dcn21/dcn21_dccg.h" #include "dcn21_hubbub.h" #include "dcn10/dcn10_resource.h" #include "dce110/dce110_resource.h"
@@ -2046,7 +2047,7 @@ static bool dcn21_resource_construct( } } - pool->base.dccg =dccg2_create (ctx, &dccg_regs, &dccg_shift, &dccg_mask); + pool->base.dccg =dccg21_create (ctx, &dccg_regs, &dccg_shift, &dccg_mask);if (pool->base.dccg ==NULL ) {dm_error ("DC: failed to create dccg!\n" );BREAK_TO_DEBUGGER ();
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 9/14 drm/amd/display: Explicitly disable cursor when disabling CRTC
In reply to Bindu RFrom: Victor Lu <[email protected]>
[why]
On DCE, the cursor is not being disabled on commits where there is no CRTC or FB enabled.
[how]
Explicitly disable the cursor in the commit tail only if the pending commit disables the CRTC.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10 -0
@@ -8176,6 +8176,16 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) new_crtc_state->active_changed, new_crtc_state->connectors_changed); +/* Disable cursor if disabling crtc */ +if (old_crtc_state->active && !new_crtc_state->active) { +struct dc_cursor_position position; + +memset (&position,0 ,sizeof (position)); +mutex_lock (&dm->dc_lock); +dc_stream_set_cursor_position (dm_old_crtc_state->stream, &position); +mutex_unlock (&dm->dc_lock); + } +/* Copy all transient state flags into dc state */ if (dm_new_crtc_state->stream) { amdgpu_dm_crtc_copy_transient_flags(&dm_new_crtc_state->base,
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 10/14 drm/amd/display: Check other planes for iflip only if GSL already enabled
In reply to Bindu RFrom: Alvin Lee <[email protected]>
[Why]
We don't want GSL to be enabled when only updating plane address
[How]
Only check other pipes for immediate flip if GSL is already enabled
--- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +7 -5
@@ -1170,11 +1170,13 @@ void dcn20_pipe_control_lock(if (pipe->plane_state !=NULL ) flip_immediate = pipe->plane_state->flip_immediate; - temp_pipe = pipe->bottom_pipe; -while (!flip_immediate && temp_pipe) { -if (temp_pipe->plane_state !=NULL ) - flip_immediate = temp_pipe->plane_state->flip_immediate; - temp_pipe = temp_pipe->bottom_pipe; +if (pipe->stream_res.gsl_group >0 ) { + temp_pipe = pipe->bottom_pipe; +while (!flip_immediate && temp_pipe) { +if (temp_pipe->plane_state !=NULL ) + flip_immediate = temp_pipe->plane_state->flip_immediate; + temp_pipe = temp_pipe->bottom_pipe; + } }if (flip_immediate && lock) {
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 11/14 drm/amd/display: [FW Promotion] Release 0.0.41
In reply to Bindu RFrom: 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
@@ -36,10 +36,10 @@/* Firmware versioning. */ #ifdef DMUB_EXPOSE_VERSION -#define DMUB_FW_VERSION_GIT_HASH 0x9f0af34af +#define DMUB_FW_VERSION_GIT_HASH 0x821097815#define DMUB_FW_VERSION_MAJOR 0#define DMUB_FW_VERSION_MINOR 0 -#define DMUB_FW_VERSION_REVISION 40 +#define DMUB_FW_VERSION_REVISION 41#define DMUB_FW_VERSION_TEST 0#define DMUB_FW_VERSION_VBIOS 0#define DMUB_FW_VERSION_HOTFIX 0
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 12/14 drm/amd/display: 3.2.111
In reply to Bindu RFrom: 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
@@ -42,7 +42,7 @@#include "inc/hw/dmcu.h" #include "dml/display_mode_lib.h" -#define DC_VER "3.2.110" +#define DC_VER "3.2.111"#define MAX_SURFACES 3#define MAX_PLANES 6
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 13/14 drm/amd/display: check actual clock value.
In reply to Bindu RFrom: Yongqiang Sun <[email protected]>
[Why]
Actual dpp/disp clock PMFW set are always equal or more than requested. Need to cache the actual clock for debugging purpose.
[How]
Add actuall dpp/disp clk in clock manager and save it when set clocks. Add an ASSERT in case of actual clock less than requested.
--- .../gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 9 ++++++--- .../amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 8 ++++++++ drivers/gpu/drm/amd/display/dc/dc.h | 2 ++ 3 files changed, 16 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c +6 -3
@@ -170,7 +170,7 @@ void rn_update_clocks(struct clk_mgr *clk_mgr_base,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; -rn_vbios_smu_set_dispclk (clk_mgr, clk_mgr_base->clks.dispclk_khz); + clk_mgr_base->clks.actual_dispclk_khz =rn_vbios_smu_set_dispclk (clk_mgr, clk_mgr_base->clks.dispclk_khz); update_dispclk = true; }
@@ -178,11 +178,14 @@ void rn_update_clocks(struct clk_mgr *clk_mgr_base,if (dpp_clock_lowered) {// increase per DPP DTO before lowering global dppclk dcn20_update_clocks_update_dpp_dto (clk_mgr, context, safe_to_lower); -rn_vbios_smu_set_dppclk (clk_mgr, clk_mgr_base->clks.dppclk_khz); + clk_mgr_base->clks.actual_dppclk_khz = +rn_vbios_smu_set_dppclk (clk_mgr, clk_mgr_base->clks.dppclk_khz); + }else {// increase global DPPCLK before lowering per DPP DTO if (update_dppclk || update_dispclk) -rn_vbios_smu_set_dppclk (clk_mgr, clk_mgr_base->clks.dppclk_khz); + clk_mgr_base->clks.actual_dppclk_khz = +rn_vbios_smu_set_dppclk (clk_mgr, clk_mgr_base->clks.dppclk_khz);// always update dtos unless clock is lowered and not safe to lower if (new_clocks->dppclk_khz >= dc->current_state->bw_ctx.bw.dcn.clk.dppclk_khz)dcn20_update_clocks_update_dpp_dto (clk_mgr, context, safe_to_lower);
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c +8 -0
@@ -136,6 +136,10 @@ int rn_vbios_smu_set_dispclk(struct clk_mgr_internal *clk_mgr, int requested_dis } } +// pmfw always set clock more than or equal requested clock +if (!IS_DIAG_DC (dc->ctx->dce_environment)) +ASSERT (actual_dispclk_set_mhz >= requested_dispclk_khz /1000 ); +return actual_dispclk_set_mhz *1000 ; }
@@ -194,12 +198,16 @@ void rn_vbios_smu_set_phyclk(struct clk_mgr_internal *clk_mgr, int requested_phyint rn_vbios_smu_set_dppclk (struct clk_mgr_internal *clk_mgr,int requested_dpp_khz) {int actual_dppclk_set_mhz =-1 ; +struct dc *dc = clk_mgr->base.ctx->dc; actual_dppclk_set_mhz =rn_vbios_smu_send_msg_with_param ( clk_mgr, VBIOSSMC_MSG_SetDppclkFreq, requested_dpp_khz /1000 ); +if (!IS_DIAG_DC (dc->ctx->dce_environment)) +ASSERT (actual_dppclk_set_mhz >= requested_dpp_khz /1000 ); +return actual_dppclk_set_mhz *1000 ; }
drivers/gpu/drm/amd/display/dc/dc.h +2 -0
@@ -342,7 +342,9 @@ enum dcn_pwr_state {*/ struct dc_clocks {int dispclk_khz; +int actual_dispclk_khz;int dppclk_khz; +int actual_dppclk_khz;int disp_dpp_voltage_level_khz;int dcfclk_khz;int socclk_khz;
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 14/14 drm/amd/display: cap dpp dto phase not more than modulo.
In reply to Bindu RFrom: Yongqiang Sun <[email protected]>
[Why]
4K monitor shows corruption if dpp dto phase is larger than modulo.
[How]
cap phase value never larger than modulo.
--- .../gpu/drm/amd/display/dc/dcn21/dcn21_dccg.c | 46 ++++++++++--------- 1 file changed, 25 insertions(+), 21 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_dccg.c +25 -21
@@ -50,43 +50,47 @@ void dccg21_update_dpp_dto(struct dccg *dccg, int dpp_inst, int req_dppclk)if (dccg->ref_dppclk) {int ref_dppclk = dccg->ref_dppclk;int modulo = ref_dppclk /10000 ; +int phase;if (req_dppclk) { -int phase; -/* * program DPP DTO phase and modulo as below -* phase = dpp_pipe_clk_mhz / 10 -* module = dpp_global_clk_mhz / 10 -* dmub FW will read phase value to -* determine minimum dpp clk and notify smu -* to set clks for more power saving in PSR state +* phase = ceiling(dpp_pipe_clk_mhz / 10) +* module = trunc(dpp_global_clk_mhz / 10) +* +* storing frequencies in registers allow dmcub fw +* to run time lower clocks when possible for power saving +* +* ceiling phase and truncate modulo guarentees the divided +* down per pipe dpp clock has high enough frequency */ phase = (req_dppclk +9999 ) /10000 ; -if (phase >0xff ) { -ASSERT (false); - phase =0xff ; +if (phase > modulo) { +/* phase > modulo result in screen corruption +* ie phase = 30, mod = 29 for 4k@60 HDMI +* in these case we don't want pipe clock to be divided +*/ + phase = modulo; } - -REG_SET_2 (DPPCLK_DTO_PARAM [dpp_inst],0 , -DPPCLK0_DTO_PHASE , phase, -DPPCLK0_DTO_MODULO , modulo); -REG_UPDATE (DPPCLK_DTO_CTRL , -DPPCLK_DTO_ENABLE [dpp_inst],1 ); }else {/* * set phase to 10 if dpp isn't used to * prevent hard hang if access dpp register * on unused pipe +* +* DTO should be on to divide down un-used +* pipe clock for power saving */ -REG_SET_2 (DPPCLK_DTO_PARAM [dpp_inst],0 , -DPPCLK0_DTO_PHASE ,10 , + phase =10 ; + } + +REG_SET_2 (DPPCLK_DTO_PARAM [dpp_inst],0 , +DPPCLK0_DTO_PHASE , phase,DPPCLK0_DTO_MODULO , modulo); -REG_UPDATE (DPPCLK_DTO_CTRL , -DPPCLK_DTO_ENABLE [dpp_inst],0 ); - } +REG_UPDATE (DPPCLK_DTO_CTRL , +DPPCLK_DTO_ENABLE [dpp_inst],1 ); } dccg->pipe_dppclk_khz[dpp_inst] = req_dppclk;
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx