DC Patches Jan 12, 2026
Subsystems (3)
cover DC Patches Jan 12, 2026
This DC patchset brings improvements in multiple areas. In summary, we have:
- Cleanup, refactoring of panel replay code to prepare for non-eDP replay
- Switch to drm_dbg_macros instead of DRM_DEBUG variants
- Add pwait status to DMCUB debug logging
- Adjust PHY FSM transition to TX_EN-to-PLL_ON for TMDS on DCN35
- Always update divider settings for DP tunnel
- correct clip x assignment in cursor programming
- Bump the HDMI clock to 340MHz
Aurabindo Pillai (2):
drm/amd/display: switch to drm_dbg_kms() from DRM_DEBUG_KMS drm/amd/display: switch to drm_dbg_ macros instead of DRM_DEBUG_
variants
Ausef Yousof (1):
drm/amd/display: correct clip x assignment in cursor programming
Cruise Hung (1):
drm/amd/display: Always update divider settings for DP tunnel
Derek Lai (1):
drm/amd/display: revert "write default Vesa Aux backlight control in
dmub"
Dmytro Laktyushkin (1):
drm/amd/display: only power down dig on phy endpoints
Jack Chang (2):
drm/amd/display: DPCD for Selective Update
drm/amd/display: PR error HPD_IRQ handling
Joshua Aberback (1):
drm/amd/display: Re-implement minimal transition deferral
Leo Chen (1):
drm/amd/display: Add global fgcg function prototype to DCCG
Mario Limonciello (1):
drm/amd/display: Bump the HDMI clock to 340MHz
Mario Limonciello (AMD) (1):
drm/amd/display: Show link name in PSR status message
Nicholas Kazlauskas (2):
drm/amd/display: Adjust PHY FSM transition to TX_EN-to-PLL_ON for TMDS
on DCN35
drm/amd/display: Add pwait status to DMCUB debug logging
Peichen Huang (3):
drm/amd/display: move panel replay out from edp drm/amd/display: init code for external panel replay drm/amd/display: Add replay_events in replay settings
Ray Wu (1):
drm/amd/display: disable replay when crc source is enabled
Robin Chen (1):
drm/amd/display: Remove unused DMUB replay commands
Taimur Hassan (2):
drm/amd/display: [FW Promotion] Release 0.1.42.0 drm/amd/display: Promote DC to 3.2.365
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 58 +-- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 1 + .../drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 25 +- .../amd/display/amdgpu_dm/amdgpu_dm_replay.c | 9 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 49 ++- .../drm/amd/display/dc/core/dc_link_exports.c | 9 +- drivers/gpu/drm/amd/display/dc/dc.h | 2 +- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 1 + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 34 +- .../gpu/drm/amd/display/dc/dc_hdmi_types.h | 2 +- drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 6 + drivers/gpu/drm/amd/display/dc/dc_types.h | 3 +- .../drm/amd/display/dc/dce/dmub_hw_lock_mgr.c | 2 +- .../gpu/drm/amd/display/dc/dce/dmub_replay.c | 13 - .../amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 6 +- .../amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 52 +++ .../amd/display/dc/hwss/dcn35/dcn35_hwseq.h | 3 + .../amd/display/dc/hwss/dcn35/dcn35_init.c | 2 +- .../amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 2 + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 1 + .../gpu/drm/amd/display/dc/inc/link_service.h | 12 +- drivers/gpu/drm/amd/display/dc/link/Makefile | 2 +- .../display/dc/link/accessories/link_dp_cts.c | 7 +- .../drm/amd/display/dc/link/link_detection.c | 6 +- .../gpu/drm/amd/display/dc/link/link_dpms.c | 8 +- .../drm/amd/display/dc/link/link_factory.c | 19 +- .../dc/link/protocols/link_dp_capability.c | 49 ++- .../dc/link/protocols/link_dp_irq_handler.c | 43 +++ .../dc/link/protocols/link_dp_panel_replay.c | 343 ++++++++++++++++++ .../dc/link/protocols/link_dp_panel_replay.h | 38 ++ .../link/protocols/link_edp_panel_control.c | 297 +-------------- .../link/protocols/link_edp_panel_control.h | 10 +- .../dc/resource/dcn31/dcn31_resource.c | 11 +- .../gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 54 +-- .../gpu/drm/amd/display/include/dpcd_defs.h | 30 ++ 35 files changed, 763 insertions(+), 446 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_panel_replay.c create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_panel_replay.h
Signature · 1 line
2.52.0
PATCH 1/21 drm/amd/display: move panel replay out from edp
From: Peichen Huang <[email protected]>
[WHY]
Panel Replay is not an eDP-specific function.
[HOW]
Create new Panel Replay source files and move the Panel Replay functions from the eDP files to the new files. Additionally, create a new link_service construct function to assign the related function pointers.
--- .../amd/display/amdgpu_dm/amdgpu_dm_replay.c | 2 +- .../drm/amd/display/dc/core/dc_link_exports.c | 9 +- .../gpu/drm/amd/display/dc/inc/link_service.h | 10 +- drivers/gpu/drm/amd/display/dc/link/Makefile | 2 +- .../drm/amd/display/dc/link/link_factory.c | 18 +- .../dc/link/protocols/link_dp_irq_handler.c | 1 + .../dc/link/protocols/link_dp_panel_replay.c | 308 ++++++++++++++++++ .../dc/link/protocols/link_dp_panel_replay.h | 38 +++ .../link/protocols/link_edp_panel_control.c | 271 +-------------- .../link/protocols/link_edp_panel_control.h | 8 +- 10 files changed, 373 insertions(+), 294 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_panel_replay.c create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_panel_replay.h
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_replay.c +1 -1
@@ -161,7 +161,7 @@ bool amdgpu_dm_replay_enable(struct dc_stream_state *stream, bool wait) link = stream->link;if (link) { - link->dc->link_srv->edp_setup_replay (link, stream); + link->dc->link_srv->dp_setup_replay (link, stream); link->dc->link_srv->edp_set_coasting_vtotal (link, stream->timing.v_total,0 );DRM_DEBUG_DRIVER ("Enabling replay...\n" ); link->dc->link_srv->edp_set_replay_allow_active (link, &replay_active, wait, false,NULL );
drivers/gpu/drm/amd/display/dc/core/dc_link_exports.c +4 -5
@@ -493,24 +493,24 @@ bool dc_link_get_replay_state(const struct dc_link *link, uint64_t *state)bool dc_link_set_pr_enable (struct dc_link *link,bool enable) { -return link->dc->link_srv->edp_pr_enable (link, enable); +return link->dc->link_srv->dp_pr_enable (link, enable); }bool dc_link_update_pr_state (struct dc_link *link,struct dmub_cmd_pr_update_state_data *update_state_data) { -return link->dc->link_srv->edp_pr_update_state (link, update_state_data); +return link->dc->link_srv->dp_pr_update_state (link, update_state_data); }bool dc_link_set_pr_general_cmd (struct dc_link *link,struct dmub_cmd_pr_general_cmd_data *general_cmd_data) { -return link->dc->link_srv->edp_pr_set_general_cmd (link, general_cmd_data); +return link->dc->link_srv->dp_pr_set_general_cmd (link, general_cmd_data); }bool dc_link_get_pr_state (const struct dc_link *link,uint64_t *state) { -return link->dc->link_srv->edp_pr_get_state (link, state); +return link->dc->link_srv->dp_pr_get_state (link, state); }bool dc_link_wait_for_t12 (struct dc_link *link)
@@ -549,4 +549,3 @@ void dc_link_get_alpm_support(struct dc_link *link, { link->dc->link_srv->edp_get_alpm_support (link, auxless_support, auxwake_support); } -
drivers/gpu/drm/amd/display/dc/inc/link_service.h +5 -5
@@ -283,7 +283,7 @@ struct link_service {bool (*edp_set_replay_allow_active)(struct dc_link *dc_link,const bool *enable,bool wait,bool force_static,const unsigned int *power_opts); -bool (*edp_setup_replay)(struct dc_link *link, +bool (*dp_setup_replay)(struct dc_link *link,const struct dc_stream_state *stream); bool (*edp_send_replay_cmd)(struct dc_link *link, enum replay_FW_Message_type msg,
@@ -304,10 +304,10 @@ struct link_service {bool (*edp_receiver_ready_T9)(struct dc_link *link);bool (*edp_receiver_ready_T7)(struct dc_link *link);bool (*edp_power_alpm_dpcd_enable)(struct dc_link *link,bool enable); -bool (*edp_pr_enable)(struct dc_link *link,bool enable); -bool (*edp_pr_update_state)(struct dc_link *link,struct dmub_cmd_pr_update_state_data *update_state_data); -bool (*edp_pr_set_general_cmd)(struct dc_link *link,struct dmub_cmd_pr_general_cmd_data *general_cmd_data); -bool (*edp_pr_get_state)(const struct dc_link *link,uint64_t *state); +bool (*dp_pr_enable)(struct dc_link *link,bool enable); +bool (*dp_pr_update_state)(struct dc_link *link,struct dmub_cmd_pr_update_state_data *update_state_data); +bool (*dp_pr_set_general_cmd)(struct dc_link *link,struct dmub_cmd_pr_general_cmd_data *general_cmd_data); +bool (*dp_pr_get_state)(const struct dc_link *link,uint64_t *state);void (*edp_set_panel_power)(struct dc_link *link,bool powerOn);
drivers/gpu/drm/amd/display/dc/link/Makefile +1 -1
@@ -56,7 +56,7 @@ LINK_PROTOCOLS = link_hpd.o link_ddc.o link_dpcd.o link_dp_dpia.o \ link_dp_training.o link_dp_training_8b_10b.o link_dp_training_128b_132b.o \ link_dp_training_dpia.o link_dp_training_auxless.o \ link_dp_training_fixed_vs_pe_retimer.o link_dp_phy.o link_dp_capability.o \ -link_edp_panel_control.o link_dp_irq_handler.o link_dp_dpia_bw.o +link_edp_panel_control.o link_dp_panel_replay.o link_dp_irq_handler.o link_dp_dpia_bw.o AMD_DAL_LINK_PROTOCOLS = $(addprefix $(AMDDALPATH)/dc/link/protocols/, \ $(LINK_PROTOCOLS))
drivers/gpu/drm/amd/display/dc/link/link_factory.c +13 -5
@@ -41,6 +41,7 @@#include "protocols/link_dp_phy.h" #include "protocols/link_dp_training.h" #include "protocols/link_edp_panel_control.h" +#include "protocols/link_dp_panel_replay.h" #include "protocols/link_hpd.h" #include "gpio_service_interface.h" #include "atomfirmware.h"
@@ -214,7 +215,6 @@ static void construct_link_service_edp_panel_control(struct link_service *link_s link_srv->edp_get_replay_state = edp_get_replay_state; link_srv->edp_set_replay_allow_active = edp_set_replay_allow_active; - link_srv->edp_setup_replay = edp_setup_replay; link_srv->edp_send_replay_cmd = edp_send_replay_cmd; link_srv->edp_set_coasting_vtotal = edp_set_coasting_vtotal; link_srv->edp_replay_residency = edp_replay_residency;
@@ -228,13 +228,20 @@ static void construct_link_service_edp_panel_control(struct link_service *link_s link_srv->edp_receiver_ready_T9 = edp_receiver_ready_T9; link_srv->edp_receiver_ready_T7 = edp_receiver_ready_T7; link_srv->edp_power_alpm_dpcd_enable = edp_power_alpm_dpcd_enable; - link_srv->edp_pr_enable = edp_pr_enable; - link_srv->edp_pr_update_state = edp_pr_update_state; - link_srv->edp_pr_set_general_cmd = edp_pr_set_general_cmd; - link_srv->edp_pr_get_state = edp_pr_get_state; link_srv->edp_set_panel_power = edp_set_panel_power; } +/* link dp panel replay implements DP panel replay functionality. +*/ +static void construct_link_service_dp_panel_replay (struct link_service *link_srv) +{ + link_srv->dp_setup_replay = dp_setup_replay; + link_srv->dp_pr_enable = dp_pr_enable; + link_srv->dp_pr_update_state = dp_pr_update_state; + link_srv->dp_pr_set_general_cmd = dp_pr_set_general_cmd; + link_srv->dp_pr_get_state = dp_pr_get_state; +} +/* link dp cts implements dp compliance test automation protocols and manual * testing interfaces for debugging and certification purpose. */
@@ -287,6 +294,7 @@ static void construct_link_service(struct link_service *link_srv)construct_link_service_dp_phy_or_dpia (link_srv);construct_link_service_dp_irq_handler (link_srv);construct_link_service_edp_panel_control (link_srv); +construct_link_service_dp_panel_replay (link_srv);construct_link_service_dp_cts (link_srv);construct_link_service_dp_trace (link_srv); }
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_irq_handler.c +1 -0
@@ -38,6 +38,7 @@#include "link/link_dpms.h" #include "dm_helpers.h" #include "link_dp_dpia_bw.h" +#include "link_dp_panel_replay.h" #define DC_LOGGER \ link->ctx->logger
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_panel_replay.c new file +308 -0
308 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_panel_replay.h new file +38 -0
@@ -0,0 +1,38 @@ +/* +* Copyright 2025 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 __DC_LINK_DP_PANEL_REPLAY_H__ +#define __DC_LINK_DP_PANEL_REPLAY_H__ + +#include "link_service.h" + +bool dp_setup_replay (struct dc_link *link, +const struct dc_stream_state *stream); +bool dp_pr_enable (struct dc_link *link,bool enable); +bool dp_pr_copy_settings (struct dc_link *link,struct replay_context *replay_context); +bool dp_pr_update_state (struct dc_link *link,struct dmub_cmd_pr_update_state_data *update_state_data); +bool dp_pr_set_general_cmd (struct dc_link *link,struct dmub_cmd_pr_general_cmd_data *general_cmd_data); +bool dp_pr_get_state (const struct dc_link *link,uint64_t *state); + +#endif /* __DC_LINK_DP_PANEL_REPLAY_H__ */
drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c +1 -270
290 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.h +1 -7
@@ -54,8 +54,6 @@ bool edp_set_sink_vtotal_in_psr_active(const struct dc_link *link,void edp_get_psr_residency (const struct dc_link *link,uint32_t *residency,enum psr_residency_mode mode);bool edp_set_replay_allow_active (struct dc_link *dc_link,const bool *enable,bool wait,bool force_static,const unsigned int *power_opts); -bool edp_setup_replay (struct dc_link *link, -const struct dc_stream_state *stream);bool edp_send_replay_cmd (struct dc_link *link,enum replay_FW_Message_type msg,union dmub_replay_cmd_set *cmd_data);
@@ -75,11 +73,7 @@ void edp_add_delay_for_T9(struct dc_link *link);bool edp_receiver_ready_T9 (struct dc_link *link);bool edp_receiver_ready_T7 (struct dc_link *link);bool edp_power_alpm_dpcd_enable (struct dc_link *link,bool enable); -bool edp_pr_enable (struct dc_link *link,bool enable); -bool edp_pr_copy_settings (struct dc_link *link,struct replay_context *replay_context); -bool edp_pr_update_state (struct dc_link *link,struct dmub_cmd_pr_update_state_data *update_state_data); -bool edp_pr_set_general_cmd (struct dc_link *link,struct dmub_cmd_pr_general_cmd_data *general_cmd_data); -bool edp_pr_get_state (const struct dc_link *link,uint64_t *state); +bool edp_setup_freesync_replay (struct dc_link *link,const struct dc_stream_state *stream);void edp_set_panel_power (struct dc_link *link,bool powerOn);void edp_set_panel_assr (struct dc_link *link,struct pipe_ctx *pipe_ctx,enum dp_panel_mode *panel_mode,bool enable);
Signature · 1 line
2.52.0
PATCH 2/21 drm/amd/display: Re-implement minimal transition deferral
In reply to Matthew StewartFrom: Joshua Aberback <[email protected]>
[Why]
The update v3 path got refactored into new functions, which happened just before the previous implementation was submitted, which resulted in the optimizations not executing. This commit re-implements the same logic in the new codepath.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 49 ++++++++++++++++-------- 1 file changed, 33 insertions(+), 16 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +33 -16
@@ -7246,6 +7246,14 @@ static bool update_planes_and_stream_prepare_v3_intermediate_seamless( ); } +static void transition_countdown_init (struct dc *dc) +{ + dc->check_config.transition_countdown_to_steady_state = + dc->debug.num_fast_flips_to_steady_state_override ? + dc->debug.num_fast_flips_to_steady_state_override : +NUM_FAST_FLIPS_TO_STEADY_STATE ; +} +static bool update_planes_and_stream_prepare_v3 (struct dc_update_scratch_space *scratch )
@@ -7305,9 +7313,17 @@ static bool update_planes_and_stream_prepare_v3( );if (seamless) { scratch->flow =UPDATE_V3_FLOW_NEW_CONTEXT_SEAMLESS ; +if (scratch->dc->check_config.deferred_transition_state) +/* reset countdown as steady state not reached */ +transition_countdown_init (scratch->dc);return true; } +if (!scratch->dc->debug.disable_deferred_minimal_transitions) { + scratch->dc->check_config.deferred_transition_state = true; +transition_countdown_init (scratch->dc); + } + scratch->intermediate_context = create_minimal_transition_state( scratch->dc, scratch->new_context,
@@ -7351,7 +7367,8 @@ static bool update_planes_and_stream_prepare_v3(static void update_planes_and_stream_execute_v3_commit (const struct dc_update_scratch_space *scratch,bool intermediate_update, -bool intermediate_context +bool intermediate_context, +bool use_stream_update ) { commit_planes_for_stream(
@@ -7359,7 +7376,7 @@ static void update_planes_and_stream_execute_v3_commit( intermediate_update ? scratch->intermediate_updates : scratch->surface_updates, intermediate_update ? scratch->intermediate_count : scratch->surface_count, scratch->stream, - intermediate_context ?NULL : scratch->stream_update, + use_stream_update ? scratch->stream_update :NULL , intermediate_context ?UPDATE_TYPE_FULL : scratch->update_type,// `dc->current_state` only used in `NO_NEW_CONTEXT`, where it is equal to `new_context` intermediate_context ? scratch->intermediate_context : scratch->new_context
@@ -7385,15 +7402,16 @@ static void update_planes_and_stream_execute_v3(case UPDATE_V3_FLOW_NO_NEW_CONTEXT_CONTEXT_FULL :case UPDATE_V3_FLOW_NEW_CONTEXT_SEAMLESS : -update_planes_and_stream_execute_v3_commit (scratch, false, false); +update_planes_and_stream_execute_v3_commit (scratch, false, false, true);break ;case UPDATE_V3_FLOW_NEW_CONTEXT_MINIMAL_NEW : -update_planes_and_stream_execute_v3_commit (scratch, false, true); +update_planes_and_stream_execute_v3_commit (scratch, false, true, + scratch->dc->check_config.deferred_transition_state);break ;case UPDATE_V3_FLOW_NEW_CONTEXT_MINIMAL_CURRENT : -update_planes_and_stream_execute_v3_commit (scratch, true, true); +update_planes_and_stream_execute_v3_commit (scratch, true, true, false);break ;case UPDATE_V3_FLOW_INVALID :
@@ -7402,13 +7420,6 @@ static void update_planes_and_stream_execute_v3( } } -static void update_planes_and_stream_cleanup_v3_new_context ( -struct dc_update_scratch_space *scratch -) -{ -swap_and_release_current_context (scratch->dc, scratch->new_context, scratch->stream); -} -static void update_planes_and_stream_cleanup_v3_release_minimal (struct dc_update_scratch_space *scratch, bool backup
@@ -7439,17 +7450,23 @@ static bool update_planes_and_stream_cleanup_v3(switch (scratch->flow) {case UPDATE_V3_FLOW_NO_NEW_CONTEXT_CONTEXT_FAST :case UPDATE_V3_FLOW_NO_NEW_CONTEXT_CONTEXT_FULL : -// No cleanup required +if (scratch->dc->check_config.transition_countdown_to_steady_state) + scratch->dc->check_config.transition_countdown_to_steady_state--;break ;case UPDATE_V3_FLOW_NEW_CONTEXT_SEAMLESS : -update_planes_and_stream_cleanup_v3_new_context (scratch); +swap_and_release_current_context (scratch->dc, scratch->new_context, scratch->stream);break ;case UPDATE_V3_FLOW_NEW_CONTEXT_MINIMAL_NEW :update_planes_and_stream_cleanup_v3_intermediate (scratch, false); - scratch->flow =UPDATE_V3_FLOW_NEW_CONTEXT_SEAMLESS ; -return true; +if (scratch->dc->check_config.deferred_transition_state) { +dc_state_release (scratch->new_context); + }else { + scratch->flow =UPDATE_V3_FLOW_NEW_CONTEXT_SEAMLESS ; +return true; + } +break ;case UPDATE_V3_FLOW_NEW_CONTEXT_MINIMAL_CURRENT :update_planes_and_stream_cleanup_v3_intermediate (scratch, true);
Signature · 1 line
2.52.0
PATCH 3/21 drm/amd/display: Remove unused DMUB replay commands
In reply to Matthew StewartFrom: Robin Chen <[email protected]>
[WHY]
Remove unused DMUB Replay set version command and related code.
--- drivers/gpu/drm/amd/display/dc/dc_types.h | 1 - .../gpu/drm/amd/display/dc/dce/dmub_replay.c | 13 ------ .../gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 46 ------------------- 3 files changed, 60 deletions(-)
drivers/gpu/drm/amd/display/dc/dc_types.h +0 -1
@@ -1101,7 +1101,6 @@ enum replay_FW_Message_type { Replay_Set_Residency_Frameupdate_Timer, Replay_Set_Pseudo_VTotal, Replay_Disabled_Adaptive_Sync_SDP, - Replay_Set_Version, Replay_Set_General_Cmd, };
drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c +0 -13
@@ -387,19 +387,6 @@ static void dmub_replay_send_cmd(struct dmub_replay *dmub, cmd.replay_disabled_adaptive_sync_sdp.data.force_disabled = cmd_element->disabled_adaptive_sync_sdp_data.force_disabled;break ; -case Replay_Set_Version: -//Header - cmd.replay_set_version.header.sub_type = -DMUB_CMD__REPLAY_SET_VERSION ; - cmd.replay_set_version.header.payload_bytes = -sizeof (struct dmub_rb_cmd_replay_set_version ) - -sizeof (struct dmub_cmd_header ); -//Cmd Body - cmd.replay_set_version.replay_set_version_data.panel_inst = - cmd_element->version_data.panel_inst; - cmd.replay_set_version.replay_set_version_data.version = - cmd_element->version_data.version; -break ;case Replay_Set_General_Cmd://Header cmd.replay_set_general_cmd.header.sub_type =
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h +0 -46
70 lines not on this page · raw message
Signature · 1 line
2.52.0
PATCH 4/21 drm/amd/display: Show link name in PSR status message
In reply to Matthew StewartFrom: "Mario Limonciello (AMD)" <[email protected]>
[Why]
The PSR message was moved in commit 4321742c394e ("drm/amd/display:
Move PSR support message into amdgpu_dm"). This message however shows for every single link without showing which link is which. This can send a confusing message to the user.
[How]
Add link name into the message.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2 -1
@@ -5618,7 +5618,8 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)if (psr_feature_enabled) {amdgpu_dm_set_psr_caps (link); - drm_info(adev_to_drm(adev), "PSR support %d, DC PSR ver %d, sink PSR ver %d DPCD caps 0x%x su_y_granularity %d\n", + drm_info(adev_to_drm(adev), "%s: PSR support %d, DC PSR ver %d, sink PSR ver %d DPCD caps 0x%x su_y_granularity %d\n", + aconnector->base.name, link->psr_settings.psr_feature_enabled, link->psr_settings.psr_version, link->dpcd_caps.psr_info.psr_version,
Signature · 1 line
2.52.0
PATCH 5/21 drm/amd/display: Bump the HDMI clock to 340MHz
In reply to Matthew StewartFrom: Mario Limonciello <[email protected]>
[Why]
DP-HDMI dongles can execeed bandwidth requirements on high resolution monitors. This can lead to pruning the high resolution modes.
HDMI 1.3 bumped the clock to 340MHz, but display code never matched it.
[How]
Set default to (DVI) 165MHz. Once HDMI display is identified update to 340MHz.
--- drivers/gpu/drm/amd/display/dc/dc_hdmi_types.h | 2 +- drivers/gpu/drm/amd/display/dc/link/link_detection.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/dc_hdmi_types.h +1 -1
@@ -41,7 +41,7 @@/* kHZ*/ #define DP_ADAPTOR_DVI_MAX_TMDS_CLK 165000/* kHZ*/ -#define DP_ADAPTOR_HDMI_SAFE_MAX_TMDS_CLK 165000 +#define DP_ADAPTOR_HDMI_SAFE_MAX_TMDS_CLK 340000struct dp_hdmi_dongle_signature_data {int8_t id[15 ];/* "DP-HDMI ADAPTOR"*/
drivers/gpu/drm/amd/display/dc/link/link_detection.c +3 -1
@@ -335,7 +335,7 @@ static void query_dp_dual_mode_adaptor(/* Assume we have no valid DP passive dongle connected */ *dongle =DISPLAY_DONGLE_NONE ; - sink_cap->max_hdmi_pixel_clock =DP_ADAPTOR_HDMI_SAFE_MAX_TMDS_CLK ; + sink_cap->max_hdmi_pixel_clock =DP_ADAPTOR_DVI_MAX_TMDS_CLK ;/* Read DP-HDMI dongle I2c (no response interpreted as DP-DVI dongle)*/ if (!i2c_read(
@@ -391,6 +391,8 @@ static void query_dp_dual_mode_adaptor( } } +if (is_valid_hdmi_signature) + sink_cap->max_hdmi_pixel_clock =DP_ADAPTOR_HDMI_SAFE_MAX_TMDS_CLK ;if (is_type2_dongle) { uint32_t max_tmds_clk =
Signature · 1 line
2.52.0
PATCH 6/21 drm/amd/display: DPCD for Selective Update
In reply to Matthew StewartFrom: Jack Chang <[email protected]>
[Why&How]
Add flow to read selective update related info from DPCD, and pass the info to DMUB.
--- drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 23 ++++++++- .../dc/link/protocols/link_dp_capability.c | 47 ++++++++++++++++++- .../dc/link/protocols/link_dp_panel_replay.c | 16 ++++++- .../gpu/drm/amd/display/include/dpcd_defs.h | 15 ++++++ 4 files changed, 97 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/dc_dp_types.h +22 -1
@@ -1167,6 +1167,25 @@ union dpcd_panel_replay_capability_supported {unsigned char raw; }; +union dpcd_panel_replay_capability { +struct { +unsigned char RESERVED :2 ; +unsigned char DSC_DECODE_NOT_SUPPORTED :1 ; +unsigned char ASYNC_VIDEO_TIMING_NOT_SUPPORTED :1 ; +unsigned char DSC_CRC_OF_MULTI_SU_SUPPORTED :1 ; +unsigned char PR_SU_GRANULARITY_NEEDED :1 ; +unsigned char SU_Y_GRANULARITY_EXT_CAP_SUPPORTED :1 ; +unsigned char LINK_OFF_SUPPORTED_IN_PR_ACTIVE :1 ; + } bits; +unsigned char raw; +}; + +struct dpcd_panel_replay_selective_update_info { +uint16_t pr_su_x_granularity; +uint8_t pr_su_y_granularity; +uint16_t pr_su_y_granularity_extended_caps; +}; +enum dpcd_downstream_port_max_bpc {DOWN_STREAM_MAX_8BPC =0 ,DOWN_STREAM_MAX_10BPC ,
@@ -1290,7 +1309,9 @@ struct dpcd_caps {struct edp_psr_info psr_info;struct replay_info pr_info; -union dpcd_panel_replay_capability_supported pr_caps_supported; +union dpcd_panel_replay_capability_supported vesa_replay_caps_supported; +union dpcd_panel_replay_capability vesa_replay_caps; +struct dpcd_panel_replay_selective_update_info vesa_replay_su_info;uint16_t edp_oled_emission_rate;union dp_receive_port0_cap receive_port0_cap;/* Indicates the number of SST links supported by MSO (Multi-Stream Output) */
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c +45 -2
59 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_panel_replay.c +15 -1
@@ -113,7 +113,10 @@ static bool dp_setup_panel_replay(struct dc_link *link, const struct dc_stream_s pr_config_1.bits.PANEL_REPLAY_EARLY_TRANSPORT_ENABLE =1 ; pr_config_2.bits.SINK_REFRESH_RATE_UNLOCK_GRANTED =0 ; - pr_config_2.bits.SU_Y_GRANULARITY_EXT_VALUE_ENABLED =0 ; + +if (link->dpcd_caps.vesa_replay_caps.bits.SU_Y_GRANULARITY_EXT_CAP_SUPPORTED) + pr_config_2.bits.SU_Y_GRANULARITY_EXT_VALUE_ENABLED =1 ; + pr_config_2.bits.SU_REGION_SCAN_LINE_CAPTURE_INDICATION =0 ; dm_helpers_dp_write_dpcd(link->ctx, link,
@@ -231,6 +234,17 @@ bool dp_pr_copy_settings(struct dc_link *link, struct replay_context *replay_con cmd.pr_copy_settings.data.flags.bitfields.dsc_enable_status = (pipe_ctx->stream->timing.flags.DSC ==1 ); cmd.pr_copy_settings.data.debug.u32All = link->replay_settings.config.debug_flags; + cmd.pr_copy_settings.data.su_granularity_needed = link->dpcd_caps.vesa_replay_caps.bits.PR_SU_GRANULARITY_NEEDED; + cmd.pr_copy_settings.data.su_x_granularity = link->dpcd_caps.vesa_replay_su_info.pr_su_x_granularity; + cmd.pr_copy_settings.data.su_y_granularity = link->dpcd_caps.vesa_replay_su_info.pr_su_y_granularity; + cmd.pr_copy_settings.data.su_y_granularity_extended_caps = + link->dpcd_caps.vesa_replay_su_info.pr_su_y_granularity_extended_caps; + +if (pipe_ctx->stream->timing.dsc_cfg.num_slices_v >0 ) + cmd.pr_copy_settings.data.dsc_slice_height = (pipe_ctx->stream->timing.v_addressable + + pipe_ctx->stream->timing.v_border_top + pipe_ctx->stream->timing.v_border_bottom) / + pipe_ctx->stream->timing.dsc_cfg.num_slices_v; +dc_wake_and_execute_dmub_cmd (dc->ctx, &cmd,DM_DMUB_WAIT_TYPE_WAIT );return true; }
drivers/gpu/drm/amd/display/include/dpcd_defs.h +15 -0
@@ -37,6 +37,21 @@#ifndef DP_PANEL_REPLAY_CAPABILITY // can remove this once the define gets into linux drm_dp_helper.h #define DP_PANEL_REPLAY_CAPABILITY 0x0b1#endif /* DP_PANEL_REPLAY_CAPABILITY */ +#ifndef DP_PR_SU_X_GRANULARITY_LOW // can remove this once the define gets into linux drm_dp_helper.h +#define DP_PR_SU_X_GRANULARITY_LOW 0x0b2 +#endif /* DP_PR_SU_X_GRANULARITY_LOW */ +#ifndef DP_PR_SU_X_GRANULARITY_HIGH // can remove this once the define gets into linux drm_dp_helper.h +#define DP_PR_SU_X_GRANULARITY_HIGH 0x0b3 +#endif /* DP_PR_SU_X_GRANULARITY_HIGH */ +#ifndef DP_PR_SU_Y_GRANULARITY // can remove this once the define gets into linux drm_dp_helper.h +#define DP_PR_SU_Y_GRANULARITY 0x0b4 +#endif /* DP_PR_SU_Y_GRANULARITY */ +#ifndef DP_PR_SU_Y_GRANULARITY_EXTENDED_CAP_LOW // can remove this once the define gets into linux drm_dp_helper.h +#define DP_PR_SU_Y_GRANULARITY_EXTENDED_CAP_LOW 0x0b5 +#endif /* DP_PR_SU_Y_GRANULARITY_EXTENDED_CAP_LOW */ +#ifndef DP_PR_SU_Y_GRANULARITY_EXTENDED_CAP_HIGH // can remove this once the define gets into linux drm_dp_helper.h +#define DP_PR_SU_Y_GRANULARITY_EXTENDED_CAP_HIGH 0x0b6 +#endif /* DP_PR_SU_Y_GRANULARITY_EXTENDED_CAP_HIGH */ #ifndef DP_PANEL_REPLAY_ENABLE_AND_CONFIGURATION_1 // can remove this once the define gets into linux drm_dp_helper.h #define DP_PANEL_REPLAY_ENABLE_AND_CONFIGURATION_1 0x1b0#endif /* DP_PANEL_REPLAY_ENABLE_AND_CONFIGURATION_1 */
Signature · 1 line
2.52.0
PATCH 7/21 drm/amd/display: PR error HPD_IRQ handling
In reply to Matthew StewartFrom: Jack Chang <[email protected]>
[Why & How]
Add error handling for IRQ_HPD in Panel Replay
--- drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 11 +++++ .../dc/link/protocols/link_dp_irq_handler.c | 42 +++++++++++++++++++ .../gpu/drm/amd/display/include/dpcd_defs.h | 15 +++++++ 3 files changed, 68 insertions(+)
drivers/gpu/drm/amd/display/dc/dc_dp_types.h +11 -0
@@ -1423,6 +1423,17 @@ union dpcd_sink_active_vtotal_control_mode {unsigned char raw; }; +union pr_error_status { +struct { +unsigned char LINK_CRC_ERROR :1 ; +unsigned char RFB_STORAGE_ERROR :1 ; +unsigned char VSC_SDP_ERROR :1 ; +unsigned char ASSDP_MISSING_ERROR :1 ; +unsigned char RESERVED :4 ; + } bits; +unsigned char raw; +}; +union psr_error_status {struct {unsigned char LINK_CRC_ERROR :1 ;
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_irq_handler.c +42 -0
60 lines not on this page · raw message
drivers/gpu/drm/amd/display/include/dpcd_defs.h +15 -0
@@ -61,6 +61,21 @@#ifndef DP_PANEL_REPLAY_ENABLE_AND_CONFIGURATION_2 // can remove this once the define gets into linux drm_dp_helper.h #define DP_PANEL_REPLAY_ENABLE_AND_CONFIGURATION_2 0x1b1#endif /* DP_PANEL_REPLAY_ENABLE_AND_CONFIGURATION_2 */ +#ifndef DP_PR_ERROR_STATUS // can remove this once the define gets into linux drm_dp_helper.h +#define DP_PR_ERROR_STATUS 0x2020/* DP 2.0 */ +#endif /* DP_PR_ERROR_STATUS */ +#ifndef DP_PR_LINK_CRC_ERROR // can remove this once the define gets into linux drm_dp_helper.h +#define DP_PR_LINK_CRC_ERROR (1 << 0) +#endif /* DP_PR_LINK_CRC_ERROR */ +#ifndef DP_PR_RFB_STORAGE_ERROR // can remove this once the define gets into linux drm_dp_helper.h +#define DP_PR_RFB_STORAGE_ERROR (1 << 1) +#endif /* DP_PR_RFB_STORAGE_ERROR */ +#ifndef DP_PR_VSC_SDP_UNCORRECTABLE_ERROR // can remove this once the define gets into linux drm_dp_helper.h +#define DP_PR_VSC_SDP_UNCORRECTABLE_ERROR (1 << 2)/* eDP 1.4 */ +#endif /* DP_PR_VSC_SDP_UNCORRECTABLE_ERROR */ +#ifndef DP_PR_ASSDP_MISSING_ERROR // can remove this once the define gets into linux drm_dp_helper.h +#define DP_PR_ASSDP_MISSING_ERROR (1 << 3)/* eDP 1.5 */ +#endif /* DP_PR_ASSDP_MISSING_ERROR */ enum dpcd_revision {DPCD_REV_10 =0x10 ,
Signature · 1 line
2.52.0
PATCH 8/21 drm/amd/display: only power down dig on phy endpoints
In reply to Matthew StewartFrom: Dmytro Laktyushkin <[email protected]>
This avoids any issues with dpia endpoints
--- drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c +2 -0
@@ -287,6 +287,8 @@ void dcn401_init_hw(struct dc *dc)for (i =0 ; i < dc->link_count; i++) {struct dc_link *link = dc->links[i]; +if (link->ep_type !=DISPLAY_ENDPOINT_PHY ) +continue ;if (link->link_enc->funcs->is_dig_enabled && link->link_enc->funcs->is_dig_enabled (link->link_enc) && hws->funcs.power_down) {
Signature · 1 line
2.52.0
PATCH 9/21 drm/amd/display: Add global fgcg function prototype to DCCG
In reply to Matthew StewartFrom: Leo Chen <[email protected]>
[Why & How]
Add the ability to enable/disable global fine grain clock gating within DCCG.
--- drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h +1 -0
@@ -333,6 +333,7 @@ struct dccg_funcs {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);void (*dccg_read_reg_state)(struct dccg *dccg,struct dcn_dccg_reg_state *dccg_reg_state); + void (*dccg_enable_global_fgcg)(struct dccg *dccg, bool enable); };#endif //__DAL_DCCG_H__
Signature · 1 line
2.52.0
PATCH 10/21 drm/amd/display: correct clip x assignment in cursor programming
In reply to Matthew StewartFrom: Ausef Yousof <[email protected]>
[why&how]
primary planes for external displays getting incorrect clip values, detect such a scenario and pass correct parameters
--- drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 6 ++++++ drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dc_hw_types.h +6 -0
@@ -491,6 +491,12 @@ struct dc_cursor_position {* for each plane. */ bool translate_by_source; + +/** +* @use_viewport_for_clip: Use viewport position for clip_x calculation +* instead of clip_rect. Required to protect against clip being overwritten +*/ +bool use_viewport_for_clip; };struct dc_cursor_mi_param {
drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c +5 -1
@@ -3666,7 +3666,11 @@ void dcn10_set_cursor_position(struct pipe_ctx *pipe_ctx)int y_plane = pipe_ctx->plane_state->dst_rect.y;int x_pos = pos_cpy.x;int y_pos = pos_cpy.y; -int clip_x = pipe_ctx->plane_state->clip_rect.x; +bool is_primary_plane = (pipe_ctx->plane_state->layer_index ==0 ); + +int clip_x = (pos_cpy.use_viewport_for_clip && is_primary_plane && + !odm_combine_on && !pipe_split_on && param.viewport.x !=0 ) + ? param.viewport.x : pipe_ctx->plane_state->clip_rect.x;int clip_width = pipe_ctx->plane_state->clip_rect.width;if ((pipe_ctx->top_pipe !=NULL ) || (pipe_ctx->bottom_pipe !=NULL )) {
Signature · 1 line
2.52.0
PATCH 11/21 drm/amd/display: revert "write default Vesa Aux backlight control in dmub"
In reply to Matthew StewartFrom: Derek Lai <[email protected]>
This reverts commit 60349741aa11.
Commit causing backlight darker when the system wakes up from standby mode, and green screen w/ secondary screen only when the system wakes up from standby mode.
--- .../drm/amd/display/dc/link/link_detection.c | 2 +- .../gpu/drm/amd/display/dc/link/link_dpms.c | 4 +-- .../dc/link/protocols/link_dp_capability.c | 2 +- .../link/protocols/link_edp_panel_control.c | 26 +++---------------- .../link/protocols/link_edp_panel_control.h | 2 +- 5 files changed, 8 insertions(+), 28 deletions(-)
drivers/gpu/drm/amd/display/dc/link/link_detection.c +1 -1
@@ -995,7 +995,7 @@ static bool detect_link_and_local_sink(struct dc_link *link, (link->dpcd_sink_ext_caps.bits.oled == 1)) {dpcd_set_source_specific_data (link);msleep (post_oui_delay); -set_default_brightness (link); +set_default_brightness_aux (link); }return true;
drivers/gpu/drm/amd/display/dc/link/link_dpms.c +2 -2
@@ -2061,7 +2061,7 @@ static enum dc_status enable_link_dp(struct dc_state *state, skip_video_pattern = false;if (stream->sink_patches.oled_optimize_display_on) -set_default_brightness (link); +set_default_brightness_aux (link); if (perform_link_training_with_retries(link_settings, skip_video_pattern,
@@ -2087,7 +2087,7 @@ static enum dc_status enable_link_dp(struct dc_state *state, link->dpcd_sink_ext_caps.bits.sdr_aux_backlight_control == 1 || link->dpcd_sink_ext_caps.bits.hdr_aux_backlight_control == 1) {if (!stream->sink_patches.oled_optimize_display_on) { -set_default_brightness (link); +set_default_brightness_aux (link);if (link->dpcd_sink_ext_caps.bits.oled ==1 )msleep (bl_oled_enable_delay);edp_backlight_enable_aux (link, true);
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c +1 -1
@@ -2210,7 +2210,7 @@ void detect_edp_sink_caps(struct dc_link *link) link->dpcd_caps.set_power_state_capable_edp = (general_edp_cap &DP_EDP_SET_POWER_CAP ) ? true : false; -set_default_brightness (link); +set_default_brightness_aux (link); core_link_read_dpcd(link, DP_EDP_DPCD_REV, &link->dpcd_caps.edp_rev,
drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c +3 -23
@@ -50,11 +50,6 @@ static const uint8_t DP_VGA_LVDS_CONVERTER_ID_2[] = "sivarT";/* Nutmeg */ static const uint8_t DP_VGA_LVDS_CONVERTER_ID_3 [] ="dnomlA" ; -static const unsigned int pwr_default_min_brightness_millinits =1000 ; -static const unsigned int pwr_default_sdr_brightness_millinits =270000 ; -static const unsigned int pwr_default_min_backlight_pwm =0xC0C ; -static const unsigned int pwr_default_max_backlight_pwm =0xFFFF ; -void dp_set_panel_mode (struct dc_link *link,enum dp_panel_mode panel_mode) {union dpcd_edp_config edp_config_set;
@@ -313,7 +308,7 @@ static bool read_default_bl_aux(struct dc_link *link, uint32_t *backlight_millinreturn true; } -bool set_default_brightness (struct dc_link *link) +bool set_default_brightness_aux (struct dc_link *link) {uint32_t default_backlight;
@@ -324,23 +319,8 @@ bool set_default_brightness(struct dc_link *link)if (default_backlight <1000 || default_backlight >5000000 ) default_backlight =150000 ; -if (link->backlight_control_type ==BACKLIGHT_CONTROL_VESA_AUX && - link->dc->caps.dmub_caps.aux_backlight_support) { -struct set_backlight_level_params backlight_level_params = {0 }; - - backlight_level_params.aux_inst = link->ddc->ddc_pin->hw_info.ddc_channel; - backlight_level_params.control_type =BACKLIGHT_CONTROL_VESA_AUX ; - backlight_level_params.backlight_pwm_u16_16 = default_backlight; - backlight_level_params.transition_time_in_ms =0 ; -// filled in the driver BL default values - backlight_level_params.min_luminance = pwr_default_min_brightness_millinits; - backlight_level_params.max_luminance = pwr_default_sdr_brightness_millinits; - backlight_level_params.min_backlight_pwm = pwr_default_min_backlight_pwm; - backlight_level_params.max_backlight_pwm = pwr_default_max_backlight_pwm; -return edp_set_backlight_level (link, &backlight_level_params); - }else -return edp_set_backlight_level_nits (link, true, - default_backlight,0 ); +return edp_set_backlight_level_nits (link, true, + default_backlight,0 ); }return false; }
drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.h +1 -1
@@ -29,7 +29,7 @@enum dp_panel_mode dp_get_panel_mode (struct dc_link *link);void dp_set_panel_mode (struct dc_link *link,enum dp_panel_mode panel_mode); -bool set_default_brightness (struct dc_link *link); +bool set_default_brightness_aux (struct dc_link *link);bool is_smartmux_suported (struct dc_link *link);void edp_panel_backlight_power_on (struct dc_link *link,bool wait_for_hpd);int edp_get_backlight_level (const struct dc_link *link);
Signature · 1 line
2.52.0
PATCH 12/21 drm/amd/display: Always update divider settings for DP tunnel
In reply to Matthew StewartFrom: Cruise Hung <[email protected]>
[Why]
When transitioning from 640x480 at RBRx1 to HBR3x1,
both output pixel mode and pixel rate divider should update. The needs_divider_update flag was only for 8b10b and 128b132b transition.
[How]
For DP tunneling, always update divider settings.
--- .../drm/amd/display/dc/link/accessories/link_dp_cts.c | 7 ++++++- .../amd/display/dc/resource/dcn31/dcn31_resource.c | 11 +++++++---- 2 files changed, 13 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/dc/link/accessories/link_dp_cts.c +6 -1
@@ -70,6 +70,7 @@ static void dp_retrain_link_dp_test(struct dc_link *link,struct dc_state *state = link->dc->current_state;struct dc_stream_update stream_update = {0 };bool dpms_off = false; +bool needs_divider_update = false;bool was_hpo_acquired =resource_is_hpo_acquired (link->dc->current_state);bool is_hpo_acquired;uint8_t count;
@@ -79,6 +80,10 @@ static void dp_retrain_link_dp_test(struct dc_link *link,int num_streams_on_link =0 ;struct dc *dc = (struct dc *)link->dc; + needs_divider_update = (link->dc->link_srv->dp_get_encoding_format (link_setting) != + link->dc->link_srv->dp_get_encoding_format ((const struct dc_link_settings *) &link->cur_link_settings)) + || link->ep_type ==DISPLAY_ENDPOINT_USB4_DPIA ; +udelay (100 );link_get_master_pipes_with_dpms_on (link, state, &count, pipes);
@@ -95,7 +100,7 @@ static void dp_retrain_link_dp_test(struct dc_link *link, pipes[i]->stream_res.tg->funcs->disable_crtc (pipes[i]->stream_res.tg); } -if (link->dc->res_pool->funcs->update_dc_state_for_encoder_switch) { +if (needs_divider_update && link->dc->res_pool->funcs->update_dc_state_for_encoder_switch) { link->dc->res_pool->funcs->update_dc_state_for_encoder_switch (link, link_setting, count, *pipes, &audio_output[0 ]);
drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c +7 -4
@@ -2250,12 +2250,15 @@ enum dc_status dcn31_update_dc_state_for_encoder_switch(struct dc_link *link,int i;#if defined(CONFIG_DRM_AMD_DC_FP ) -for (i =0 ; i < state->stream_count; i++) -if (state->streams[i] && state->streams[i]->link && state->streams[i]->link == link) - link->dc->hwss.calculate_pix_rate_divider ((struct dc *)link->dc, state, state->streams[i]); +if (link->dc->hwss.calculate_pix_rate_divider) { +for (i =0 ; i < state->stream_count; i++) +if (state->streams[i] && state->streams[i]->link && state->streams[i]->link == link) + link->dc->hwss.calculate_pix_rate_divider ((struct dc *)link->dc, state, state->streams[i]); + }for (i =0 ; i < pipe_count; i++) { - link->dc->res_pool->funcs->build_pipe_pix_clk_params (&pipes[i]); +if (link->dc->res_pool->funcs->build_pipe_pix_clk_params) + link->dc->res_pool->funcs->build_pipe_pix_clk_params (&pipes[i]);// Setup audio if (pipes[i].stream_res.audio !=NULL )
Signature · 1 line
2.52.0
PATCH 13/21 drm/amd/display: disable replay when crc source is enabled
In reply to Matthew StewartFrom: Ray Wu <[email protected]>
[Why]
IGT CRC tests fail on replay panels due to invalid CRC values captured when replay is active.
[How]
- Disable replay when CRC source is enabled; set flag to prevent unexpected re-enable
- Reset flag when CRC source is disabled to allow replay
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 1 + .../drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 25 ++++++++++++++++--- .../amd/display/amdgpu_dm/amdgpu_dm_replay.c | 7 ++++++ 3 files changed, 30 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +1 -0
@@ -810,6 +810,7 @@ struct amdgpu_dm_connector {int sr_skip_count;bool disallow_edp_enter_psr; +bool disallow_edp_enter_replay;/* Record progress status of mst*/ uint8_t mst_status;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c +22 -3
@@ -32,6 +32,7 @@#include "dc.h" #include "amdgpu_securedisplay.h" #include "amdgpu_dm_psr.h" +#include "amdgpu_dm_replay.h" static const char *const pipe_crc_sources[] = {"none" ,
@@ -502,6 +503,7 @@ int amdgpu_dm_crtc_configure_crc_source(struct drm_crtc *crtc, {struct amdgpu_device *adev =drm_to_adev (crtc->dev);struct dc_stream_state *stream_state = dm_crtc_state->stream; +struct amdgpu_dm_connector *aconnector =NULL ;bool enable =amdgpu_dm_is_valid_crc_source (source);int ret =0 ;
@@ -509,11 +511,22 @@ int amdgpu_dm_crtc_configure_crc_source(struct drm_crtc *crtc,if (!stream_state)return -EINVAL ; +/* Get connector from stream */ + aconnector = (struct amdgpu_dm_connector *)stream_state->dm_stream_context; +mutex_lock (&adev->dm.dc_lock); -/* For PSR1, check that the panel has exited PSR */ -if (stream_state->link->psr_settings.psr_version <DC_PSR_VERSION_SU_1 ) -amdgpu_dm_psr_wait_disable (stream_state); + +if (enable) { +/* For PSR1, check that the panel has exited PSR */ +if (stream_state->link->psr_settings.psr_version <DC_PSR_VERSION_SU_1 ) +amdgpu_dm_psr_wait_disable (stream_state); + +/* Set flag to disallow enter replay when CRC source is enabled */ +if (aconnector) + aconnector->disallow_edp_enter_replay = true; +amdgpu_dm_replay_disable (stream_state); + }/* Enable or disable CRTC CRC generation */ if (dm_is_crc_source_crtc (source) || source ==AMDGPU_DM_PIPE_CRC_SOURCE_NONE ) {
@@ -536,6 +549,12 @@ int amdgpu_dm_crtc_configure_crc_source(struct drm_crtc *crtc, DYN_EXPANSION_AUTO); } +if (!enable) { +/* Clear flag to allow enter replay when CRC source is disabled */ +if (aconnector) + aconnector->disallow_edp_enter_replay = false; + } + unlock:mutex_unlock (&adev->dm.dc_lock);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_replay.c +7 -0
@@ -154,10 +154,17 @@ bool amdgpu_dm_replay_enable(struct dc_stream_state *stream, bool wait) {bool replay_active = true;struct dc_link *link =NULL ; +struct amdgpu_dm_connector *aconnector =NULL ;if (stream ==NULL )return false; +/* Check if replay is disabled by connector flag */ + aconnector = (struct amdgpu_dm_connector *)stream->dm_stream_context; +if (!aconnector || aconnector->disallow_edp_enter_replay) { +return false; + } + link = stream->link;if (link) {
Signature · 1 line
2.52.0
PATCH 14/21 drm/amd/display: init code for external panel replay
In reply to Matthew StewartFrom: Peichen Huang <[email protected]>
Prepare for supporting panel replay on external monitors.
--- .../drm/amd/display/dc/dce/dmub_hw_lock_mgr.c | 2 +- .../gpu/drm/amd/display/dc/inc/link_service.h | 4 +- .../gpu/drm/amd/display/dc/link/link_dpms.c | 4 ++ .../drm/amd/display/dc/link/link_factory.c | 1 + .../dc/link/protocols/link_dp_panel_replay.c | 53 +++++++++++++------ .../dc/link/protocols/link_dp_panel_replay.h | 4 +- 6 files changed, 47 insertions(+), 21 deletions(-)
drivers/gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c +1 -1
@@ -69,7 +69,7 @@ bool dmub_hw_lock_mgr_does_link_require_lock(const struct dc *dc, const struct dif (link->psr_settings.psr_version ==DC_PSR_VERSION_SU_1 )return true; -if (link->replay_settings.replay_feature_enabled) +if (link->replay_settings.replay_feature_enabled &&dc_is_embedded_signal (link->connector_signal))return true;if (link->psr_settings.psr_version ==DC_PSR_VERSION_1 ) {
drivers/gpu/drm/amd/display/dc/inc/link_service.h +2 -2
@@ -283,8 +283,6 @@ struct link_service {bool (*edp_set_replay_allow_active)(struct dc_link *dc_link,const bool *enable,bool wait,bool force_static,const unsigned int *power_opts); -bool (*dp_setup_replay)(struct dc_link *link, -const struct dc_stream_state *stream);bool (*edp_send_replay_cmd)(struct dc_link *link,enum replay_FW_Message_type msg,union dmub_replay_cmd_set *cmd_data);
@@ -304,6 +302,8 @@ struct link_service {bool (*edp_receiver_ready_T9)(struct dc_link *link);bool (*edp_receiver_ready_T7)(struct dc_link *link);bool (*edp_power_alpm_dpcd_enable)(struct dc_link *link,bool enable); +bool (*dp_setup_replay)(struct dc_link *link,const struct dc_stream_state *stream); +bool (*dp_pr_get_panel_inst)(const struct dc *dc,const struct dc_link *link,unsigned int *inst_out);bool (*dp_pr_enable)(struct dc_link *link,bool enable);bool (*dp_pr_update_state)(struct dc_link *link,struct dmub_cmd_pr_update_state_data *update_state_data);bool (*dp_pr_set_general_cmd)(struct dc_link *link,struct dmub_cmd_pr_general_cmd_data *general_cmd_data);
drivers/gpu/drm/amd/display/dc/link/link_dpms.c +4 -0
@@ -46,6 +46,7 @@#include "protocols/link_dp_capability.h" #include "protocols/link_dp_training.h" #include "protocols/link_edp_panel_control.h" +#include "protocols/link_dp_panel_replay.h" #include "protocols/link_dp_dpia_bw.h" #include "dm_helpers.h"
@@ -2529,6 +2530,9 @@ void link_set_dpms_on(link_set_dsc_enable (pipe_ctx, true); } +if (link->replay_settings.config.replay_supported && !dc_is_embedded_signal (link->connector_signal)) +dp_setup_replay (link, stream); + status =enable_link (state, pipe_ctx);if (status !=DC_OK ) {
drivers/gpu/drm/amd/display/dc/link/link_factory.c +1 -0
@@ -236,6 +236,7 @@ static void construct_link_service_edp_panel_control(struct link_service *link_sstatic void construct_link_service_dp_panel_replay (struct link_service *link_srv) { link_srv->dp_setup_replay = dp_setup_replay; + link_srv->dp_pr_get_panel_inst = dp_pr_get_panel_inst; link_srv->dp_pr_enable = dp_pr_enable; link_srv->dp_pr_update_state = dp_pr_update_state; link_srv->dp_pr_set_general_cmd = dp_pr_set_general_cmd;
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_panel_replay.c +37 -16
108 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_panel_replay.h +2 -2
@@ -27,8 +27,8 @@#include "link_service.h" -bool dp_setup_replay (struct dc_link *link, -const struct dc_stream_state *stream); +bool dp_setup_replay (struct dc_link *link,const struct dc_stream_state *stream); +bool dp_pr_get_panel_inst (const struct dc *dc,const struct dc_link *link,unsigned int *inst_out);bool dp_pr_enable (struct dc_link *link,bool enable);bool dp_pr_copy_settings (struct dc_link *link,struct replay_context *replay_context);bool dp_pr_update_state (struct dc_link *link,struct dmub_cmd_pr_update_state_data *update_state_data);
Signature · 1 line
2.52.0
PATCH 15/21 drm/amd/display: Add replay_events in replay settings
In reply to Matthew StewartFrom: Peichen Huang <[email protected]>
Add a new field to replay_settings.
--- drivers/gpu/drm/amd/display/dc/dc_types.h | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/dc/dc_types.h +2 -0
@@ -1223,6 +1223,8 @@ struct replay_settings {uint32_t replay_desync_error_fail_count;/* The frame skip number dal send to DMUB */ uint16_t frame_skip_number; +/* Current Panel Replay event */ +uint32_t replay_events; };/* To split out "global" and "per-panel" config settings.
Signature · 1 line
2.52.0
PATCH 16/21 drm/amd/display: Adjust PHY FSM transition to TX_EN-to-PLL_ON for TMDS on DCN35
In reply to Matthew StewartFrom: Nicholas Kazlauskas <[email protected]>
[Why]
A backport of the change made for DCN401 that addresses an issue where we turn off the PHY PLL when disabling TMDS output, which causes the OTG to remain stuck.
The OTG being stuck can lead to a hang in the DCHVM's ability to ACK invalidations when it thinks the HUBP is still on but it's not receiving global sync.
The transition to PLL_ON needs to be atomic as there's no guarantee that the thread isn't pre-empted or is able to complete before the IOMMU watchdog times out.
[How]
Backport the implementation from dcn401 back to dcn35.
There's a functional difference in when the eDP output is disabled in dcn401 code so we don't want to utilize it directly.
--- .../amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 52 +++++++++++++++++++ .../amd/display/dc/hwss/dcn35/dcn35_hwseq.h | 3 ++ .../amd/display/dc/hwss/dcn35/dcn35_init.c | 2 +- 3 files changed, 56 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c +52 -0
@@ -1727,3 +1727,55 @@ void dcn35_program_cursor_offload_now(struct dc *dc, const struct pipe_ctx *pipe {dc_dmub_srv_program_cursor_now (dc, pipe); } + +static void disable_link_output_symclk_on_tx_off (struct dc_link *link,enum dp_link_encoding link_encoding) +{ +struct dc *dc = link->ctx->dc; +struct pipe_ctx *pipe_ctx =NULL ; +uint8_t i; + +for (i =0 ; i <MAX_PIPES ; i++) { + pipe_ctx = &dc->current_state->res_ctx.pipe_ctx[i]; +if (pipe_ctx->stream && pipe_ctx->stream->link == link && pipe_ctx->top_pipe ==NULL ) { + pipe_ctx->clock_source->funcs->program_pix_clk ( + pipe_ctx->clock_source, + &pipe_ctx->stream_res.pix_clk_params, + link_encoding, + &pipe_ctx->pll_settings); +break ; + } + } +} + +void dcn35_disable_link_output (struct dc_link *link, +const struct link_resource *link_res, +enum signal_type signal) +{ +struct dc *dc = link->ctx->dc; +const struct link_hwss *link_hwss =get_link_hwss (link, link_res); +struct dmcu *dmcu = dc->res_pool->dmcu; + +if (signal ==SIGNAL_TYPE_EDP && + link->dc->hwss.edp_backlight_control && + !link->skip_implict_edp_power_control) + link->dc->hwss.edp_backlight_control (link, false); +else if (dmcu !=NULL && dmcu->funcs->lock_phy) + dmcu->funcs->lock_phy (dmcu); + +if (dc_is_tmds_signal (signal) && link->phy_state.symclk_ref_cnts.otg >0 ) { +disable_link_output_symclk_on_tx_off (link,DP_UNKNOWN_ENCODING ); + link->phy_state.symclk_state =SYMCLK_ON_TX_OFF ; + }else { + link_hwss->disable_link_output (link, link_res, signal); + link->phy_state.symclk_state =SYMCLK_OFF_TX_OFF ; + } +/* +* Add the logic to extract BOTH power up and power down sequences +* from enable/disable link output and only call edp panel control +* in enable_link_dp and disable_link_dp once. +*/ +if (dmcu !=NULL && dmcu->funcs->unlock_phy) + dmcu->funcs->unlock_phy (dmcu); + + dc->link_srv->dp_trace_source_sequence (link,DPCD_SOURCE_SEQ_AFTER_DISABLE_LINK_PHY ); +}
drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.h +3 -0
@@ -108,5 +108,8 @@ void dcn35_update_cursor_offload_pipe(struct dc *dc, const struct pipe_ctx *pipevoid dcn35_notify_cursor_offload_drr_update (struct dc *dc,struct dc_state *context,const struct dc_stream_state *stream);void dcn35_program_cursor_offload_now (struct dc *dc,const struct pipe_ctx *pipe); +void dcn35_disable_link_output (struct dc_link *link, +const struct link_resource *link_res, +enum signal_type signal);#endif /* __DC_HWSS_DCN35_H__ */
drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c +1 -1
@@ -113,7 +113,7 @@ static const struct hw_sequencer_funcs dcn35_funcs = { .enable_lvds_link_output = dce110_enable_lvds_link_output, .enable_tmds_link_output = dce110_enable_tmds_link_output, .enable_dp_link_output = dce110_enable_dp_link_output, - .disable_link_output = dcn32_disable_link_output, + .disable_link_output = dcn35_disable_link_output, .z10_restore = dcn35_z10_restore, .z10_save_init = dcn31_z10_save_init, .set_disp_pattern_generator = dcn30_set_disp_pattern_generator,
Signature · 1 line
2.52.0
PATCH 17/21 drm/amd/display: Add pwait status to DMCUB debug logging
In reply to Matthew StewartFrom: Nicholas Kazlauskas <[email protected]>
[Why]
To know if DMCUB is idle at the time of the debug data being collected.
[How]
Extend the logging to include the field.
It's already captured as part of each ASIC's get_diagnostic_data.
--- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c +1 -0
@@ -999,6 +999,7 @@ void dc_dmub_srv_log_diagnostic_data(struct dc_dmub_srv *dc_dmub_srv)DC_LOG_DEBUG (" is_traceport_en : %d" , dc_dmub_srv->dmub->debug.is_traceport_en);DC_LOG_DEBUG (" is_cw0_en : %d" , dc_dmub_srv->dmub->debug.is_cw0_enabled);DC_LOG_DEBUG (" is_cw6_en : %d" , dc_dmub_srv->dmub->debug.is_cw6_enabled); +DC_LOG_DEBUG (" is_pwait : %d" , dc_dmub_srv->dmub->debug.is_pwait); }static bool dc_dmub_should_update_cursor_data (struct pipe_ctx *pipe_ctx)
Signature · 1 line
2.52.0
PATCH 18/21 drm/amd/display: switch to drm_dbg_kms() from DRM_DEBUG_KMS
In reply to Matthew StewartFrom: Aurabindo Pillai <[email protected]>
DRM_DEBUG_ class of macros are depricated. Recommended drm_dbg_kms() has the advantage of being able to distinguish the logs from devices in a multi-gpu environment.
Where a pointer to struct amdgpu_device is available, use that to get the drm device.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +15 -15
@@ -1137,7 +1137,7 @@ static int amdgpu_dm_audio_component_get_eld(struct device *kdev, int port,mutex_unlock (&adev->dm.audio_lock); -DRM_DEBUG_KMS ("Get ELD : idx=%d ret=%d en=%d\n" , port, ret, *enabled); +drm_dbg_kms (adev_to_drm (adev),"Get ELD : idx=%d ret=%d en=%d\n" , port, ret, *enabled);return ret; }
@@ -1231,7 +1231,7 @@ static void amdgpu_dm_audio_eld_notify(struct amdgpu_device *adev, int pin)struct drm_audio_component *acomp = adev->dm.audio_component;if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify) { -DRM_DEBUG_KMS ("Notify ELD: %d\n" , pin); +drm_dbg_kms (adev_to_drm (adev),"Notify ELD: %d\n" , pin); acomp->audio_ops->pin_eld_notify (acomp->audio_ops->audio_ptr, pin,-1 );
@@ -2377,7 +2377,7 @@ static int load_dmcu_fw(struct amdgpu_device *adev) }if (adev->firmware.load_type !=AMDGPU_FW_LOAD_PSP ) { -DRM_DEBUG_KMS ("dm: DMCU firmware not supported on direct or SMU loading\n" ); +drm_dbg_kms (adev_to_drm (adev),"dm: DMCU firmware not supported on direct or SMU loading\n" );return 0 ; }
@@ -2385,7 +2385,7 @@ static int load_dmcu_fw(struct amdgpu_device *adev) "%s", fw_name_dmcu);if (r == -ENODEV ) {/* DMCU firmware is not necessary, so don't raise a fuss if it's missing */ -DRM_DEBUG_KMS ("dm: DMCU firmware not found\n" ); +drm_dbg_kms (adev_to_drm (adev),"dm: DMCU firmware not found\n" ); adev->dm.fw_dmcu =NULL ;return 0 ; }
@@ -2409,7 +2409,7 @@ static int load_dmcu_fw(struct amdgpu_device *adev) adev->dm.dmcu_fw_version =le32_to_cpu (hdr->header.ucode_version); -DRM_DEBUG_KMS ("PSP loading DMCU firmware\n" ); +drm_dbg_kms (adev_to_drm (adev),"PSP loading DMCU firmware\n" );return 0 ; }
@@ -4140,7 +4140,7 @@ static void schedule_hpd_rx_offload_work(struct amdgpu_device *adev, struct hpd_ offload_work->adev = adev;queue_work (offload_wq->wq, &offload_work->work); -DRM_DEBUG_KMS ("queue work to handle hpd_rx offload work" ); +drm_dbg_kms (adev_to_drm (adev),"queue work to handle hpd_rx offload work" ); }static void handle_hpd_rx_irq (void *param)
@@ -4969,7 +4969,7 @@ static void amdgpu_dm_update_backlight_caps(struct amdgpu_display_manager *dm, caps->min_input_signal < 0 || spread > AMDGPU_DM_DEFAULT_MAX_BACKLIGHT || spread < AMDGPU_DM_MIN_SPREAD) { -DRM_DEBUG_KMS ("DM: Invalid backlight caps: min=%d, max=%d\n" , +drm_dbg_kms (adev_to_drm (dm->adev),"DM: Invalid backlight caps: min=%d, max=%d\n" , caps->min_input_signal, caps->max_input_signal); caps->caps_valid = false; }
@@ -5494,7 +5494,7 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) }break ;default : -DRM_DEBUG_KMS ("Unsupported DCN IP version for outbox: 0x%X\n" , +drm_dbg_kms (adev_to_drm (adev),"Unsupported DCN IP version for outbox: 0x%X\n" ,amdgpu_ip_version (adev,DCE_HWIP ,0 )); }
@@ -9603,7 +9603,7 @@ static void update_freesync_state_on_stream( new_stream->allow_freesync =mod_freesync_get_freesync_enabled (&vrr_params);if (new_crtc_state->freesync_vrr_info_changed) -DRM_DEBUG_KMS ("VRR packet update: crtc=%u enabled=%d state=%d" , +drm_dbg_kms (adev_to_drm (adev),"VRR packet update: crtc=%u enabled=%d state=%d" , new_crtc_state->base.crtc->base.id, (int )new_crtc_state->base.vrr_enabled, (int )vrr_params.state);
@@ -11549,7 +11549,7 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm,dc_stream_retain (new_stream); -DRM_DEBUG_ATOMIC ("Enabling DRM crtc: %d\n" , +drm_dbg_atomic (adev_to_drm (adev),"Enabling DRM crtc: %d\n" , crtc->base.id); if (dc_state_add_stream(
@@ -11779,14 +11779,14 @@ static int dm_check_cursor_fb(struct amdgpu_crtc *new_acrtc,if (fb->width > new_acrtc->max_cursor_width || fb->height > new_acrtc->max_cursor_height) { -DRM_DEBUG_ATOMIC ("Bad cursor FB size %dx%d\n" , +drm_dbg_atomic (adev_to_drm (adev),"Bad cursor FB size %dx%d\n" , new_plane_state->fb->width, new_plane_state->fb->height);return -EINVAL ; }if (new_plane_state->src_w != fb->width <<16 || new_plane_state->src_h != fb->height <<16 ) { -DRM_DEBUG_ATOMIC ("Cropping not supported for cursor plane\n" ); +drm_dbg_atomic (adev_to_drm (adev),"Cropping not supported for cursor plane\n" );return -EINVAL ; }
@@ -11794,7 +11794,7 @@ static int dm_check_cursor_fb(struct amdgpu_crtc *new_acrtc, pitch = fb->pitches[0 ] / fb->format->cpp[0 ];if (fb->width != pitch) { -DRM_DEBUG_ATOMIC ("Cursor FB width %d doesn't match pitch %d" , +drm_dbg_atomic (adev_to_drm (adev),"Cursor FB width %d doesn't match pitch %d" , fb->width, pitch);return -EINVAL ; }
@@ -11806,7 +11806,7 @@ static int dm_check_cursor_fb(struct amdgpu_crtc *new_acrtc,/* FB pitch is supported by cursor plane */ break ;default : -DRM_DEBUG_ATOMIC ("Bad cursor FB pitch %d px\n" , pitch); +drm_dbg_atomic (adev_to_drm (adev),"Bad cursor FB pitch %d px\n" , pitch);return -EINVAL ; }
@@ -11824,7 +11824,7 @@ static int dm_check_cursor_fb(struct amdgpu_crtc *new_acrtc,AMDGPU_TILING_GET (afb->tiling_flags,MICRO_TILE_MODE ) ==0 ; }if (!linear) { -DRM_DEBUG_ATOMIC ("Cursor FB not linear" ); +drm_dbg_atomic (adev_to_drm (adev),"Cursor FB not linear" );return -EINVAL ; } }
Signature · 1 line
2.52.0
PATCH 19/21 drm/amd/display: switch to drm_dbg_ macros instead of DRM_DEBUG_ variants
In reply to Matthew StewartFrom: Aurabindo Pillai <[email protected]>
Device pointer sources used:
- connector->dev - when a DRM connector was available
- old_plane_crtc->dev / new_plane_crtc->dev - for plane state functions
- pass in drm_device - for the stream scaling function
- aconnector->base.dev - for the VSDB parsing function
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +13 -12
@@ -6393,7 +6393,8 @@ static void fill_dc_dirty_rects(struct drm_plane *plane, &flip_addrs->dirty_rect_count, true); } -static void update_stream_scaling_settings (const struct drm_display_mode *mode, +static void update_stream_scaling_settings (struct drm_device *dev, +const struct drm_display_mode *mode,const struct dm_connector_state *dm_state,struct dc_stream_state *stream) {
@@ -6443,8 +6444,8 @@ static void update_stream_scaling_settings(const struct drm_display_mode *mode, stream->src = src; stream->dst = dst; -DRM_DEBUG_KMS ("Destination Rectangle x:%d y:%d width:%d height:%d\n" , - dst.x, dst.y, dst.width, dst.height); +drm_dbg_kms (dev,"Destination Rectangle x:%d y:%d width:%d height:%d\n" , + dst.x, dst.y, dst.width, dst.height); }
@@ -7332,7 +7333,7 @@ create_stream_for_sink(struct drm_connector *connector,apply_dsc_policy_for_stream (aconnector, sink, stream, &dsc_caps);#endif -update_stream_scaling_settings (&mode, dm_state, stream); +update_stream_scaling_settings (dev, &mode, dm_state, stream); fill_audio_info( &stream->audio_info,
@@ -8067,7 +8068,7 @@ create_validate_stream_for_sink(struct drm_connector *connector, dc_result =dm_validate_stream_and_context (adev->dm.dc, stream);if (dc_result !=DC_OK ) { - DRM_DEBUG_KMS("Pruned mode %d x %d (clk %d) %s %s -- %s\n", + drm_dbg_kms(connector->dev, "Pruned mode %d x %d (clk %d) %s %s -- %s\n", drm_mode->hdisplay, drm_mode->vdisplay, drm_mode->clock,
@@ -8419,7 +8420,7 @@ static int dm_encoder_helper_atomic_check(struct drm_encoder *encoder,drm_dp_atomic_find_time_slots (state, mst_mgr, mst_port, dm_new_connector_state->pbn);if (dm_new_connector_state->vcpi_slots <0 ) { -DRM_DEBUG_ATOMIC ("failed finding vcpi slots: %d\n" , (int )dm_new_connector_state->vcpi_slots); +drm_dbg_atomic (connector->dev,"failed finding vcpi slots: %d\n" , (int )dm_new_connector_state->vcpi_slots);return dm_new_connector_state->vcpi_slots; }return 0 ;
@@ -10869,7 +10870,7 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) stream_update.stream = dm_new_crtc_state->stream;if (scaling_changed) { -update_stream_scaling_settings (&dm_new_con_state->base.crtc->mode, +update_stream_scaling_settings (dev, &dm_new_con_state->base.crtc->mode, dm_new_con_state, dm_new_crtc_state->stream); stream_update.src = dm_new_crtc_state->stream->src;
@@ -11588,7 +11589,7 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm,/* Scaling or underscan settings */ if (is_scaling_state_different (dm_old_conn_state, dm_new_conn_state) ||drm_atomic_crtc_needs_modeset (new_crtc_state)) -update_stream_scaling_settings ( +update_stream_scaling_settings (adev_to_drm (adev), &new_crtc_state->mode, dm_new_conn_state, dm_new_crtc_state->stream);/* ABM settings */
@@ -11851,7 +11852,7 @@ static int dm_check_native_cursor_state(struct drm_crtc *new_plane_crtc, new_acrtc =to_amdgpu_crtc (new_plane_crtc);if (new_plane_state->src_x !=0 || new_plane_state->src_y !=0 ) { -DRM_DEBUG_ATOMIC ("Cropping not supported for cursor plane\n" ); +drm_dbg_atomic (new_plane_crtc->dev,"Cropping not supported for cursor plane\n" );return -EINVAL ; }
@@ -11950,7 +11951,7 @@ static int dm_update_plane_state(struct dc *dc,if (!dm_old_crtc_state->stream)return 0 ; -DRM_DEBUG_ATOMIC ("Disabling DRM plane: %d on DRM crtc %d\n" , +drm_dbg_atomic (old_plane_crtc->dev,"Disabling DRM plane: %d on DRM crtc %d\n" , plane->base.id, old_plane_crtc->base.id); ret =dm_atomic_get_state (state, &dm_state);
@@ -12003,7 +12004,7 @@ static int dm_update_plane_state(struct dc *dc, goto out; } -DRM_DEBUG_ATOMIC ("Enabling DRM plane: %d on DRM crtc %d\n" , +drm_dbg_atomic (new_plane_crtc->dev,"Enabling DRM plane: %d on DRM crtc %d\n" , plane->base.id, new_plane_crtc->base.id); ret = fill_dc_plane_attributes(
@@ -13095,7 +13096,7 @@ static int parse_amd_vsdb(struct amdgpu_dm_connector *aconnector, amd_vsdb->version == HDMI_AMD_VENDOR_SPECIFIC_DATA_BLOCK_VERSION_3) { vsdb_info->replay_mode = (amd_vsdb->feature_caps &AMD_VSDB_VERSION_3_FEATURECAP_REPLAYMODE ) ? true : false; vsdb_info->amd_vsdb_version =HDMI_AMD_VENDOR_SPECIFIC_DATA_BLOCK_VERSION_3 ; -DRM_DEBUG_KMS ("Panel supports Replay Mode: %d\n" , vsdb_info->replay_mode); +drm_dbg_kms (aconnector->base.dev,"Panel supports Replay Mode: %d\n" , vsdb_info->replay_mode);return true; }
Signature · 1 line
2.52.0
PATCH 20/21 drm/amd/display: [FW Promotion] Release 0.1.42.0
In reply to Matthew StewartFrom: Taimur Hassan <[email protected]>
Summary for changes in firmware:
* Fix 24/30FPS full screen video low residency
* Fix 60Hz video playback freeze
* Add Panel Replay command for VESA replay
--- drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h +6 -2
@@ -1091,7 +1091,10 @@ union dmub_fw_boot_options { uint32_t lower_hbr3_phy_ssc: 1; /**< 1 to lower hbr3 phy ssc to 0.125 percent */ uint32_t override_hbr3_pll_vco: 1; /**< 1 to override the hbr3 pll vco to 0 */ uint32_t disable_dpia_bw_allocation: 1; /**< 1 to disable the USB4 DPIA BW allocation */ - uint32_t reserved : 4; /**< reserved */ + uint32_t bootcrc_en_at_preos: 1; /**< 1 to run the boot time crc during warm/cold boot*/ + uint32_t bootcrc_en_at_S0i3: 1; /**< 1 to run the boot time crc during S0i3 boot*/ + uint32_t bootcrc_boot_mode: 1; /**< 1 for S0i3 resume and 0 for Warm/cold boot*/ + uint32_t reserved : 1; /**< reserved */ } bits;/**< boot bits */ uint32_t all;/**< 32-bit access to bits */ };
@@ -2638,7 +2641,7 @@ union dmub_fams2_global_feature_config { uint32_t enable_visual_confirm: 1; uint32_t allow_delay_check_mode: 2; uint32_t legacy_method_no_fams2 : 1; - uint32_t reserved: 23; + uint32_t reserved : 23; } bits;uint32_t all; };
@@ -4375,6 +4378,7 @@ enum dmub_cmd_replay_general_subtype {REPLAY_GENERAL_CMD_UPDATE_ERROR_STATUS ,REPLAY_GENERAL_CMD_SET_LOW_RR_ACTIVATE ,REPLAY_GENERAL_CMD_VIDEO_CONFERENCING , + REPLAY_GENERAL_CMD_SET_CONTINUOUSLY_RESYNC, }; struct dmub_alpm_auxless_data {
Signature · 1 line
2.52.0
PATCH 21/21 drm/amd/display: Promote DC to 3.2.365
In reply to Matthew StewartFrom: Taimur Hassan <[email protected]>
This version brings along the following updates:
- Cleanup, refactoring of panel replay code to prepare for non-eDP replay
- Switch to drm_dbg_macros instead of DRM_DEBUG variants
- Add pwait status to DMCUB debug logging
- Adjust PHY FSM transition to TX_EN-to-PLL_ON for TMDS on DCN35
- Always update divider settings for DP tunnel
- correct clip x assignment in cursor programming
- Bump the HDMI clock to 340MHz
--- 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
@@ -63,7 +63,7 @@ struct dcn_dsc_reg_state;struct dcn_optc_reg_state ;struct dcn_dccg_reg_state ; -#define DC_VER "3.2.364" +#define DC_VER "3.2.365"/** * MAX_SURFACES - representative of the upper bound of surfaces that can be piped to a single CRTC
Signature · 1 line
2.52.0
[Public]
Hi all,
This week this patchset was tested on 4 systems, two dGPU and two APU based, and tested across multiple display and connection types.
APU
* Single Display eDP -> 1080p 60hz, 1920x1200 165hz, 3840x2400 60hz
* Single Display DP (SST DSC) -> 4k144hz, 4k240hz
* Multi display -> eDP + DP/HDMI/USB-C -> 1080p 60hz eDP + 4k 144hz, 4k 240hz (Includes USB-C to DP/HDMI adapters)
* Thunderbolt -> LG Ultrafine 5k
* MST DSC -> Cable Matters 101075 (DP to 3x DP) with 3x 4k60hz displays, HP Hook G2 with 2x 4k60hz displays
* USB 4 -> HP Hook G4, Lenovo Thunderbolt Dock, both with 2x 4k60hz DP and 1x 4k60hz HDMI displays
* SST PCON -> Club3D CAC-1085 + 1x 4k 144hz, FRL3, at a max resolution supported by the dongle of 4k 120hz YUV420 12bpc.
* MST PCON -> 1x 4k 144hz, FRL3, at a max resolution supported by the adapter of 4k 120hz RGB 8bpc.
DGPU
* Single Display DP (SST DSC) -> 4k144hz, 4k240hz
* Multiple Display DP -> 4k240hz + 4k144hz
* MST (Startech MST14DP123DP [DP to 3x DP] and 2x 4k 60hz displays)
* MST DSC (with Cable Matters 101075 [DP to 3x DP] with 3x 4k60hz displays)
The testing is a mix of automated and manual tests. Manual testing includes (but is not limited to)
* Changing display configurations and settings
* Video/Audio playback
* Benchmark testing
* Suspend/Resume testing
* Feature testing (Freesync, HDCP, etc.)
Automated testing includes (but is not limited to)
* Script testing (scripts to automate some of the manual checks)
* IGT testing
The testing is mainly tested on the following displays, but occasionally there are tests with other displays
* Samsung G8 Neo 4k240hz
* Samsung QN55QN95B 4k 120hz
* Acer XV322QKKV 4k144hz
* HP U27 4k Wireless 4k60hz
* LG 27UD58B 4k60hz
* LG 32UN650WA 4k60hz
* LG Ultrafine 5k 5k60hz
* AU Optronics B140HAN01.1 1080p 60hz eDP
* AU Optronics B160UAN01.J 1920x1200 165hz eDP
* Samsung ATNA60YV02-0 3840x2400 60Hz OLED eDP
The patchset consists of the amd-staging-drm-next branch (Head commit - 8d411887114f0ea5fe205d88b6a0d8be1c827164 -> drm/amd/pm: Disable MMIO access during SMU Mode 1 reset) with new patches added on top of it.
Tested on Ubuntu 24.04.3, on Wayland and X11, using Gnome.
Thank you,
Dan Wheeler
Sr. Technologist | AMD
SW Display
------------------------------------------------------------------------------------------------------------------
1 Commerce Valley Dr E, Thornhill, ON L3T 7X6
amd.com
-----Original Message-----
From: Matthew Stewart <[email protected]>
Sent: Wednesday, January 7, 2026 10:48 AM
To: [email protected]
Cc: Wentland, Harry <[email protected]>; Li, Sun peng (Leo) <[email protected]>; Pillai, Aurabindo <[email protected]>; Li, Roman <[email protected]>; Lin, Wayne <[email protected]>; Chung, ChiaHsuan (Tom) <[email protected]>; Zuo, Jerry <[email protected]>; Wheeler, Daniel <[email protected]>; Wu, Ray <[email protected]>; LIPSKI, IVAN <[email protected]>; Hung, Alex <[email protected]>; Stewart, Matthew <[email protected]>
Subject: [PATCH 00/21] DC Patches Jan 12, 2026
This DC patchset brings improvements in multiple areas. In summary, we have:
- Cleanup, refactoring of panel replay code to prepare for non-eDP replay
- Switch to drm_dbg_macros instead of DRM_DEBUG variants
- Add pwait status to DMCUB debug logging
- Adjust PHY FSM transition to TX_EN-to-PLL_ON for TMDS on DCN35
- Always update divider settings for DP tunnel
- correct clip x assignment in cursor programming
- Bump the HDMI clock to 340MHz
Aurabindo Pillai (2):
drm/amd/display: switch to drm_dbg_kms() from DRM_DEBUG_KMS drm/amd/display: switch to drm_dbg_ macros instead of DRM_DEBUG_
variants
Ausef Yousof (1):
drm/amd/display: correct clip x assignment in cursor programming
Cruise Hung (1):
drm/amd/display: Always update divider settings for DP tunnel
Derek Lai (1):
drm/amd/display: revert "write default Vesa Aux backlight control in
dmub"
Dmytro Laktyushkin (1):
drm/amd/display: only power down dig on phy endpoints
Jack Chang (2):
drm/amd/display: DPCD for Selective Update
drm/amd/display: PR error HPD_IRQ handling
Joshua Aberback (1):
drm/amd/display: Re-implement minimal transition deferral
Leo Chen (1):
drm/amd/display: Add global fgcg function prototype to DCCG
Mario Limonciello (1):
drm/amd/display: Bump the HDMI clock to 340MHz
Mario Limonciello (AMD) (1):
drm/amd/display: Show link name in PSR status message
Nicholas Kazlauskas (2):
drm/amd/display: Adjust PHY FSM transition to TX_EN-to-PLL_ON for TMDS
on DCN35
drm/amd/display: Add pwait status to DMCUB debug logging
Peichen Huang (3):
drm/amd/display: move panel replay out from edp drm/amd/display: init code for external panel replay drm/amd/display: Add replay_events in replay settings
Ray Wu (1):
drm/amd/display: disable replay when crc source is enabled
Robin Chen (1):
drm/amd/display: Remove unused DMUB replay commands
Taimur Hassan (2):
drm/amd/display: [FW Promotion] Release 0.1.42.0 drm/amd/display: Promote DC to 3.2.365
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 58 +-- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 1 + .../drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 25 +- .../amd/display/amdgpu_dm/amdgpu_dm_replay.c | 9 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 49 ++- .../drm/amd/display/dc/core/dc_link_exports.c | 9 +- drivers/gpu/drm/amd/display/dc/dc.h | 2 +- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 1 + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 34 +- .../gpu/drm/amd/display/dc/dc_hdmi_types.h | 2 +- drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 6 + drivers/gpu/drm/amd/display/dc/dc_types.h | 3 +- .../drm/amd/display/dc/dce/dmub_hw_lock_mgr.c | 2 +- .../gpu/drm/amd/display/dc/dce/dmub_replay.c | 13 - .../amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 6 +- .../amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 52 +++ .../amd/display/dc/hwss/dcn35/dcn35_hwseq.h | 3 + .../amd/display/dc/hwss/dcn35/dcn35_init.c | 2 +- .../amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 2 + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 1 + .../gpu/drm/amd/display/dc/inc/link_service.h | 12 +- drivers/gpu/drm/amd/display/dc/link/Makefile | 2 +- .../display/dc/link/accessories/link_dp_cts.c | 7 +- .../drm/amd/display/dc/link/link_detection.c | 6 +- .../gpu/drm/amd/display/dc/link/link_dpms.c | 8 +- .../drm/amd/display/dc/link/link_factory.c | 19 +- .../dc/link/protocols/link_dp_capability.c | 49 ++- .../dc/link/protocols/link_dp_irq_handler.c | 43 +++ .../dc/link/protocols/link_dp_panel_replay.c | 343 ++++++++++++++++++ .../dc/link/protocols/link_dp_panel_replay.h | 38 ++ .../link/protocols/link_edp_panel_control.c | 297 +-------------- .../link/protocols/link_edp_panel_control.h | 10 +- .../dc/resource/dcn31/dcn31_resource.c | 11 +- .../gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 54 +-- .../gpu/drm/amd/display/include/dpcd_defs.h | 30 ++ 35 files changed, 763 insertions(+), 446 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_panel_replay.c create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_panel_replay.h
--
2.52.0