Fix regression on embedded panels caused by enabling ASSR
Subsystems (3)
cover Fix regression on embedded panels caused by enabling ASSR
Previous ASSR-enabling patches cause blank screen on some embedded panels. This patch set minimize the changes made to code logic prior to the ASSR change and also improve on code readability.
Stylon Wang (2):
drm/amd/display: Revert "Re-enable 'Guard ASSR with internal display
flag'"
drm/amd/display: Fix ASSR regression on embedded panels
.../gpu/drm/amd/display/dc/core/dc_link_dp.c | 58 +++++++------------ 1 file changed, 20 insertions(+), 38 deletions(-)
Signature · 6 lines
2.32.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 1/2 drm/amd/display: Revert "Re-enable 'Guard ASSR with internal display flag'"
[Why]
A new change that simplifies the ASSR enabling and guarding is found that also fixes regression on some embedded panels.
[How]
Revert the ASSR changes in preparation for upcoming patch.
--- .../gpu/drm/amd/display/dc/core/dc_link_dp.c | 54 ++++++------------- 1 file changed, 17 insertions(+), 37 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +17 -37
@@ -1752,38 +1752,6 @@ enum link_training_result dc_link_dp_perform_link_training(return status; } -static enum dp_panel_mode try_enable_assr (struct dc_stream_state *stream) -{ -struct dc_link *link = stream->link; -enum dp_panel_mode panel_mode =dp_get_panel_mode (link); -#ifdef CONFIG_DRM_AMD_DC_HDCP -struct cp_psp *cp_psp = &stream->ctx->cp_psp; -#endif - -/* ASSR must be supported on the panel */ -if (panel_mode ==DP_PANEL_MODE_DEFAULT ) -return panel_mode; - -/* eDP or internal DP only */ -if (link->connector_signal !=SIGNAL_TYPE_EDP && - !(link->connector_signal ==SIGNAL_TYPE_DISPLAY_PORT && - link->is_internal_display)) -return DP_PANEL_MODE_DEFAULT ; - -#ifdef CONFIG_DRM_AMD_DC_HDCP -if (cp_psp && cp_psp->funcs.enable_assr) { -if (!cp_psp->funcs.enable_assr (cp_psp->handle, link)) { -/* since eDP implies ASSR on, change panel -* mode to disable ASSR -*/ - panel_mode =DP_PANEL_MODE_DEFAULT ; - } - }else - panel_mode =DP_PANEL_MODE_DEFAULT ; -#endif -return panel_mode; -} - bool perform_link_training_with_retries( const struct dc_link_settings *link_setting, bool skip_video_pattern,
@@ -1796,7 +1764,7 @@ bool perform_link_training_with_retries(uint8_t delay_between_attempts =LINK_TRAINING_RETRY_DELAY ;struct dc_stream_state *stream = pipe_ctx->stream;struct dc_link *link = stream->link; -enum dp_panel_mode panel_mode; +enum dp_panel_mode panel_mode =dp_get_panel_mode (link);struct link_encoder *link_enc;enum link_training_result status =LINK_TRAINING_CR_FAIL_LANE0 ;struct dc_link_settings current_setting = *link_setting;
@@ -1832,11 +1800,23 @@ bool perform_link_training_with_retries(msleep (delay_dp_power_up_in_ms); } - panel_mode =try_enable_assr (stream); +#ifdef CONFIG_DRM_AMD_DC_HDCP +if (panel_mode ==DP_PANEL_MODE_EDP ) { +struct cp_psp *cp_psp = &stream->ctx->cp_psp; + +if (cp_psp && cp_psp->funcs.enable_assr) { +if (!cp_psp->funcs.enable_assr (cp_psp->handle, link)) { +/* since eDP implies ASSR on, change panel +* mode to disable ASSR +*/ + panel_mode =DP_PANEL_MODE_DEFAULT ; + } + }else + panel_mode =DP_PANEL_MODE_DEFAULT ; + } +#endif +dp_set_panel_mode (link, panel_mode); -DC_LOG_DETECTION_DP_CAPS ("Link: %d ASSR enabled: %d\n" , - link->link_index, - panel_mode !=DP_PANEL_MODE_DEFAULT );if (link->aux_access_disabled) {dc_link_dp_perform_link_training_skip_aux (link, ¤t_setting);
Signature · 6 lines
2.32.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/2 drm/amd/display: Fix ASSR regression on embedded panels
In reply to Stylon Wang[Why]
Regression found in some embedded panels traces back to the earliest upstreamed ASSR patch. The changed code flow are causing problems with some panels.
[How]
- Change ASSR enabling code while preserving original code flow as much as possible
- Simplify the code on guarding with internal display flag
--- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +5 -3
@@ -1811,8 +1811,7 @@ bool perform_link_training_with_retries(*/ panel_mode = DP_PANEL_MODE_DEFAULT; } - }else - panel_mode =DP_PANEL_MODE_DEFAULT ; + } }#endif
@@ -4643,7 +4642,10 @@ enum dp_panel_mode dp_get_panel_mode(struct dc_link *link) } } -if (link->dpcd_caps.panel_mode_edp) { +if (link->dpcd_caps.panel_mode_edp && + (link->connector_signal ==SIGNAL_TYPE_EDP || + (link->connector_signal ==SIGNAL_TYPE_DISPLAY_PORT && + link->is_internal_display))) {return DP_PANEL_MODE_EDP ; }
Signature · 6 lines
2.32.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 2/2] drm/amd/display: Fix ASSR regression on embedded panels
Quoted 6 lines · Stylon Wang
[Why]
Regression found in some embedded panels traces back to the earliest upstreamed ASSR patch. The changed code flow are causing problems with some panels.
Quoted 6 lines
[How]
- Change ASSR enabling code while preserving original code flow as much as possible
- Simplify the code on guarding with internal display flagSigned-off-by Stylon Wang <[email protected]>
Series is:
Quoted 33 lines
--- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +5
-4@@ -1811,8 +1811,7 @@ bool perform_link_training_with_retries(*/ panel_mode = DP_PANEL_MODE_DEFAULT; } - }else - panel_mode =DP_PANEL_MODE_DEFAULT ; + } }#endif @@ -4643,7 +4642,10 @@ enum dp_panel_mode dp_get_panel_mode(struct dc_link *link) } } -if (link->dpcd_caps.panel_mode_edp) { +if (link->dpcd_caps.panel_mode_edp && + (link->connector_signal ==SIGNAL_TYPE_EDP || + (link->connector_signal ==SIGNAL_TYPE_DISPLAY_PORT && + link->is_internal_display))) {return DP_PANEL_MODE_EDP ; } --2.32.0
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 2/2] drm/amd/display: Fix ASSR regression on embedded panels
Quoted 13 lines · Alex Deucher
Quoted 11 lines · Stylon Wang
[Why]
Regression found in some embedded panels traces back to the earliest upstreamed ASSR patch. The changed code flow are causing problems with some panels.[How]
- Change ASSR enabling code while preserving original code flow as much as possible
- Simplify the code on guarding with internal display flag
Quoted 4 lines
Quoted 1 line
Signed-off-by Stylon Wang <[email protected]>Series is:
Reviewed-by Alex Deucher <[email protected]>
Please add:
Alex
Quoted 31 lines
Quoted 31 lines
--- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +5
-3@@ -1811,8 +1811,7 @@ bool perform_link_training_with_retries(*/ panel_mode = DP_PANEL_MODE_DEFAULT; } - }else - panel_mode =DP_PANEL_MODE_DEFAULT ; + } }#endif @@ -4643,7 +4642,10 @@ enum dp_panel_mode dp_get_panel_mode(struct dc_link *link) } } -if (link->dpcd_caps.panel_mode_edp) { +if (link->dpcd_caps.panel_mode_edp && + (link->connector_signal ==SIGNAL_TYPE_EDP || + (link->connector_signal ==SIGNAL_TYPE_DISPLAY_PORT && + link->is_internal_display))) {return DP_PANEL_MODE_EDP ; }
Quoted 7 lines
Quoted 7 lines
--
2.32.0_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
v2 cover Fix regression on embedded panels caused by enabling ASSR
In reply to Stylon WangPrevious ASSR-enabling patches cause blank screen on some embedded panels. This patch set minimize the changes made to code logic prior to the ASSR change and also improve on code readability.
Changes from prior rev1 to now:
v2:
- Update reviewed-by and bug links
Stylon Wang (2):
drm/amd/display: Revert "Re-enable 'Guard ASSR with internal display
flag'"
drm/amd/display: Fix ASSR regression on embedded panels
.../gpu/drm/amd/display/dc/core/dc_link_dp.c | 58 +++++++------------ 1 file changed, 20 insertions(+), 38 deletions(-)
Signature · 6 lines
2.32.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 1/2 drm/amd/display: Revert "Re-enable 'Guard ASSR with internal display flag'"
[Why]
A new change that simplifies the ASSR enabling and guarding is found that also fixes regression on some embedded panels.
[How]
Revert the ASSR changes in preparation for upcoming patch.
--- .../gpu/drm/amd/display/dc/core/dc_link_dp.c | 54 ++++++------------- 1 file changed, 17 insertions(+), 37 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +17 -37
@@ -1752,38 +1752,6 @@ enum link_training_result dc_link_dp_perform_link_training(return status; } -static enum dp_panel_mode try_enable_assr (struct dc_stream_state *stream) -{ -struct dc_link *link = stream->link; -enum dp_panel_mode panel_mode =dp_get_panel_mode (link); -#ifdef CONFIG_DRM_AMD_DC_HDCP -struct cp_psp *cp_psp = &stream->ctx->cp_psp; -#endif - -/* ASSR must be supported on the panel */ -if (panel_mode ==DP_PANEL_MODE_DEFAULT ) -return panel_mode; - -/* eDP or internal DP only */ -if (link->connector_signal !=SIGNAL_TYPE_EDP && - !(link->connector_signal ==SIGNAL_TYPE_DISPLAY_PORT && - link->is_internal_display)) -return DP_PANEL_MODE_DEFAULT ; - -#ifdef CONFIG_DRM_AMD_DC_HDCP -if (cp_psp && cp_psp->funcs.enable_assr) { -if (!cp_psp->funcs.enable_assr (cp_psp->handle, link)) { -/* since eDP implies ASSR on, change panel -* mode to disable ASSR -*/ - panel_mode =DP_PANEL_MODE_DEFAULT ; - } - }else - panel_mode =DP_PANEL_MODE_DEFAULT ; -#endif -return panel_mode; -} - bool perform_link_training_with_retries( const struct dc_link_settings *link_setting, bool skip_video_pattern,
@@ -1796,7 +1764,7 @@ bool perform_link_training_with_retries(uint8_t delay_between_attempts =LINK_TRAINING_RETRY_DELAY ;struct dc_stream_state *stream = pipe_ctx->stream;struct dc_link *link = stream->link; -enum dp_panel_mode panel_mode; +enum dp_panel_mode panel_mode =dp_get_panel_mode (link);struct link_encoder *link_enc;enum link_training_result status =LINK_TRAINING_CR_FAIL_LANE0 ;struct dc_link_settings current_setting = *link_setting;
@@ -1832,11 +1800,23 @@ bool perform_link_training_with_retries(msleep (delay_dp_power_up_in_ms); } - panel_mode =try_enable_assr (stream); +#ifdef CONFIG_DRM_AMD_DC_HDCP +if (panel_mode ==DP_PANEL_MODE_EDP ) { +struct cp_psp *cp_psp = &stream->ctx->cp_psp; + +if (cp_psp && cp_psp->funcs.enable_assr) { +if (!cp_psp->funcs.enable_assr (cp_psp->handle, link)) { +/* since eDP implies ASSR on, change panel +* mode to disable ASSR +*/ + panel_mode =DP_PANEL_MODE_DEFAULT ; + } + }else + panel_mode =DP_PANEL_MODE_DEFAULT ; + } +#endif +dp_set_panel_mode (link, panel_mode); -DC_LOG_DETECTION_DP_CAPS ("Link: %d ASSR enabled: %d\n" , - link->link_index, - panel_mode !=DP_PANEL_MODE_DEFAULT );if (link->aux_access_disabled) {dc_link_dp_perform_link_training_skip_aux (link, ¤t_setting);
Signature · 6 lines
2.32.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 2/2 drm/amd/display: Fix ASSR regression on embedded panels
In reply to Stylon Wang[Why]
Regression found in some embedded panels traces back to the earliest upstreamed ASSR patch. The changed code flow are causing problems with some panels.
[How]
- Change ASSR enabling code while preserving original code flow as much as possible
- Simplify the code on guarding with internal display flag
--- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +5 -3
@@ -1811,8 +1811,7 @@ bool perform_link_training_with_retries(*/ panel_mode = DP_PANEL_MODE_DEFAULT; } - }else - panel_mode =DP_PANEL_MODE_DEFAULT ; + } }#endif
@@ -4643,7 +4642,10 @@ enum dp_panel_mode dp_get_panel_mode(struct dc_link *link) } } -if (link->dpcd_caps.panel_mode_edp) { +if (link->dpcd_caps.panel_mode_edp && + (link->connector_signal ==SIGNAL_TYPE_EDP || + (link->connector_signal ==SIGNAL_TYPE_DISPLAY_PORT && + link->is_internal_display))) {return DP_PANEL_MODE_EDP ; }
Signature · 6 lines
2.32.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Deucher, Alexander
maintainer[Public]
Series looks good to me. Thanks!
Alex
________________________________
From: amd-gfx <[email protected]> on behalf of Stylon Wang <[email protected]>
Sent: Wednesday, July 21, 2021 12:25 AM
To: [email protected] <[email protected]>
Cc: Wang, Chao-kai (Stylon) <[email protected]>; Li, Sun peng (Leo) <[email protected]>; Wentland, Harry <[email protected]>; Zhuo, Qingqing <[email protected]>; Siqueira, Rodrigo <[email protected]>; Jacob, Anson <[email protected]>; Pillai, Aurabindo <[email protected]>; Lakha, Bhawanpreet <[email protected]>; R, Bindu <[email protected]>
Subject: [PATCH v2 0/2] Fix regression on embedded panels caused by enabling ASSR
Previous ASSR-enabling patches cause blank screen on some embedded panels. This patch set minimize the changes made to code logic prior to the ASSR change and also improve on code readability.
Changes from prior rev1 to now:
v2:
- Update reviewed-by and bug links
Stylon Wang (2):
drm/amd/display: Revert "Re-enable 'Guard ASSR with internal display
flag'"
drm/amd/display: Fix ASSR regression on embedded panels
.../gpu/drm/amd/display/dc/core/dc_link_dp.c | 58 +++++++------------ 1 file changed, 20 insertions(+), 38 deletions(-)
--
2.32.0
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Calexander.deucher%40amd.com%7C448d5309ea364844350d08d94bff9c47%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637624383495009435%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=KuBaIHeinOgubF5Mp%2FnZA45ia6FrxVdrNtTBwf7OqPE%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx