DC Patches August 27, 2024
cover DC Patches August 27, 2024
Aric Cyr (1):
drm/amd/display: 3.2.299
Daniel Sa (1):
drm/amd/display: only trigger BIOS related assert for older ASICs
Dillon Varone (2):
Revert "drm/amd/display: Wait for all pending cleared before full
update"
drm/amd/display: Block timing sync for different signals in PMO
Gabe Teeger (1):
drm/amd/display: fix graphics hang in multi-display mst case
Hansen Dsouza (1):
drm/amd/display: Fix flickering caused by dccg
Leo Li (1):
drm/amd/display: Lock DC and exit IPS when changing backlight
Meenakshikumar Somasundaram (1):
drm/amd/display: Add dpia debug option to control power management
Nicholas Susanto (2):
drm/amd/display: Fix DCN35 set min dispclk logic drm/amd/display: Refactor dccg35_get_other_enabled_symclk_fe
Qili Lu (1):
drm/amd/display: fix dccg root clock optimization related hang
Relja Vojvodic (1):
drm/amd/display: Add sharpness control interface
Samson Tam (2):
drm/amd/display: re-enable Dynamic ODM policy drm/amd/display: disable sharpness if HDR Multiplier is too large
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 13 +- .../drm/amd/display/dc/bios/command_table2.c | 2 +- .../display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 6 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 8 +- .../drm/amd/display/dc/core/dc_hw_sequencer.c | 9 +- drivers/gpu/drm/amd/display/dc/dc.h | 8 +- .../gpu/drm/amd/display/dc/dc_spl_translate.c | 52 +++-- drivers/gpu/drm/amd/display/dc/dc_stream.h | 3 + .../amd/display/dc/dccg/dcn20/dcn20_dccg.h | 11 + .../amd/display/dc/dccg/dcn35/dcn35_dccg.c | 168 ++++++++------ .../amd/display/dc/dccg/dcn35/dcn35_dccg.h | 1 + .../dc/dml2/dml21/dml21_translation_helper.c | 3 +- .../dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c | 3 +- .../amd/display/dc/dml2/dml2_internal_types.h | 2 +- .../display/dc/dml2/dml2_translation_helper.c | 67 +++--- .../display/dc/dml2/dml2_translation_helper.h | 2 +- .../gpu/drm/amd/display/dc/dml2/dml2_utils.c | 12 +- .../display/dc/dpp/dcn401/dcn401_dpp_dscl.c | 24 +- .../amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 4 +- .../amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 27 --- .../amd/display/dc/hwss/dcn30/dcn30_hwseq.h | 2 - .../amd/display/dc/hwss/dcn30/dcn30_init.c | 3 +- .../amd/display/dc/hwss/dcn301/dcn301_init.c | 1 - .../amd/display/dc/hwss/dcn32/dcn32_init.c | 1 - .../amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 49 +--- .../amd/display/dc/hwss/dcn401/dcn401_init.c | 1 - .../drm/amd/display/dc/hwss/hw_sequencer.h | 1 - drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 1 + .../amd/display/dc/inc/hw/timing_generator.h | 4 +- .../amd/display/dc/optc/dcn10/dcn10_optc.h | 9 - .../amd/display/dc/optc/dcn20/dcn20_optc.h | 7 +- .../amd/display/dc/optc/dcn30/dcn30_optc.c | 45 ---- .../amd/display/dc/optc/dcn30/dcn30_optc.h | 13 +- .../amd/display/dc/optc/dcn301/dcn301_optc.c | 3 - .../amd/display/dc/optc/dcn31/dcn31_optc.h | 9 +- .../amd/display/dc/optc/dcn314/dcn314_optc.h | 9 +- .../amd/display/dc/optc/dcn32/dcn32_optc.c | 16 +- .../amd/display/dc/optc/dcn32/dcn32_optc.h | 7 +- .../amd/display/dc/optc/dcn35/dcn35_optc.h | 6 +- .../amd/display/dc/optc/dcn401/dcn401_optc.c | 4 +- .../amd/display/dc/optc/dcn401/dcn401_optc.h | 6 +- .../dc/resource/dcn32/dcn32_resource.h | 3 +- .../dc/resource/dcn401/dcn401_resource.h | 5 +- drivers/gpu/drm/amd/display/dc/spl/dc_spl.c | 4 +- .../display/dc/spl/dc_spl_isharp_filters.c | 213 +++++------------- .../display/dc/spl/dc_spl_isharp_filters.h | 2 +- .../gpu/drm/amd/display/dc/spl/dc_spl_types.h | 27 ++- .../gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 2 +- 48 files changed, 346 insertions(+), 532 deletions(-)
Signature · 1 line
2.46.0
PATCH 1/14 drm/amd/display: Fix DCN35 set min dispclk logic
From: Nicholas Susanto <[email protected]>
[Why]
Setting min dispclk to 50Mhz outside clock lowering function causes unnecessary calls to SMU to lower dispclk and causes dentist hangs when there is no stream on the pipes.
[How]
Move the set minimum dispclk logic inside the lowering dispclk if statement.
--- .../gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c +3 -3
@@ -305,9 +305,6 @@ void dcn35_update_clocks(struct clk_mgr *clk_mgr_base,if (new_clocks->dtbclk_en && !new_clocks->ref_dtbclk_khz) new_clocks->ref_dtbclk_khz =600000 ; -if (dc->debug.min_disp_clk_khz >0 && new_clocks->dispclk_khz < dc->debug.min_disp_clk_khz) - new_clocks->dispclk_khz = dc->debug.min_disp_clk_khz; -/* * if it is safe to lower, but we are already in the lower state, we don't have to do anything * also if safe to lower is false, we just go in the higher state
@@ -385,6 +382,9 @@ void dcn35_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)) {dcn35_disable_otg_wa (clk_mgr_base, context, safe_to_lower, true); +if (dc->debug.min_disp_clk_khz >0 && new_clocks->dispclk_khz < dc->debug.min_disp_clk_khz) + new_clocks->dispclk_khz = dc->debug.min_disp_clk_khz; + clk_mgr_base->clks.dispclk_khz = new_clocks->dispclk_khz;dcn35_smu_set_dispclk (clk_mgr, clk_mgr_base->clks.dispclk_khz);dcn35_disable_otg_wa (clk_mgr_base, context, safe_to_lower, false);
Signature · 1 line
2.46.0
PATCH 2/14 drm/amd/display: only trigger BIOS related assert for older ASICs
In reply to Hamza MahfoozFrom: Daniel Sa <[email protected]>
[Why]
Some asserts are always hit on startup/Pnp when they should only be used to indicate when something has gone wrong.
[How]
Ignore result of getting function from bios cmd table for newer asics.
--- drivers/gpu/drm/amd/display/dc/bios/command_table2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/bios/command_table2.c +1 -1
@@ -227,7 +227,7 @@ static void init_transmitter_control(struct bios_parser *bp)uint8_t frev;uint8_t crev =0 ; -if (!BIOS_CMD_TABLE_REVISION (dig1transmittercontrol, frev, crev)) +if (!BIOS_CMD_TABLE_REVISION (dig1transmittercontrol, frev, crev) && (bp->base.ctx->dc->ctx->dce_version <=DCN_VERSION_2_0 ))BREAK_TO_DEBUGGER ();switch (crev) {
Signature · 1 line
2.46.0
PATCH 3/14 drm/amd/display: Lock DC and exit IPS when changing backlight
In reply to Hamza MahfoozFrom: Leo Li <[email protected]>
Backlight updates require aux and/or register access. Therefore, driver needs to disallow IPS beforehand.
So, acquire the dc lock before calling into dc to update backlight - we should be doing this regardless of IPS. Then, while the lock is held, disallow IPS before calling into dc, then allow IPS afterwards (if it was previously allowed).
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +12 -1
@@ -4512,7 +4512,7 @@ static void amdgpu_dm_backlight_set_level(struct amdgpu_display_manager *dm,struct amdgpu_dm_backlight_caps caps;struct dc_link *link;u32 brightness; -bool rc; +bool rc, reallow_idle = false;amdgpu_dm_update_backlight_caps (dm, bl_idx); caps = dm->backlight_caps[bl_idx];
@@ -4525,6 +4525,12 @@ static void amdgpu_dm_backlight_set_level(struct amdgpu_display_manager *dm, link = (struct dc_link *)dm->backlight_link[bl_idx];/* Change brightness based on AUX property */ +mutex_lock (&dm->dc_lock); +if (dm->dc->caps.ips_support && dm->dc->ctx->dmub_srv->idle_allowed) { +dc_allow_idle_optimizations (dm->dc, false); + reallow_idle = true; + } +if (caps.aux_support) { rc =dc_link_set_backlight_level_nits (link, true, brightness,AUX_BL_DEFAULT_TRANSITION_TIME_MS );
@@ -4536,6 +4542,11 @@ static void amdgpu_dm_backlight_set_level(struct amdgpu_display_manager *dm,DRM_DEBUG ("DM: Failed to update backlight on eDP[%d]\n" , bl_idx); } +if (dm->dc->caps.ips_support && reallow_idle) +dc_allow_idle_optimizations (dm->dc, true); + +mutex_unlock (&dm->dc_lock); +if (rc) dm->actual_brightness[bl_idx] = user_brightness; }
Signature · 1 line
2.46.0
PATCH 4/14 drm/amd/display: re-enable Dynamic ODM policy
In reply to Hamza MahfoozFrom: Samson Tam <[email protected]>
[Why]
Previous disable ODM policy due to underflow issue with sharpener. Issue is resolved after updating sharpening policy to apply to both windowed and fullscreen video
[How]
Remove sharpness check disabling Dynamic ODM policy
--- .../drm/amd/display/dc/dml2/dml21/dml21_translation_helper.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_translation_helper.c +1 -2
@@ -514,8 +514,7 @@ static void populate_dml21_stream_overrides_from_stream_state(break ; }if (!stream->ctx->dc->debug.enable_single_display_2to1_odm_policy || - stream->debug.force_odm_combine_segments >0 || - stream->ctx->dc->debug.force_sharpness >1 ) + stream->debug.force_odm_combine_segments >0 ) stream_desc->overrides.disable_dynamic_odm = true; stream_desc->overrides.disable_subvp = stream->ctx->dc->debug.force_disable_subvp || stream->hw_cursor_req; }
Signature · 1 line
2.46.0
PATCH 5/14 drm/amd/display: Add dpia debug option to control power management
In reply to Hamza MahfoozFrom: Meenakshikumar Somasundaram <[email protected]>
[Why]
To provide option to dpia control power management
[How]
By adding disable_usb4_pm_support bit field in dpia_debug option to control dpia power management
--- drivers/gpu/drm/amd/display/dc/dc.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dc.h +2 -1
@@ -761,7 +761,8 @@ union dpia_debug_options { uint32_t extend_aux_rd_interval:1; /* bit 2 */ uint32_t disable_mst_dsc_work_around:1; /* bit 3 */ uint32_t enable_force_tbt3_work_around:1; /* bit 4 */ - uint32_t reserved:27; + uint32_t disable_usb4_pm_support:1; /* bit 5 */ + uint32_t reserved:26; } bits;uint32_t raw; };
Signature · 1 line
2.46.0
PATCH 6/14 drm/amd/display: disable sharpness if HDR Multiplier is too large
In reply to Hamza MahfoozFrom: Samson Tam <[email protected]>
[Why]
Certain profiles have higher HDR multiplier than SDR boost max which is not currently supported
[How]
Disable sharpness for these profiles
--- drivers/gpu/drm/amd/display/dc/dc_spl_translate.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dc_spl_translate.c +5 -1
@@ -180,9 +180,13 @@ void translate_SPL_in_params_from_pipe_ctx(struct pipe_ctx *pipe_ctx, struct spl spl_in->is_fullscreen =dm_helpers_is_fullscreen (pipe_ctx->stream->ctx, pipe_ctx->stream); spl_in->is_hdr_on =dm_helpers_is_hdr_on (pipe_ctx->stream->ctx, pipe_ctx->stream); spl_in->hdr_multx100 =0 ; -if (spl_in->is_hdr_on) +if (spl_in->is_hdr_on) { spl_in->hdr_multx100 = (uint32_t )dc_fixpt_floor (dc_fixpt_mul (plane_state->hdr_mult,dc_fixpt_from_int (100 ))); +/* Disable sharpness for HDR Mult > 6.0 */ +if (spl_in->hdr_multx100 >600 ) + spl_in->adaptive_sharpness.enable = false; + } }/// @brief Translate SPL output parameters to pipe context
Signature · 1 line
2.46.0
PATCH 7/14 drm/amd/display: Refactor dccg35_get_other_enabled_symclk_fe
In reply to Hamza MahfoozFrom: Nicholas Susanto <[email protected]>
[Why]
Function used to check the number of FEs connected to the current BE. This was then used to determine if the symclk could be disabled, if all FEs were disconnected. However, the function would skip over the primary FE and return 0 when the primary FE was still connected. This caused black screens on driver disable with an MST daisy chain hooked up.
[How]
Refactor the function to correctly return the number of FEs connected to the input BE. Also, rename it for clarity.
--- .../amd/display/dc/dccg/dcn35/dcn35_dccg.c | 65 +++++++------------ 1 file changed, 25 insertions(+), 40 deletions(-)
drivers/gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c +25 -40
@@ -1905,47 +1905,32 @@ static void dccg35_enable_symclk_se(struct dccg *dccg, uint32_t stream_enc_inst, }/*get other front end connected to this backend*/ -static uint8_t dccg35_get_other_enabled_symclk_fe (struct dccg *dccg,uint32_t stream_enc_inst,uint32_t link_enc_inst) +static uint8_t dccg35_get_number_enabled_symclk_fe_connected_to_be (struct dccg *dccg,uint32_t link_enc_inst) {uint8_t num_enabled_symclk_fe =0 ; -uint32_t be_clk_en =0 , fe_clk_en[5 ] = {0 }, be_clk_sel[5 ] = {0 }; +uint32_t fe_clk_en[5 ] = {0 }, be_clk_sel[5 ] = {0 };struct dcn_dccg *dccg_dcn =TO_DCN_DCCG (dccg); -switch (link_enc_inst) { -case 0 : -REG_GET_3 (SYMCLKA_CLOCK_ENABLE ,SYMCLKA_CLOCK_ENABLE , &be_clk_en, -SYMCLKA_FE_EN , &fe_clk_en[0 ], -SYMCLKA_FE_SRC_SEL , &be_clk_sel[0 ]); -break ; -case 1 : -REG_GET_3 (SYMCLKB_CLOCK_ENABLE ,SYMCLKB_CLOCK_ENABLE , &be_clk_en, -SYMCLKB_FE_EN , &fe_clk_en[1 ], -SYMCLKB_FE_SRC_SEL , &be_clk_sel[1 ]); -break ; -case 2 : -REG_GET_3 (SYMCLKC_CLOCK_ENABLE ,SYMCLKC_CLOCK_ENABLE , &be_clk_en, -SYMCLKC_FE_EN , &fe_clk_en[2 ], -SYMCLKC_FE_SRC_SEL , &be_clk_sel[2 ]); -break ; -case 3 : -REG_GET_3 (SYMCLKD_CLOCK_ENABLE ,SYMCLKD_CLOCK_ENABLE , &be_clk_en, -SYMCLKD_FE_EN , &fe_clk_en[3 ], -SYMCLKD_FE_SRC_SEL , &be_clk_sel[3 ]); -break ; -case 4 : -REG_GET_3 (SYMCLKE_CLOCK_ENABLE ,SYMCLKE_CLOCK_ENABLE , &be_clk_en, -SYMCLKE_FE_EN , &fe_clk_en[4 ], -SYMCLKE_FE_SRC_SEL , &be_clk_sel[4 ]); -break ; - } -if (be_clk_en) { -/* for DPMST, this backend could be used by multiple front end. -only disable the backend if this stream_enc_ins is the last active stream enc connected to this back_end*/ -uint8_t i; -for (i =0 ; i != link_enc_inst && i <ARRAY_SIZE (fe_clk_en); i++) { -if (fe_clk_en[i] && be_clk_sel[i] == link_enc_inst) - num_enabled_symclk_fe++; - } +REG_GET_2 (SYMCLKA_CLOCK_ENABLE ,SYMCLKA_FE_EN , &fe_clk_en[0 ], +SYMCLKA_FE_SRC_SEL , &be_clk_sel[0 ]); + +REG_GET_2 (SYMCLKB_CLOCK_ENABLE ,SYMCLKB_FE_EN , &fe_clk_en[1 ], +SYMCLKB_FE_SRC_SEL , &be_clk_sel[1 ]); + +REG_GET_2 (SYMCLKC_CLOCK_ENABLE ,SYMCLKC_FE_EN , &fe_clk_en[2 ], +SYMCLKC_FE_SRC_SEL , &be_clk_sel[2 ]); + +REG_GET_2 (SYMCLKD_CLOCK_ENABLE ,SYMCLKD_FE_EN , &fe_clk_en[3 ], +SYMCLKD_FE_SRC_SEL , &be_clk_sel[3 ]); + +REG_GET_2 (SYMCLKE_CLOCK_ENABLE ,SYMCLKE_FE_EN , &fe_clk_en[4 ], +SYMCLKE_FE_SRC_SEL , &be_clk_sel[4 ]); + +uint8_t i; + +for (i =0 ; i <ARRAY_SIZE (fe_clk_en); i++) { +if (fe_clk_en[i] && be_clk_sel[i] == link_enc_inst) + num_enabled_symclk_fe++; }return num_enabled_symclk_fe; }
@@ -1993,9 +1978,9 @@ static void dccg35_disable_symclk_se(struct dccg *dccg, uint32_t stream_enc_instbreak ; } -/*check other enabled symclk fe */ - num_enabled_symclk_fe =dccg35_get_other_enabled_symclk_fe (dccg, stream_enc_inst, link_enc_inst); -/*only turn off backend clk if other front end attachecd to this backend are all off, +/*check other enabled symclk fe connected to this be */ + num_enabled_symclk_fe =dccg35_get_number_enabled_symclk_fe_connected_to_be (dccg, link_enc_inst); +/*only turn off backend clk if other front end attached to this backend are all off, for mst, only turn off the backend if this is the last front end*/ if (num_enabled_symclk_fe ==0 ) {switch (link_enc_inst) {
Signature · 1 line
2.46.0
PATCH 8/14 drm/amd/display: fix dccg root clock optimization related hang
In reply to Hamza MahfoozFrom: Qili Lu <[email protected]>
[Why]
enable dpp rcg before we disable dppclk in hw_init cause system hang/reboot
[How]
we remove dccg rcg related code from init into a separate function and call it after we init pipe
--- .../gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c | 14 +++++++++----- .../gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.h | 1 + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 4 ++++ drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 1 + 4 files changed, 15 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c +9 -5
@@ -1721,10 +1721,6 @@ void dccg35_init(struct dccg *dccg)dccg35_set_dpstreamclk_root_clock_gating (dccg, otg_inst, false); } -if (dccg->ctx->dc->debug.root_clock_optimization.bits.dpp) -for (otg_inst =0 ; otg_inst <4 ; otg_inst++) -dccg35_set_dppclk_root_clock_gating (dccg, otg_inst,0 ); -/* dccg35_enable_global_fgcg_rep( dccg, dccg->ctx->dc->debug.enable_fine_grain_clock_gating.bits
@@ -2303,6 +2299,14 @@ static void dccg35_disable_symclk_se_cb(/* DMU PHY sequence switches SYMCLK_BE (link_enc_inst) to ref clock once PHY is turned off */ } +void dccg35_root_gate_disable_control (struct dccg *dccg,uint32_t pipe_idx,uint32_t disable_clock_gating) +{ + +if (dccg->ctx->dc->debug.root_clock_optimization.bits.dpp) { +dccg35_set_dppclk_root_clock_gating (dccg, pipe_idx, disable_clock_gating); + } +} +static const struct dccg_funcs dccg35_funcs_new = { .update_dpp_dto = dccg35_update_dpp_dto_cb, .dpp_root_clock_control = dccg35_dpp_root_clock_control_cb,
@@ -2363,7 +2367,7 @@ static const struct dccg_funcs dccg35_funcs = { .enable_symclk_se = dccg35_enable_symclk_se, .disable_symclk_se = dccg35_disable_symclk_se, .set_dtbclk_p_src = dccg35_set_dtbclk_p_src, - + .dccg_root_gate_disable_control = dccg35_root_gate_disable_control, }; struct dccg *dccg35_create(
drivers/gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.h +1 -0
@@ -241,6 +241,7 @@ struct dccg *dccg35_create(void dccg35_init (struct dccg *dccg);void dccg35_enable_global_fgcg_rep (struct dccg *dccg,bool value); +void dccg35_root_gate_disable_control (struct dccg *dccg,uint32_t pipe_idx,uint32_t disable_clock_gating);#endif //__DCN35_DCCG_H__
drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c +4 -0
@@ -271,6 +271,10 @@ void dcn35_init_hw(struct dc *dc) dc->res_pool->hubbub->funcs->allow_self_refresh_control (dc->res_pool->hubbub, !dc->res_pool->hubbub->ctx->dc->debug.disable_stutter); } +if (res_pool->dccg->funcs->dccg_root_gate_disable_control) { +for (i =0 ; i < res_pool->pipe_count; i++) + res_pool->dccg->funcs->dccg_root_gate_disable_control (res_pool->dccg, i,0 ); + }for (i =0 ; i < res_pool->audio_count; i++) {struct audio *audio = res_pool->audios[i];
drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h +1 -0
@@ -213,6 +213,7 @@ struct dccg_funcs { uint32_t otg_inst);void (*set_dto_dscclk)(struct dccg *dccg,uint32_t dsc_inst);void (*set_ref_dscclk)(struct dccg *dccg,uint32_t dsc_inst); + void (*dccg_root_gate_disable_control)(struct dccg *dccg, uint32_t pipe_idx, uint32_t disable_clock_gating); };#endif //__DAL_DCCG_H__
Signature · 1 line
2.46.0
PATCH 9/14 Revert "drm/amd/display: Wait for all pending cleared before full update"
In reply to Hamza MahfoozFrom: Dillon Varone <[email protected]>
This reverts commit 3b837c45668c3026fd09145904692ba1130c5d12.
It is causing graphics hangs.
--- .../drm/amd/display/dc/core/dc_hw_sequencer.c | 9 +--- .../amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 4 +- .../amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 27 ----------- .../amd/display/dc/hwss/dcn30/dcn30_hwseq.h | 2 - .../amd/display/dc/hwss/dcn30/dcn30_init.c | 3 +- .../amd/display/dc/hwss/dcn301/dcn301_init.c | 1 - .../amd/display/dc/hwss/dcn32/dcn32_init.c | 1 - .../amd/display/dc/hwss/dcn401/dcn401_init.c | 1 - .../drm/amd/display/dc/hwss/hw_sequencer.h | 1 - .../amd/display/dc/inc/hw/timing_generator.h | 4 +- .../amd/display/dc/optc/dcn10/dcn10_optc.h | 9 ---- .../amd/display/dc/optc/dcn20/dcn20_optc.h | 7 +-- .../amd/display/dc/optc/dcn30/dcn30_optc.c | 45 ------------------- .../amd/display/dc/optc/dcn30/dcn30_optc.h | 13 +----- .../amd/display/dc/optc/dcn301/dcn301_optc.c | 3 -- .../amd/display/dc/optc/dcn31/dcn31_optc.h | 9 +--- .../amd/display/dc/optc/dcn314/dcn314_optc.h | 9 +--- .../amd/display/dc/optc/dcn32/dcn32_optc.c | 16 +++++-- .../amd/display/dc/optc/dcn32/dcn32_optc.h | 7 +-- .../amd/display/dc/optc/dcn35/dcn35_optc.h | 6 +-- .../amd/display/dc/optc/dcn401/dcn401_optc.c | 4 +- .../amd/display/dc/optc/dcn401/dcn401_optc.h | 6 +-- .../dc/resource/dcn32/dcn32_resource.h | 3 +- .../dc/resource/dcn401/dcn401_resource.h | 5 +-- 24 files changed, 34 insertions(+), 161 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c +2 -7
@@ -1071,13 +1071,8 @@ void hwss_wait_for_outstanding_hw_updates(struct dc *dc, struct dc_state *dc_conif (!pipe_ctx->stream)continue ; -/* For full update we must wait for all double buffer updates, not just DRR updates. This -* is particularly important for minimal transitions. Only check for OTG_MASTER pipes, -* as non-OTG Master pipes share the same OTG as -*/ -if (resource_is_pipe_type (pipe_ctx,OTG_MASTER ) && dc->hwss.wait_for_all_pending_updates) { - dc->hwss.wait_for_all_pending_updates (pipe_ctx); - } +if (pipe_ctx->stream_res.tg->funcs->wait_drr_doublebuffer_pending_clear) + pipe_ctx->stream_res.tg->funcs->wait_drr_doublebuffer_pending_clear (pipe_ctx->stream_res.tg); hubp = pipe_ctx->plane_res.hubp;if (!hubp)
drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c +2 -2
@@ -2255,9 +2255,9 @@ void dcn20_post_unlock_program_front_end(struct timing_generator *tg = pipe->stream_res.tg; -if (tg->funcs->get_optc_double_buffer_pending) { +if (tg->funcs->get_double_buffer_pending) {for (j =0 ; j <TIMEOUT_FOR_PIPE_ENABLE_US / polling_interval_us - && tg->funcs->get_optc_double_buffer_pending (tg); j++) + && tg->funcs->get_double_buffer_pending (tg); j++)udelay (polling_interval_us); } }
drivers/gpu/drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c +0 -27
@@ -1185,30 +1185,3 @@ void dcn30_prepare_bandwidth(struct dc *dc,if (!dc->clk_mgr->clks.fw_based_mclk_switching)dc_dmub_srv_p_state_delegate (dc, false, context); } - -void dcn30_wait_for_all_pending_updates (const struct pipe_ctx *pipe_ctx) -{ -struct timing_generator *tg = pipe_ctx->stream_res.tg; -bool pending_updates = false; -unsigned int i; - -if (tg && tg->funcs->is_tg_enabled (tg)) { -// Poll for 100ms maximum -for (i =0 ; i <100000 ; i++) { - pending_updates = false; -if (tg->funcs->get_optc_double_buffer_pending) - pending_updates |= tg->funcs->get_optc_double_buffer_pending (tg); - -if (tg->funcs->get_otg_double_buffer_pending) - pending_updates |= tg->funcs->get_otg_double_buffer_pending (tg); - -if (tg->funcs->get_pipe_update_pending) - pending_updates |= tg->funcs->get_pipe_update_pending (tg); - -if (!pending_updates) -break ; - -udelay (1 ); - } - } -}
drivers/gpu/drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.h +0 -2
@@ -96,6 +96,4 @@ void dcn30_set_hubp_blank(const struct dc *dc,void dcn30_prepare_bandwidth (struct dc *dc,struct dc_state *context); -void dcn30_wait_for_all_pending_updates (const struct pipe_ctx *pipe_ctx); -#endif /* __DC_HWSS_DCN30_H__ */
drivers/gpu/drm/amd/display/dc/hwss/dcn30/dcn30_init.c +1 -2
@@ -108,8 +108,7 @@ static const struct hw_sequencer_funcs dcn30_funcs = { .set_disp_pattern_generator = dcn30_set_disp_pattern_generator, .get_dcc_en_bits = dcn10_get_dcc_en_bits, .update_visual_confirm_color = dcn10_update_visual_confirm_color, - .is_abm_supported = dcn21_is_abm_supported, - .wait_for_all_pending_updates = dcn30_wait_for_all_pending_updates, + .is_abm_supported = dcn21_is_abm_supported };static const struct hwseq_private_funcs dcn30_private_funcs = {
drivers/gpu/drm/amd/display/dc/hwss/dcn301/dcn301_init.c +0 -1
@@ -107,7 +107,6 @@ static const struct hw_sequencer_funcs dcn301_funcs = { .optimize_pwr_state = dcn21_optimize_pwr_state, .exit_optimized_pwr_state = dcn21_exit_optimized_pwr_state, .update_visual_confirm_color = dcn10_update_visual_confirm_color, - .wait_for_all_pending_updates = dcn30_wait_for_all_pending_updates, };static const struct hwseq_private_funcs dcn301_private_funcs = {
drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_init.c +0 -1
@@ -121,7 +121,6 @@ static const struct hw_sequencer_funcs dcn32_funcs = { .is_pipe_topology_transition_seamless = dcn32_is_pipe_topology_transition_seamless, .calculate_pix_rate_divider = dcn32_calculate_pix_rate_divider, .program_outstanding_updates = dcn32_program_outstanding_updates, - .wait_for_all_pending_updates = dcn30_wait_for_all_pending_updates, };static const struct hwseq_private_funcs dcn32_private_funcs = {
drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_init.c +0 -1
@@ -100,7 +100,6 @@ static const struct hw_sequencer_funcs dcn401_funcs = { .fams2_update_config = dcn401_fams2_update_config, .fams2_global_control_lock_fast = dcn401_fams2_global_control_lock_fast, .program_outstanding_updates = dcn401_program_outstanding_updates, - .wait_for_all_pending_updates = dcn30_wait_for_all_pending_updates, };static const struct hwseq_private_funcs dcn401_private_funcs = {
drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h +0 -1
@@ -462,7 +462,6 @@ struct hw_sequencer_funcs {void (*program_outstanding_updates)(struct dc *dc,struct dc_state *context);void (*setup_hpo_hw_control)(const struct dce_hwseq *hws,bool enable); -void (*wait_for_all_pending_updates)(const struct pipe_ctx *pipe_ctx); }; void color_space_to_black_color(
drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h +1 -3
@@ -342,9 +342,7 @@ struct timing_generator_funcs {void (*wait_drr_doublebuffer_pending_clear)(struct timing_generator *tg);void (*set_long_vtotal)(struct timing_generator *optc,const struct long_vtotal_params *params);void (*wait_odm_doublebuffer_pending_clear)(struct timing_generator *tg); -bool (*get_optc_double_buffer_pending)(struct timing_generator *tg); -bool (*get_otg_double_buffer_pending)(struct timing_generator *tg); - bool (*get_pipe_update_pending)(struct timing_generator *tg); + bool (*get_double_buffer_pending)(struct timing_generator *tg); };#endif
drivers/gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.h +0 -9
@@ -202,7 +202,6 @@ struct dcn_optc_registers {uint32_t OPTC_CLOCK_CONTROL ;uint32_t OPTC_WIDTH_CONTROL2 ;uint32_t OTG_PSTATE_REGISTER ; -uint32_t OTG_PIPE_UPDATE_STATUS ; };#define TG_COMMON_MASK_SH_LIST_DCN (mask_sh)\
@@ -567,12 +566,6 @@ struct dcn_optc_registers {type OTG_H_TIMING_DIV_MODE_DB_UPDATE_PENDING ;\type OPTC_DOUBLE_BUFFER_PENDING ;\ -#define TG_REG_FIELD_LIST_DCN2_0 (type) \ - type OTG_FLIP_PENDING;\ - type OTG_DC_REG_UPDATE_PENDING;\ - type OTG_CURSOR_UPDATE_PENDING;\ - type OTG_VUPDATE_KEEPOUT_STATUS;\ -#define TG_REG_FIELD_LIST_DCN3_2 (type) \ type OTG_H_TIMING_DIV_MODE_MANUAL;
@@ -607,7 +600,6 @@ struct dcn_optc_registers {struct dcn_optc_shift {TG_REG_FIELD_LIST (uint8_t ) - TG_REG_FIELD_LIST_DCN2_0(uint8_t) TG_REG_FIELD_LIST_DCN3_2(uint8_t)TG_REG_FIELD_LIST_DCN3_5 (uint8_t ) TG_REG_FIELD_LIST_DCN401(uint8_t )
@@ -615,7 +607,6 @@ struct dcn_optc_shift {struct dcn_optc_mask {TG_REG_FIELD_LIST (uint32_t ) - TG_REG_FIELD_LIST_DCN2_0(uint32_t) TG_REG_FIELD_LIST_DCN3_2(uint32_t)TG_REG_FIELD_LIST_DCN3_5 (uint32_t ) TG_REG_FIELD_LIST_DCN401(uint32_t )
drivers/gpu/drm/amd/display/dc/optc/dcn20/dcn20_optc.h +1 -6
@@ -43,8 +43,7 @@SRI (OPTC_MEMORY_CONFIG ,ODM , inst),\SR (DWB_SOURCE_SELECT ),\SRI (OTG_MANUAL_FLOW_CONTROL ,OTG , inst), \ -SRI (OTG_DRR_CONTROL ,OTG , inst),\ - SRI(OTG_PIPE_UPDATE_STATUS, OTG, inst) + SRI(OTG_DRR_CONTROL, OTG, inst)#define TG_COMMON_MASK_SH_LIST_DCN2_0 (mask_sh)\ TG_COMMON_MASK_SH_LIST_DCN(mask_sh),\
@@ -54,10 +53,6 @@SF (OTG0_OTG_GLOBAL_CONTROL2 ,GLOBAL_UPDATE_LOCK_EN , mask_sh),\SF (OTG0_OTG_GLOBAL_CONTROL2 ,DIG_UPDATE_LOCATION , mask_sh),\SF (OTG0_OTG_DOUBLE_BUFFER_CONTROL ,OTG_RANGE_TIMING_DBUF_UPDATE_MODE , mask_sh),\ -SF (OTG0_OTG_PIPE_UPDATE_STATUS ,OTG_FLIP_PENDING , mask_sh),\ -SF (OTG0_OTG_PIPE_UPDATE_STATUS ,OTG_DC_REG_UPDATE_PENDING , mask_sh),\ -SF (OTG0_OTG_PIPE_UPDATE_STATUS ,OTG_CURSOR_UPDATE_PENDING , mask_sh),\ -SF (OTG0_OTG_PIPE_UPDATE_STATUS ,OTG_VUPDATE_KEEPOUT_STATUS , mask_sh),\SF (OTG0_OTG_GSL_WINDOW_X ,OTG_GSL_WINDOW_START_X , mask_sh),\SF (OTG0_OTG_GSL_WINDOW_X ,OTG_GSL_WINDOW_END_X , mask_sh), \ SF(OTG0_OTG_GSL_WINDOW_Y, OTG_GSL_WINDOW_START_Y, mask_sh),\
drivers/gpu/drm/amd/display/dc/optc/dcn30/dcn30_optc.c +0 -45
57 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/optc/dcn30/dcn30_optc.h +2 -11
@@ -109,8 +109,7 @@SRI (OPTC_BYTES_PER_PIXEL ,ODM , inst),\SRI (OPTC_WIDTH_CONTROL ,ODM , inst),\SRI (OPTC_MEMORY_CONFIG ,ODM , inst),\ -SR (DWB_SOURCE_SELECT ),\ - SRI(OTG_PIPE_UPDATE_STATUS, OTG, inst) + SR(DWB_SOURCE_SELECT)#define DCN30_VTOTAL_REGS_SF (mask_sh)
@@ -210,7 +209,6 @@SF (ODM0_OPTC_INPUT_CLOCK_CONTROL ,OPTC_INPUT_CLK_GATE_DIS , mask_sh),\SF (ODM0_OPTC_INPUT_GLOBAL_CONTROL ,OPTC_UNDERFLOW_OCCURRED_STATUS , mask_sh),\SF (ODM0_OPTC_INPUT_GLOBAL_CONTROL ,OPTC_UNDERFLOW_CLEAR , mask_sh),\ -SF (ODM0_OPTC_INPUT_GLOBAL_CONTROL ,OPTC_DOUBLE_BUFFER_PENDING , mask_sh),\SF (VTG0_CONTROL ,VTG0_ENABLE , mask_sh),\SF (VTG0_CONTROL ,VTG0_FP2 , mask_sh),\ SF(VTG0_CONTROL, VTG0_VCOUNT_INIT, mask_sh),\
@@ -321,11 +319,7 @@SF (OTG0_OTG_DRR_V_TOTAL_CHANGE ,OTG_DRR_V_TOTAL_CHANGE_LIMIT , mask_sh),\SF (OTG0_OTG_H_TIMING_CNTL ,OTG_H_TIMING_DIV_MODE , mask_sh),\SF (OTG0_OTG_DOUBLE_BUFFER_CONTROL ,OTG_DRR_TIMING_DBUF_UPDATE_PENDING , mask_sh),\ -SF (OTG0_OTG_DOUBLE_BUFFER_CONTROL ,OTG_DRR_TIMING_DBUF_UPDATE_MODE , mask_sh),\ -SF (OTG0_OTG_PIPE_UPDATE_STATUS ,OTG_FLIP_PENDING , mask_sh),\ -SF (OTG0_OTG_PIPE_UPDATE_STATUS ,OTG_DC_REG_UPDATE_PENDING , mask_sh),\ -SF (OTG0_OTG_PIPE_UPDATE_STATUS ,OTG_CURSOR_UPDATE_PENDING , mask_sh),\ -SF (OTG0_OTG_PIPE_UPDATE_STATUS ,OTG_VUPDATE_KEEPOUT_STATUS , mask_sh),\ + SF(OTG0_OTG_DOUBLE_BUFFER_CONTROL, OTG_DRR_TIMING_DBUF_UPDATE_MODE, mask_sh)void dcn30_timing_generator_init (struct optc *optc1);
@@ -362,7 +356,4 @@ void optc3_set_odm_combine(struct timing_generator *optc, int *opp_id, int opp_cvoid optc3_wait_drr_doublebuffer_pending_clear (struct timing_generator *optc);void optc3_tg_init (struct timing_generator *optc);void optc3_set_vtotal_min_max (struct timing_generator *optc,int vtotal_min,int vtotal_max); -bool optc3_get_optc_double_buffer_pending (struct timing_generator *optc); -bool optc3_get_otg_update_pending (struct timing_generator *optc); -bool optc3_get_pipe_update_pending (struct timing_generator *optc);#endif /* __DC_OPTC_DCN30_H__ */
drivers/gpu/drm/amd/display/dc/optc/dcn301/dcn301_optc.c +0 -3
@@ -169,9 +169,6 @@ static struct timing_generator_funcs dcn30_tg_funcs = { .get_hw_timing = optc1_get_hw_timing, .wait_drr_doublebuffer_pending_clear = optc3_wait_drr_doublebuffer_pending_clear, .is_two_pixels_per_container = optc1_is_two_pixels_per_container, - .get_optc_double_buffer_pending = optc3_get_optc_double_buffer_pending, - .get_otg_double_buffer_pending = optc3_get_otg_update_pending, - .get_pipe_update_pending = optc3_get_pipe_update_pending, };void dcn301_timing_generator_init (struct optc *optc1)
drivers/gpu/drm/amd/display/dc/optc/dcn31/dcn31_optc.h +2 -7
@@ -99,8 +99,7 @@SRI (OPTC_MEMORY_CONFIG ,ODM , inst),\SRI (OTG_CRC_CNTL2 ,OTG , inst),\SR (DWB_SOURCE_SELECT ),\ -SRI (OTG_DRR_CONTROL ,OTG , inst),\ - SRI(OTG_PIPE_UPDATE_STATUS, OTG, inst) + SRI(OTG_DRR_CONTROL, OTG, inst)#define OPTC_COMMON_MASK_SH_LIST_DCN3_1 (mask_sh)\ SF(OTG0_OTG_VSTARTUP_PARAM, VSTARTUP_START, mask_sh),\
@@ -255,11 +254,7 @@SF (OTG0_OTG_CRC_CNTL2 ,OTG_CRC_DATA_STREAM_COMBINE_MODE , mask_sh),\SF (OTG0_OTG_CRC_CNTL2 ,OTG_CRC_DATA_STREAM_SPLIT_MODE , mask_sh),\SF (OTG0_OTG_CRC_CNTL2 ,OTG_CRC_DATA_FORMAT , mask_sh),\ -SF (OTG0_OTG_DRR_CONTROL ,OTG_V_TOTAL_LAST_USED_BY_DRR , mask_sh),\ -SF (OTG0_OTG_PIPE_UPDATE_STATUS ,OTG_FLIP_PENDING , mask_sh),\ -SF (OTG0_OTG_PIPE_UPDATE_STATUS ,OTG_DC_REG_UPDATE_PENDING , mask_sh),\ -SF (OTG0_OTG_PIPE_UPDATE_STATUS ,OTG_CURSOR_UPDATE_PENDING , mask_sh),\ -SF (OTG0_OTG_PIPE_UPDATE_STATUS ,OTG_VUPDATE_KEEPOUT_STATUS , mask_sh),\ + SF(OTG0_OTG_DRR_CONTROL, OTG_V_TOTAL_LAST_USED_BY_DRR, mask_sh)void dcn31_timing_generator_init (struct optc *optc1);
drivers/gpu/drm/amd/display/dc/optc/dcn314/dcn314_optc.h +2 -7
@@ -98,8 +98,7 @@SRI (OPTC_BYTES_PER_PIXEL ,ODM , inst),\SRI (OPTC_WIDTH_CONTROL ,ODM , inst),\SRI (OPTC_MEMORY_CONFIG ,ODM , inst),\ -SRI (OTG_DRR_CONTROL ,OTG , inst),\ - SRI(OTG_PIPE_UPDATE_STATUS, OTG, inst) + SRI(OTG_DRR_CONTROL, OTG, inst)#define OPTC_COMMON_MASK_SH_LIST_DCN3_14 (mask_sh)\ SF(OTG0_OTG_VSTARTUP_PARAM, VSTARTUP_START, mask_sh),\
@@ -249,11 +248,7 @@SF (OTG0_OTG_H_TIMING_CNTL ,OTG_H_TIMING_DIV_MODE , mask_sh),\SF (OTG0_OTG_H_TIMING_CNTL ,OTG_H_TIMING_DIV_MODE_MANUAL , mask_sh),\SF (OTG0_OTG_DOUBLE_BUFFER_CONTROL ,OTG_DRR_TIMING_DBUF_UPDATE_MODE , mask_sh),\ -SF (OTG0_OTG_DRR_CONTROL ,OTG_V_TOTAL_LAST_USED_BY_DRR , mask_sh),\ -SF (OTG0_OTG_PIPE_UPDATE_STATUS ,OTG_FLIP_PENDING , mask_sh),\ -SF (OTG0_OTG_PIPE_UPDATE_STATUS ,OTG_DC_REG_UPDATE_PENDING , mask_sh),\ -SF (OTG0_OTG_PIPE_UPDATE_STATUS ,OTG_CURSOR_UPDATE_PENDING , mask_sh),\ -SF (OTG0_OTG_PIPE_UPDATE_STATUS ,OTG_VUPDATE_KEEPOUT_STATUS , mask_sh),\ + SF(OTG0_OTG_DRR_CONTROL, OTG_V_TOTAL_LAST_USED_BY_DRR, mask_sh)void dcn314_timing_generator_init (struct optc *optc1);
drivers/gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.c +13 -3
@@ -297,6 +297,18 @@ static void optc32_set_drr(optc32_setup_manual_trigger (optc); } +bool optc32_get_double_buffer_pending (struct timing_generator *optc) +{ +struct optc *optc1 =DCN10TG_FROM_TG (optc); +uint32_t update_pending =0 ; + +REG_GET (OPTC_INPUT_GLOBAL_CONTROL , +OPTC_DOUBLE_BUFFER_PENDING , + &update_pending); + +return (update_pending ==1 ); +} +static struct timing_generator_funcs dcn32_tg_funcs = { .validate_timing = optc1_validate_timing, .program_timing = optc1_program_timing,
@@ -361,9 +373,7 @@ static struct timing_generator_funcs dcn32_tg_funcs = { .setup_manual_trigger = optc2_setup_manual_trigger, .get_hw_timing = optc1_get_hw_timing, .is_two_pixels_per_container = optc1_is_two_pixels_per_container, - .get_optc_double_buffer_pending = optc3_get_optc_double_buffer_pending, - .get_otg_double_buffer_pending = optc3_get_otg_update_pending, - .get_pipe_update_pending = optc3_get_pipe_update_pending, + .get_double_buffer_pending = optc32_get_double_buffer_pending, };void dcn32_timing_generator_init (struct optc *optc1)
drivers/gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.h +2 -5
@@ -177,11 +177,7 @@SF (OTG0_OTG_H_TIMING_CNTL ,OTG_H_TIMING_DIV_MODE , mask_sh),\SF (OTG0_OTG_H_TIMING_CNTL ,OTG_H_TIMING_DIV_MODE_MANUAL , mask_sh),\SF (OTG0_OTG_DOUBLE_BUFFER_CONTROL ,OTG_DRR_TIMING_DBUF_UPDATE_MODE , mask_sh),\ -SF (OTG0_OTG_DRR_CONTROL ,OTG_V_TOTAL_LAST_USED_BY_DRR , mask_sh),\ -SF (OTG0_OTG_PIPE_UPDATE_STATUS ,OTG_FLIP_PENDING , mask_sh),\ -SF (OTG0_OTG_PIPE_UPDATE_STATUS ,OTG_DC_REG_UPDATE_PENDING , mask_sh),\ -SF (OTG0_OTG_PIPE_UPDATE_STATUS ,OTG_CURSOR_UPDATE_PENDING , mask_sh),\ - SF(OTG0_OTG_PIPE_UPDATE_STATUS, OTG_VUPDATE_KEEPOUT_STATUS, mask_sh) + SF(OTG0_OTG_DRR_CONTROL, OTG_V_TOTAL_LAST_USED_BY_DRR, mask_sh)void dcn32_timing_generator_init (struct optc *optc1);void optc32_set_h_timing_div_manual_mode (struct timing_generator *optc,bool manual_mode);
@@ -189,5 +185,6 @@ void optc32_get_odm_combine_segments(struct timing_generator *tg, int *odm_combivoid optc32_set_odm_bypass (struct timing_generator *optc,const struct dc_crtc_timing *dc_crtc_timing);void optc32_wait_odm_doublebuffer_pending_clear (struct timing_generator *tg); +bool optc32_get_double_buffer_pending (struct timing_generator *optc);#endif /* __DC_OPTC_DCN32_H__ */
drivers/gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.h +1 -5
@@ -67,11 +67,7 @@SF (OTG0_OTG_CRC1_WINDOWB_Y_CONTROL_READBACK ,OTG_CRC1_WINDOWB_Y_END_READBACK , mask_sh),\SF (OPTC_CLOCK_CONTROL ,OPTC_FGCG_REP_DIS , mask_sh),\SF (OTG0_OTG_V_COUNT_STOP_CONTROL ,OTG_V_COUNT_STOP , mask_sh),\ -SF (OTG0_OTG_V_COUNT_STOP_CONTROL2 ,OTG_V_COUNT_STOP_TIMER , mask_sh),\ -SF (OTG0_OTG_PIPE_UPDATE_STATUS ,OTG_FLIP_PENDING , mask_sh),\ -SF (OTG0_OTG_PIPE_UPDATE_STATUS ,OTG_DC_REG_UPDATE_PENDING , mask_sh),\ -SF (OTG0_OTG_PIPE_UPDATE_STATUS ,OTG_CURSOR_UPDATE_PENDING , mask_sh),\ - SF(OTG0_OTG_PIPE_UPDATE_STATUS, OTG_VUPDATE_KEEPOUT_STATUS, mask_sh) + SF(OTG0_OTG_V_COUNT_STOP_CONTROL2, OTG_V_COUNT_STOP_TIMER, mask_sh)void dcn35_timing_generator_init (struct optc *optc1);
drivers/gpu/drm/amd/display/dc/optc/dcn401/dcn401_optc.c +1 -3
@@ -493,9 +493,7 @@ static struct timing_generator_funcs dcn401_tg_funcs = { .setup_manual_trigger = optc2_setup_manual_trigger, .get_hw_timing = optc1_get_hw_timing, .is_two_pixels_per_container = optc1_is_two_pixels_per_container, - .get_optc_double_buffer_pending = optc3_get_optc_double_buffer_pending, - .get_otg_double_buffer_pending = optc3_get_otg_update_pending, - .get_pipe_update_pending = optc3_get_pipe_update_pending, + .get_double_buffer_pending = optc32_get_double_buffer_pending, };void dcn401_timing_generator_init (struct optc *optc1)
drivers/gpu/drm/amd/display/dc/optc/dcn401/dcn401_optc.h +1 -5
@@ -159,11 +159,7 @@SF (OTG0_OTG_PSTATE_REGISTER ,OTG_PSTATE_KEEPOUT_START , mask_sh),\SF (OTG0_OTG_PSTATE_REGISTER ,OTG_PSTATE_EXTEND , mask_sh),\SF (OTG0_OTG_PSTATE_REGISTER ,OTG_UNBLANK , mask_sh),\ -SF (OTG0_OTG_PSTATE_REGISTER ,OTG_PSTATE_ALLOW_WIDTH_MIN , mask_sh),\ -SF (OTG0_OTG_PIPE_UPDATE_STATUS ,OTG_FLIP_PENDING , mask_sh),\ -SF (OTG0_OTG_PIPE_UPDATE_STATUS ,OTG_DC_REG_UPDATE_PENDING , mask_sh),\ -SF (OTG0_OTG_PIPE_UPDATE_STATUS ,OTG_CURSOR_UPDATE_PENDING , mask_sh),\ - SF(OTG0_OTG_PIPE_UPDATE_STATUS, OTG_VUPDATE_KEEPOUT_STATUS, mask_sh) + SF(OTG0_OTG_PSTATE_REGISTER, OTG_PSTATE_ALLOW_WIDTH_MIN, mask_sh)void dcn401_timing_generator_init (struct optc *optc1);
drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.h +1 -2
@@ -1054,8 +1054,7 @@ unsigned int dcn32_calculate_mall_ways_from_bytes(const struct dc *dc, unsignedSRI_ARR (OPTC_BYTES_PER_PIXEL ,ODM , inst), \SRI_ARR (OPTC_WIDTH_CONTROL ,ODM , inst), \SRI_ARR (OPTC_MEMORY_CONFIG ,ODM , inst), \ -SRI_ARR (OTG_DRR_CONTROL ,OTG , inst), \ -SRI_ARR (OTG_PIPE_UPDATE_STATUS ,OTG , inst) +SRI_ARR (OTG_DRR_CONTROL ,OTG , inst)/* HUBP */
drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.h +2 -3
@@ -536,9 +536,8 @@ void dcn401_prepare_mcache_programming(struct dc *dc, struct dc_state *context);SRI_ARR (OPTC_WIDTH_CONTROL ,ODM , inst), \SRI_ARR (OPTC_WIDTH_CONTROL2 ,ODM , inst), \SRI_ARR (OPTC_MEMORY_CONFIG ,ODM , inst), \ -SRI_ARR (OTG_DRR_CONTROL ,OTG , inst), \ -SRI_ARR (OTG_PSTATE_REGISTER ,OTG , inst), \ - SRI_ARR(OTG_PIPE_UPDATE_STATUS, OTG, inst) +SRI_ARR (OTG_DRR_CONTROL ,OTG , inst), \ +SRI_ARR (OTG_PSTATE_REGISTER ,OTG , inst) /* HUBBUB */#define HUBBUB_REG_LIST_DCN4_01_RI (id) \
Signature · 1 line
2.46.0
PATCH 10/14 drm/amd/display: Add sharpness control interface
In reply to Hamza MahfoozFrom: Relja Vojvodic <[email protected]>
- Add interface for controlling shapness level input into DCN.
- Update SPL to support custom sharpness values.
- Add support for different sharpness values depending on YUV/RGB content.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 8 +- drivers/gpu/drm/amd/display/dc/dc.h | 3 +- .../gpu/drm/amd/display/dc/dc_spl_translate.c | 46 ++-- drivers/gpu/drm/amd/display/dc/dc_stream.h | 3 + .../display/dc/dpp/dcn401/dcn401_dpp_dscl.c | 24 +- drivers/gpu/drm/amd/display/dc/spl/dc_spl.c | 4 +- .../display/dc/spl/dc_spl_isharp_filters.c | 213 +++++------------- .../display/dc/spl/dc_spl_isharp_filters.h | 2 +- .../gpu/drm/amd/display/dc/spl/dc_spl_types.h | 27 ++- 9 files changed, 138 insertions(+), 192 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +7 -1
@@ -2690,6 +2690,9 @@ static enum surface_update_type check_update_surfaces_for_stream( stream_update->vrr_active_variable || stream_update->vrr_active_fixed)) su_flags->bits.fams_changed = 1; +if (stream_update->scaler_sharpener_update) + su_flags->bits.scaler_sharpener =1 ; +if (su_flags->raw !=0 ) overall_type =UPDATE_TYPE_FULL ;
@@ -3022,6 +3025,8 @@ static void copy_stream_update_to_stream(struct dc *dc, update->dsc_config =NULL ; } } +if (update->scaler_sharpener_update) + stream->scaler_sharpener_update = *update->scaler_sharpener_update; } static void backup_planes_and_stream_state(
@@ -4713,7 +4718,8 @@ static bool full_update_required(struct dc *dc, stream_update->func_shaper || stream_update->lut3d_func || stream_update->pending_test_pattern || - stream_update->crtc_timing_adjust)) + stream_update->crtc_timing_adjust || + stream_update->scaler_sharpener_update)) return true;if (stream) {
drivers/gpu/drm/amd/display/dc/dc.h +2 -1
@@ -1052,6 +1052,7 @@ struct dc_debug_options {unsigned int disable_spl;unsigned int force_easf;unsigned int force_sharpness; +unsigned int force_sharpness_level;unsigned int force_lls;bool notify_dpia_hr_bw;bool enable_ips_visual_confirm;
@@ -1348,7 +1349,7 @@ struct dc_plane_state {enum mpcc_movable_cm_location mcm_location;struct dc_csc_transform cursor_csc_color_matrix;bool adaptive_sharpness_en; -unsigned int sharpnessX1000; +int sharpness_level;enum linear_light_scaling linear_light_scaling; };
drivers/gpu/drm/amd/display/dc/dc_spl_translate.c +29 -17
53 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dc_stream.h +3 -0
@@ -142,6 +142,7 @@ union stream_update_flags { uint32_t mst_bw : 1; uint32_t crtc_timing_adjust : 1; uint32_t fams_changed : 1; + uint32_t scaler_sharpener : 1; } bits;uint32_t raw;
@@ -308,6 +309,7 @@ struct dc_stream_state {bool is_phantom;struct luminance_data lumin_data; +bool scaler_sharpener_update; };#define ABM_LEVEL_IMMEDIATE_DISABLE 255
@@ -353,6 +355,7 @@ struct dc_stream_update {struct dc_cursor_attributes *cursor_attributes;struct dc_cursor_position *cursor_position;bool *hw_cursor_req; +bool *scaler_sharpener_update; }; bool dc_is_stream_unchanged(
drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp_dscl.c +21 -3
@@ -957,6 +957,7 @@ static void dpp401_dscl_set_isharp_filter(*/ static void dpp401_dscl_program_isharp (struct dpp *dpp_base,const struct scaler_data *scl_data, +bool program_isharp_1dlut,bool *bs_coeffs_updated) {struct dcn401_dpp *dpp =TO_DCN401_DPP (dpp_base);
@@ -1015,7 +1016,8 @@ static void dpp401_dscl_program_isharp(struct dpp *dpp_base, ISHARP_LBA_PWL_BASE_SEG5, scl_data->dscl_prog_data.isharp_lba.base_seg[5]);/* ISHARP_DELTA_LUT */ -dpp401_dscl_set_isharp_filter (dpp, scl_data->dscl_prog_data.isharp_delta); +if (!program_isharp_1dlut) +dpp401_dscl_set_isharp_filter (dpp, scl_data->dscl_prog_data.isharp_delta);/* ISHARP_NLDELTA_SOFT_CLIP */ REG_SET_6(ISHARP_NLDELTA_SOFT_CLIP, 0,
@@ -1071,13 +1073,29 @@ void dpp401_dscl_set_scaler_manual_scale(struct dpp *dpp_base, dpp_base, scl_data, dpp_base->ctx->dc->debug.always_scale);bool ycbcr = scl_data->format >=PIXEL_FORMAT_VIDEO_BEGIN && scl_data->format <=PIXEL_FORMAT_VIDEO_END ; +bool program_isharp_1dlut = false;bool bs_coeffs_updated = false; +if (memcmp (&dpp->scl_data, scl_data,sizeof (*scl_data)) ==0 )return ;PERF_TRACE (); +/* If only sharpness has changed, then only update 1dlut, then return */ +if (scl_data->dscl_prog_data.isharp_en && + (dpp->scl_data.dscl_prog_data.sharpness_level + != scl_data->dscl_prog_data.sharpness_level)) { +/* ISHARP_DELTA_LUT */ +dpp401_dscl_set_isharp_filter (dpp, scl_data->dscl_prog_data.isharp_delta); + dpp->scl_data.dscl_prog_data.sharpness_level = scl_data->dscl_prog_data.sharpness_level; + dpp->scl_data.dscl_prog_data.isharp_delta = scl_data->dscl_prog_data.isharp_delta; + +if (memcmp (&dpp->scl_data, scl_data,sizeof (*scl_data)) ==0 ) +return ; + program_isharp_1dlut = true; + } + dpp->scl_data = *scl_data;if ((dpp->base.ctx->dc->config.use_spl) && (!dpp->base.ctx->dc->debug.disable_spl)) {
@@ -1131,7 +1149,7 @@ void dpp401_dscl_set_scaler_manual_scale(struct dpp *dpp_base,if (dscl_mode ==DSCL_MODE_SCALING_444_BYPASS ) {if (dpp->base.ctx->dc->config.prefer_easf)dpp401_dscl_disable_easf (dpp_base, scl_data); -dpp401_dscl_program_isharp (dpp_base, scl_data, &bs_coeffs_updated); +dpp401_dscl_program_isharp (dpp_base, scl_data, program_isharp_1dlut, &bs_coeffs_updated);return ; }
@@ -1165,7 +1183,7 @@ void dpp401_dscl_set_scaler_manual_scale(struct dpp *dpp_base,* WB scaler coeffs and toggle coeff RAM together */ //if (dpp->base.ctx->dc->config.prefer_easf) -dpp401_dscl_program_isharp (dpp_base, scl_data, &bs_coeffs_updated); +dpp401_dscl_program_isharp (dpp_base, scl_data, program_isharp_1dlut, &bs_coeffs_updated);dpp401_dscl_set_scl_filter (dpp, scl_data, ycbcr, bs_coeffs_updated);/* Edge adaptive scaler function configuration */
drivers/gpu/drm/amd/display/dc/spl/dc_spl.c +3 -1
@@ -1662,8 +1662,10 @@ static void spl_set_isharp_data(struct dscl_prog_data *dscl_prog_data, dscl_prog_data->isharp_lba.base_seg[5 ] =0 ;// ISHARP LBA PWL for Seg 5. BASE value in U0.6 format } -spl_build_isharp_1dlut_from_reference_curve (ratio, setup, adp_sharpness.sharpness); + +spl_build_isharp_1dlut_from_reference_curve (ratio, setup, adp_sharpness); dscl_prog_data->isharp_delta =spl_get_pregen_filter_isharp_1D_lut (setup); + dscl_prog_data->sharpness_level = adp_sharpness.sharpness_level;// Program the nldelta soft clip values if (lls_pref ==LLS_PREF_YES ) {
drivers/gpu/drm/amd/display/dc/spl/dc_spl_isharp_filters.c +52 -161
256 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/spl/dc_spl_isharp_filters.h +1 -1
@@ -45,6 +45,6 @@ void spl_init_blur_scale_coeffs(void);void spl_set_blur_scale_data (struct dscl_prog_data *dscl_prog_data,const struct spl_scaler_data *data); -void spl_build_isharp_1dlut_from_reference_curve (struct spl_fixed31_32 ratio,enum system_setup setup,enum explicit_sharpness sharpness); +void spl_build_isharp_1dlut_from_reference_curve (struct spl_fixed31_32 ratio,enum system_setup setup,struct adaptive_sharpness sharpness);uint32_t *spl_get_pregen_filter_isharp_1D_lut (enum system_setup setup);#endif /* __DC_SPL_ISHARP_FILTERS_H__ */
drivers/gpu/drm/amd/display/dc/spl/dc_spl_types.h +20 -7
@@ -407,6 +407,7 @@ struct dscl_prog_data {/* blur and scale filter */ const uint16_t *filter_blur_scale_v;const uint16_t *filter_blur_scale_h; +int sharpness_level;/* Track sharpness level */ };/* SPL input and output definitions */
@@ -460,14 +461,26 @@ struct basic_out {bool alpha_en;bool use_two_pixels_per_container; }; -enum explicit_sharpness { -SHARPNESS_LOW =0 , -SHARPNESS_MID , -SHARPNESS_HIGH -}; -struct adaptive_sharpness { +enum sharpness_setting { +SHARPNESS_HW_OFF =0 , +SHARPNESS_ZERO , +SHARPNESS_CUSTOM +}; +struct spl_sharpness_range { +int sdr_rgb_min; +int sdr_rgb_max; +int sdr_rgb_mid; +int sdr_yuv_min; +int sdr_yuv_max; +int sdr_yuv_mid; +int hdr_rgb_min; +int hdr_rgb_max; +int hdr_rgb_mid; +}; +struct adaptive_sharpness {bool enable; -enum explicit_sharpness sharpness; +int sharpness_level; +struct spl_sharpness_range sharpness_range; };enum linear_light_scaling {// convert it in translation logic LLS_PREF_DONT_CARE =0 ,
Signature · 1 line
2.46.0
PATCH 11/14 drm/amd/display: fix graphics hang in multi-display mst case
In reply to Hamza MahfoozFrom: Gabe Teeger <[email protected]>
[what]
Graphics hang observed with 3 displays connected to DP2.0 mst dock.
[why]
There's a mismatch in dml and dc between the assignments of hpo link encoders.
[how]
Add a new array in dml that tracks the current mapping of HPO stream encoders to HPO link encoders in dc.
--- .../amd/display/dc/dml2/dml2_internal_types.h | 2 +- .../display/dc/dml2/dml2_translation_helper.c | 67 +++++++++---------- .../display/dc/dml2/dml2_translation_helper.h | 2 +- .../gpu/drm/amd/display/dc/dml2/dml2_utils.c | 12 +--- 4 files changed, 34 insertions(+), 49 deletions(-)
drivers/gpu/drm/amd/display/dc/dml2/dml2_internal_types.h +1 -1
@@ -101,7 +101,7 @@ struct dml2_wrapper_scratch {struct dml2_dml_to_dc_pipe_mapping dml_to_dc_pipe_mapping;bool enable_flexible_pipe_mapping;bool plane_duplicate_exists; -unsigned int dp2_mst_stream_count; +int hpo_stream_to_link_encoder_mapping[MAX_HPO_DP2_ENCODERS ]; };struct dml2_helper_det_policy_scratch {
drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c +30 -37
110 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.h +1 -1
@@ -36,6 +36,6 @@ void dml2_translate_socbb_params(const struct dc *in_dc, struct soc_bounding_boxvoid dml2_translate_soc_states (const struct dc *in_dc,struct soc_states_st *out,int num_states);void map_dc_state_into_dml_display_cfg (struct dml2_context *dml2,struct dc_state *context,struct dml_display_cfg_st *dml_dispcfg);void dml2_update_pipe_ctx_dchub_regs (struct _vcs_dpi_dml_display_rq_regs_st *rq_regs,struct _vcs_dpi_dml_display_dlg_regs_st *disp_dlg_regs,struct _vcs_dpi_dml_display_ttu_regs_st *disp_ttu_regs,struct pipe_ctx *out); -bool is_dp2p0_output_encoder (const struct pipe_ctx *pipe,unsigned int dp2_mst_stream_count); +bool is_dp2p0_output_encoder (const struct pipe_ctx *pipe);#endif //__DML2_TRANSLATION_HELPER_H__
drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.c +2 -10
@@ -153,7 +153,7 @@ unsigned int dml2_util_get_maximum_odm_combine_for_output(bool force_odm_4to1, e } } -bool is_dp2p0_output_encoder (const struct pipe_ctx *pipe_ctx,unsigned int dp2_mst_stream_count) +bool is_dp2p0_output_encoder (const struct pipe_ctx *pipe_ctx) {if (pipe_ctx ==NULL || pipe_ctx->stream ==NULL )return false;
@@ -161,14 +161,6 @@ bool is_dp2p0_output_encoder(const struct pipe_ctx *pipe_ctx, unsigned int dp2_m/* If this assert is hit then we have a link encoder dynamic management issue */ ASSERT (pipe_ctx->stream_res.hpo_dp_stream_enc ? pipe_ctx->link_res.hpo_dp_link_enc !=NULL : true); -/* Count MST hubs once by treating only 1st remote sink in topology as an encoder */ -if (pipe_ctx->stream->link && pipe_ctx->stream->link->remote_sinks[0 ] && dp2_mst_stream_count >1 ) { -return (pipe_ctx->stream_res.hpo_dp_stream_enc && - pipe_ctx->link_res.hpo_dp_link_enc && -dc_is_dp_signal (pipe_ctx->stream->signal) && - (pipe_ctx->stream->link->remote_sinks[0 ]->sink_id == pipe_ctx->stream->sink->sink_id)); - } -return (pipe_ctx->stream_res.hpo_dp_stream_enc && pipe_ctx->link_res.hpo_dp_link_enc &&dc_is_dp_signal (pipe_ctx->stream->signal));
@@ -181,7 +173,7 @@ bool is_dtbclk_required(const struct dc *dc, struct dc_state *context)for (i =0 ; i < dc->res_pool->pipe_count; i++) {if (!context->res_ctx.pipe_ctx[i].stream)continue ; -if (is_dp2p0_output_encoder (&context->res_ctx.pipe_ctx[i], context->bw_ctx.dml2->v20.scratch.dp2_mst_stream_count)) +if (is_dp2p0_output_encoder (&context->res_ctx.pipe_ctx[i]))return true; }return false;
Signature · 1 line
2.46.0
PATCH 12/14 drm/amd/display: Block timing sync for different signals in PMO
In reply to Hamza MahfoozFrom: Dillon Varone <[email protected]>
PMO assumes that like timings can be synchronized, but DC only allows this if the signal types match.
--- .../display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c +2 -1
@@ -941,7 +941,8 @@ static void build_synchronized_timing_groups(for (j = i +1 ; j < display_config->display_config.num_streams; j++) {if (memcmp (master_timing, &display_config->display_config.stream_descriptors[j].timing, -sizeof (struct dml2_timing_cfg )) ==0 ) { +sizeof (struct dml2_timing_cfg )) ==0 && + display_config->display_config.stream_descriptors[i].output.output_encoder == display_config->display_config.stream_descriptors[j].output.output_encoder) {set_bit_in_bitfield (&pmo->scratch.pmo_dcn4.synchronized_timing_group_masks[timing_group_idx], j);set_bit_in_bitfield (&stream_mapped_mask, j); }
Signature · 1 line
2.46.0
PATCH 13/14 drm/amd/display: Fix flickering caused by dccg
In reply to Hamza MahfoozFrom: Hansen Dsouza <[email protected]>
Always allow un-gating. Follow legacy workaround for repeated dppclk dto updates
--- .../amd/display/dc/dccg/dcn20/dcn20_dccg.h | 11 +++ .../amd/display/dc/dccg/dcn35/dcn35_dccg.c | 89 +++++++++++++------ .../amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 45 ---------- 3 files changed, 72 insertions(+), 73 deletions(-)
drivers/gpu/drm/amd/display/dc/dccg/dcn20/dcn20_dccg.h +11 -0
@@ -328,6 +328,17 @@type DPSTREAMCLK1_GATE_DISABLE ;\type DPSTREAMCLK2_GATE_DISABLE ;\type DPSTREAMCLK3_GATE_DISABLE ;\ +type SYMCLKA_FE_GATE_DISABLE ;\ +type SYMCLKB_FE_GATE_DISABLE ;\ +type SYMCLKC_FE_GATE_DISABLE ;\ +type SYMCLKD_FE_GATE_DISABLE ;\ +type SYMCLKE_FE_GATE_DISABLE ;\ +type SYMCLKA_GATE_DISABLE ;\ +type SYMCLKB_GATE_DISABLE ;\ +type SYMCLKC_GATE_DISABLE ;\ +type SYMCLKD_GATE_DISABLE ;\ +type SYMCLKE_GATE_DISABLE ;\ +#define DCCG401_REG_FIELD_LIST (type) \ type OTG0_TMDS_PIXEL_RATE_DIV;\
drivers/gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c +61 -28
231 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c +0 -45
57 lines not on this page · raw message
Signature · 1 line
2.46.0
PATCH 14/14 drm/amd/display: 3.2.299
In reply to Hamza MahfoozFrom: Aric Cyr <[email protected]>
This version brings along the following:
- DCN35 fixes
- DML2 fixes
- IPS fixes
- ODM fixes
- Miscellaneous cleanups
- MST fixes
- SPL fixes
--- drivers/gpu/drm/amd/display/dc/dc.h | 2 +- drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/dc.h +1 -1
@@ -55,7 +55,7 @@ struct aux_payload;struct set_config_cmd_payload ;struct dmub_notification ; -#define DC_VER "3.2.298" +#define DC_VER "3.2.299"#define MAX_SURFACES 3#define MAX_PLANES 6
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h +1 -1
@@ -111,7 +111,7 @@#define DMUB_MAX_PHANTOM_PLANES ((DMUB_MAX_PLANES) / 2)/* Trace buffer offset for entry */ -#define TRACE_BUFFER_ENTRY_OFFSET 16 +#define TRACE_BUFFER_ENTRY_OFFSET 16/** * Maximum number of dirty rects supported by FW.
Signature · 1 line
2.46.0