DC Patches Jan 4, 2017
Subsystems (3)
cover DC Patches Jan 4, 2017
* bunch of small patches to enable DP PHY compliance
* gamma fix
* minor link_encoder cleanup
Hersen Wu (2):
drm/amd/display: Fix link retraining hw sequence for auto test drm/amd/display: Fix DP PHY test pre-emphasis not set properly
Roman Li (1):
drm/amd/display: fix gamma for dpms usecase
Tony Cheng (2):
drm/amd/display: simplify link_encoder drm/amd/display: limit HBR3 support to Polaris and up
Zeyu Fan (1):
drm/amd/display: Fix link retraining hw sequence
.../drm/amd/display/amdgpu_dm/amdgpu_dm_types.c | 22 ++--- drivers/gpu/drm/amd/display/dc/core/dc.c | 28 ++++--- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 8 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 4 +- drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 51 +++++++++--- drivers/gpu/drm/amd/display/dc/dc.h | 6 +- .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 97 +++------------------- .../gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 1 + .../drm/amd/display/dc/dce100/dce100_resource.c | 11 ++- .../drm/amd/display/dc/dce110/dce110_resource.c | 11 ++- .../drm/amd/display/dc/dce112/dce112_resource.c | 15 +++- .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 11 ++- .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 20 +---- drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 4 +- .../amd/display/dc/virtual/virtual_link_encoder.c | 4 - 15 files changed, 131 insertions(+), 162 deletions(-)
Signature · 6 lines
2.9.3 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20170104213052.10221-1-harry.wentland-5C7GfCeVMHo@public.gmane.org
PATCH 1/6 drm/amd/display: Fix link retraining hw sequence
From: Zeyu Fan <[email protected]>
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 15 +++---- drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 49 +++++++++++++++++++++- drivers/gpu/drm/amd/display/dc/dc.h | 3 +- drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 4 ++ 4 files changed, 62 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +8 -7
@@ -357,17 +357,18 @@ static void perform_link_training(struct dc *dc, }static void set_preferred_link_settings (struct dc *dc, -struct dc_link_settings *link_setting) +struct dc_link_settings *link_setting, +const struct dc_link *link) { -struct core_dc *core_dc =DC_TO_CORE (dc); -int i; +struct core_link *core_link =DC_LINK_TO_CORE (link); -for (i =0 ; i < core_dc->link_count; i++) { - core_dc->links[i]->public.verified_link_cap.lane_count = + core_link->public.verified_link_cap.lane_count = link_setting->lane_count; - core_dc->links[i]->public.verified_link_cap.link_rate = + core_link->public.verified_link_cap.link_rate = link_setting->link_rate; - } +dp_retrain_link_physi (core_link, + link_setting, + false); }static void enable_hpd (const struct dc_link *link)
drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c +48 -1
58 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dc.h +2 -1
@@ -117,7 +117,8 @@ struct dc_link_funcs {struct dc_link_settings *link_setting, bool skip_video_pattern);void (*set_preferred_link_settings)(struct dc *dc, -struct dc_link_settings *link_setting); +struct dc_link_settings *link_setting, +const struct dc_link *link);void (*enable_hpd)(const struct dc_link *link);void (*disable_hpd)(const struct dc_link *link); void (*set_test_pattern)(
drivers/gpu/drm/amd/display/dc/inc/link_hwss.h +4 -0
@@ -70,4 +70,8 @@ enum dp_panel_mode dp_get_panel_mode(struct core_link *link);void dp_retrain_link (struct core_link *link); +void dp_retrain_link_physi (struct core_link *link, +struct dc_link_settings *link_setting, +bool skip_video_pattern); +#endif /* __DC_LINK_HWSS_H__ */
Signature · 6 lines
2.9.3 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/6 drm/amd/display: Fix link retraining hw sequence for auto test
In reply to a message not in the archiveFrom: Hersen Wu <[email protected]>
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 4 +--- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 4 ++-- drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 27 ++++------------------ drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 4 +--- 4 files changed, 9 insertions(+), 30 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +1 -3
@@ -366,9 +366,7 @@ static void set_preferred_link_settings(struct dc *dc, link_setting->lane_count; core_link->public.verified_link_cap.link_rate = link_setting->link_rate; -dp_retrain_link_physi (core_link, - link_setting, - false); +dp_retrain_link_dp_test (core_link, link_setting, false); }static void enable_hpd (const struct dc_link *link)
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +2 -2
@@ -1532,7 +1532,7 @@ static bool handle_hpd_irq_psr_sink(const struct core_link *link)static void dp_test_send_link_training (struct core_link *link) { -struct dc_link_settings link_settings; +struct dc_link_settings link_settings = {0 }; core_link_read_dpcd( link,
@@ -1549,7 +1549,7 @@ static void dp_test_send_link_training(struct core_link *link) link->public.verified_link_cap.lane_count = link_settings.lane_count; link->public.verified_link_cap.link_rate = link_settings.link_rate; -dp_retrain_link (link); +dp_retrain_link_dp_test (link, &link_settings, false); }static void dp_test_send_phy_test_pattern (struct core_link *link)
drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c +5 -22
@@ -200,28 +200,7 @@ void dp_set_hw_test_pattern( encoder->funcs->dp_set_phy_pattern (encoder, &pattern_param); } -void dp_retrain_link (struct core_link *link) -{ -struct pipe_ctx *pipes = link->dc->current_context->res_ctx.pipe_ctx; -unsigned int i; - -for (i =0 ; i <MAX_PIPES ; i++) { -if (pipes[i].stream_enc !=NULL ) { -dm_delay_in_microseconds (link->ctx,100 ); - pipes->stream_enc->funcs->dp_blank (pipes[i].stream_enc); - link->dc->hwss.disable_stream (&pipes[i]); -dc_link_dp_perform_link_training ( - &link->public, - &link->public.verified_link_cap, - true); - link->dc->hwss.enable_stream (&pipes[i]); - link->dc->hwss.unblank_stream (&pipes[i], - &link->public.verified_link_cap); - } - } -} - -void dp_retrain_link_physi (struct core_link *link, +void dp_retrain_link_dp_test (struct core_link *link,struct dc_link_settings *link_setting,bool skip_video_pattern) {
@@ -240,6 +219,10 @@ void dp_retrain_link_physi(struct core_link *link, pipes[i].stream_enc->funcs->dp_blank ( pipes[i].stream_enc); +/* disable any test pattern that might be active */ +dp_set_hw_test_pattern (link, +DP_TEST_PATTERN_VIDEO_MODE ,NULL ,0 ); +dp_receiver_power_ctrl (link, false); link->link_enc->funcs->disable_output(
drivers/gpu/drm/amd/display/dc/inc/link_hwss.h +1 -3
@@ -68,9 +68,7 @@ void dp_set_hw_test_pattern(enum dp_panel_mode dp_get_panel_mode (struct core_link *link); -void dp_retrain_link (struct core_link *link); - -void dp_retrain_link_physi (struct core_link *link, +void dp_retrain_link_dp_test (struct core_link *link,struct dc_link_settings *link_setting,bool skip_video_pattern);
Signature · 6 lines
2.9.3 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/6 drm/amd/display: simplify link_encoder
In reply to a message not in the archiveFrom: Tony Cheng <[email protected]>
- remove unnecessary feature flags
- remove wireless and VGA validation
--- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 8 +-- .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 64 ++-------------------- .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 20 +------ .../amd/display/dc/virtual/virtual_link_encoder.c | 4 -- 4 files changed, 6 insertions(+), 90 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link.c +1 -7
@@ -317,7 +317,6 @@ static bool is_dp_sink_present(struct core_link *link) {enum gpio_result gpio_result;uint32_t clock_pin =0 ; -uint32_t data_pin =0 ;struct ddc *ddc;
@@ -353,12 +352,7 @@ static bool is_dp_sink_present(struct core_link *link) gpio_result =dal_gpio_get_value (ddc->pin_clock, &clock_pin);ASSERT (gpio_result ==GPIO_RESULT_OK ); -if (gpio_result ==GPIO_RESULT_OK ) -if (link->link_enc->features.flags.bits. - DP_SINK_DETECT_POLL_DATA_PIN) - gpio_result =dal_gpio_get_value (ddc->pin_data, &data_pin); - - present = (gpio_result ==GPIO_RESULT_OK ) && !(clock_pin || data_pin); + present = (gpio_result ==GPIO_RESULT_OK ) && !clock_pin;dal_ddc_close (ddc);
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c +4 -60
138 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h +1 -19
@@ -33,34 +33,16 @@ struct encoder_init_data {struct encoder_feature_support {union {struct { -/* 1 - external encoder; 0 - internal encoder */ -uint32_t EXTERNAL_ENCODER:1 ; -uint32_t ANALOG_ENCODER:1 ; -uint32_t STEREO_SYNC:1 ; -/* check the DDC data pin -* when performing DP Sink detection */ -uint32_t DP_SINK_DETECT_POLL_DATA_PIN:1 ; -/* CPLIB authentication -* for external DP chip supported */ -uint32_t CPLIB_DP_AUTHENTICATION:1 ;uint32_t IS_HBR2_CAPABLE:1 ;uint32_t IS_HBR3_CAPABLE:1 ; -uint32_t IS_HBR2_VALIDATED:1 ;uint32_t IS_TPS3_CAPABLE:1 ;uint32_t IS_TPS4_CAPABLE:1 ; -uint32_t IS_AUDIO_CAPABLE:1 ; -uint32_t IS_VCE_SUPPORTED:1 ; -uint32_t IS_CONVERTER:1 ; -uint32_t IS_Y_ONLY_CAPABLE:1 ;uint32_t IS_YCBCR_CAPABLE:1 ; } bits;uint32_t raw; } flags; -/* maximum supported deep color depth */ -enum dc_color_depth max_deep_color; +enum dc_color_depth max_hdmi_deep_color; -/* maximum supported clock */ -unsigned int max_pixel_clock;unsigned int max_hdmi_pixel_clock;bool ycbcr420_supported; };
drivers/gpu/drm/amd/display/dc/virtual/virtual_link_encoder.c +0 -4
@@ -28,8 +28,6 @@#include "virtual_link_encoder.h" -#define VIRTUAL_MAX_PIXEL_CLK_IN_KHZ 600000 -static bool virtual_link_encoder_validate_output_with_stream (struct link_encoder *enc,struct pipe_ctx *pipe_ctx) {return true; }
@@ -138,8 +136,6 @@ bool virtual_link_encoder_construct( enc->transmitter = init_data->transmitter; - enc->features.max_pixel_clock =VIRTUAL_MAX_PIXEL_CLK_IN_KHZ ; - enc->output_signals =SIGNAL_TYPE_VIRTUAL ; enc->preferred_engine =ENGINE_ID_VIRTUAL ;
Signature · 6 lines
2.9.3 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/6 drm/amd/display: limit HBR3 support to Polaris and up
In reply to a message not in the archiveFrom: Tony Cheng <[email protected]>
- also fix YCbCr420 supported on Polaris and up
--- .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 31 ++++------------------ .../gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 1 + .../drm/amd/display/dc/dce100/dce100_resource.c | 11 ++++++-- .../drm/amd/display/dc/dce110/dce110_resource.c | 11 ++++++-- .../drm/amd/display/dc/dce112/dce112_resource.c | 15 +++++++++-- .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 11 ++++++-- 6 files changed, 46 insertions(+), 34 deletions(-)
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c +5 -26
@@ -927,10 +927,14 @@ bool dce110_link_encoder_validate_dp_output(bool dce110_link_encoder_construct (struct dce110_link_encoder *enc110,const struct encoder_init_data *init_data, +const struct encoder_feature_support *enc_features,const struct dce110_link_enc_registers *link_regs,const struct dce110_link_enc_aux_registers *aux_regs,const struct dce110_link_enc_hpd_registers *hpd_regs) { +struct bp_encoder_cap_info bp_cap_info = {0 }; +const struct dc_vbios_funcs *bp_funcs = init_data->ctx->dc_bios->funcs; + enc110->base.funcs = &dce110_lnk_enc_funcs; enc110->base.ctx = init_data->ctx; enc110->base.id = init_data->encoder;
@@ -941,12 +945,10 @@ bool dce110_link_encoder_construct( enc110->base.preferred_engine =ENGINE_ID_UNKNOWN ; - enc110->base.features.flags.raw =0 ; + enc110->base.features = *enc_features; enc110->base.transmitter = init_data->transmitter; - enc110->base.features.max_hdmi_deep_color =COLOR_DEPTH_121212 ; -if (enc110->base.ctx->dc->debug.disable_hdmi_deep_color) enc110->base.features.max_hdmi_deep_color =COLOR_DEPTH_888 ;
@@ -1013,10 +1015,6 @@ bool dce110_link_encoder_construct( init_data->channel);/* Override features with DCE-specific values */ - { -struct bp_encoder_cap_info bp_cap_info = {0 }; -const struct dc_vbios_funcs *bp_funcs = enc110->base.ctx->dc_bios->funcs; -if (BP_RESULT_OK == bp_funcs->get_encoder_cap_info ( enc110->base.ctx->dc_bios, enc110->base.id, &bp_cap_info))
@@ -1024,26 +1022,7 @@ bool dce110_link_encoder_construct( bp_cap_info.DP_HBR2_CAP; enc110->base.features.flags.bits.IS_HBR3_CAPABLE = bp_cap_info.DP_HBR3_EN; - } - -/* TODO: check PPLIB maxPhyClockInKHz <= 540000, if yes, -* IS_HBR3_CAPABLE = 0. -*/ -/* test pattern 3 support */ - enc110->base.features.flags.bits.IS_TPS3_CAPABLE = true; -/* test pattern 4 support */ - enc110->base.features.flags.bits.IS_TPS4_CAPABLE = true; - -/* -dal_adapter_service_is_feature_supported(as, -FEATURE_SUPPORT_DP_Y_ONLY); -*/ - enc110->base.features.flags.bits.IS_YCBCR_CAPABLE = true; -/* -dal_adapter_service_is_feature_supported(as, -FEATURE_SUPPORT_DP_YUV); -*/ return true; }
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h +1 -0
@@ -236,6 +236,7 @@ struct dce110_abm_backlight_registers {bool dce110_link_encoder_construct (struct dce110_link_encoder *enc110,const struct encoder_init_data *init_data, +const struct encoder_feature_support *enc_features,const struct dce110_link_enc_registers *link_regs,const struct dce110_link_enc_aux_registers *aux_regs,const struct dce110_link_enc_hpd_registers *hpd_regs);
drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c +9 -2
@@ -581,6 +581,14 @@ static struct input_pixel_processor *dce100_ipp_create(return NULL ; } +static const struct encoder_feature_support link_enc_feature = { + .max_hdmi_deep_color =COLOR_DEPTH_121212 , + .max_hdmi_pixel_clock =300000 , + .flags.bits.IS_HBR2_CAPABLE = true, + .flags.bits.IS_TPS3_CAPABLE = true, + .flags.bits.IS_YCBCR_CAPABLE = true +}; +struct link_encoder *dce100_link_encoder_create (const struct encoder_init_data *enc_init_data) {
@@ -593,12 +601,11 @@ struct link_encoder *dce100_link_encoder_create(if (dce110_link_encoder_construct ( enc110, enc_init_data, + &link_enc_feature, &link_enc_regs[enc_init_data->transmitter], &link_enc_aux_regs[enc_init_data->channel -1 ], &link_enc_hpd_regs[enc_init_data->hpd_source])) { - enc110->base.features.ycbcr420_supported = false; - enc110->base.features.max_hdmi_pixel_clock =300000 ;return &enc110->base; }
drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c +9 -2
@@ -570,6 +570,14 @@ static struct input_pixel_processor *dce110_ipp_create(return NULL ; } +static const struct encoder_feature_support link_enc_feature = { + .max_hdmi_deep_color =COLOR_DEPTH_121212 , + .max_hdmi_pixel_clock =594000 , + .flags.bits.IS_HBR2_CAPABLE = true, + .flags.bits.IS_TPS3_CAPABLE = true, + .flags.bits.IS_YCBCR_CAPABLE = true +}; +struct link_encoder *dce110_link_encoder_create (const struct encoder_init_data *enc_init_data) {
@@ -582,12 +590,11 @@ struct link_encoder *dce110_link_encoder_create(if (dce110_link_encoder_construct ( enc110, enc_init_data, + &link_enc_feature, &link_enc_regs[enc_init_data->transmitter], &link_enc_aux_regs[enc_init_data->channel -1 ], &link_enc_hpd_regs[enc_init_data->hpd_source])) { - enc110->base.features.ycbcr420_supported = false; - enc110->base.features.max_hdmi_pixel_clock =594000 ;return &enc110->base; }
drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c +13 -2
@@ -564,6 +564,18 @@ static struct transform *dce112_transform_create(dm_free (transform);return NULL ; } + +static const struct encoder_feature_support link_enc_feature = { + .max_hdmi_deep_color =COLOR_DEPTH_121212 , + .max_hdmi_pixel_clock =600000 , + .ycbcr420_supported = true, + .flags.bits.IS_HBR2_CAPABLE = true, + .flags.bits.IS_HBR3_CAPABLE = true, + .flags.bits.IS_TPS3_CAPABLE = true, + .flags.bits.IS_TPS4_CAPABLE = true, + .flags.bits.IS_YCBCR_CAPABLE = true +}; +struct link_encoder *dce112_link_encoder_create (const struct encoder_init_data *enc_init_data) {
@@ -576,12 +588,11 @@ struct link_encoder *dce112_link_encoder_create(if (dce110_link_encoder_construct ( enc110, enc_init_data, + &link_enc_feature, &link_enc_regs[enc_init_data->transmitter], &link_enc_aux_regs[enc_init_data->channel -1 ], &link_enc_hpd_regs[enc_init_data->hpd_source])) { - enc110->base.features.ycbcr420_supported = false; - enc110->base.features.max_hdmi_pixel_clock =600000 ;return &enc110->base; }
drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c +9 -2
@@ -611,6 +611,14 @@ static struct input_pixel_processor *dce80_ipp_create(return NULL ; } +static const struct encoder_feature_support link_enc_feature = { + .max_hdmi_deep_color =COLOR_DEPTH_121212 , + .max_hdmi_pixel_clock =297000 , + .flags.bits.IS_HBR2_CAPABLE = true, + .flags.bits.IS_TPS3_CAPABLE = true, + .flags.bits.IS_YCBCR_CAPABLE = true +}; +struct link_encoder *dce80_link_encoder_create (const struct encoder_init_data *enc_init_data) {
@@ -623,12 +631,11 @@ struct link_encoder *dce80_link_encoder_create(if (dce110_link_encoder_construct ( enc110, enc_init_data, + &link_enc_feature, &link_enc_regs[enc_init_data->transmitter], &link_enc_aux_regs[enc_init_data->channel -1 ], &link_enc_hpd_regs[enc_init_data->hpd_source])) { - enc110->base.features.ycbcr420_supported = false; - enc110->base.features.max_hdmi_pixel_clock =297000 ;return &enc110->base; }
Signature · 6 lines
2.9.3 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/6 drm/amd/display: fix gamma for dpms usecase
In reply to a message not in the archiveFrom: Roman Li <[email protected]>
For dpms usecase we need to set surface transfer function regardless of gamma set flag.
--- .../drm/amd/display/amdgpu_dm/amdgpu_dm_types.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c +11 -11
@@ -513,7 +513,6 @@ static void fill_gamma_from_crtc( {int i;struct dc_gamma *gamma; -struct dc_transfer_func *input_tf;uint16_t *red, *green, *blue;int end = (crtc->gamma_size >NUM_OF_RAW_GAMMA_RAMP_RGB_256 ) ?NUM_OF_RAW_GAMMA_RAMP_RGB_256 : crtc->gamma_size;
@@ -534,16 +533,6 @@ static void fill_gamma_from_crtc( } dc_surface->gamma_correction = gamma; - - input_tf =dc_create_transfer_func (); - -if (input_tf ==NULL ) -return ; - - input_tf->type =TF_TYPE_PREDEFINED ; - input_tf->tf =TRANSFER_FUNCTION_SRGB ; - - dc_surface->in_transfer_func = input_tf; } static void fill_plane_attributes(
@@ -554,6 +543,7 @@ static void fill_plane_attributes(const struct amdgpu_framebuffer *amdgpu_fb =to_amdgpu_framebuffer (state->fb);const struct drm_crtc *crtc = state->crtc; +struct dc_transfer_func *input_tf;fill_rects_from_plane_state (state, surface); fill_plane_attributes_from_fb(
@@ -562,6 +552,16 @@ static void fill_plane_attributes( amdgpu_fb, addrReq); + input_tf =dc_create_transfer_func (); + +if (input_tf ==NULL ) +return ; + + input_tf->type =TF_TYPE_PREDEFINED ; + input_tf->tf =TRANSFER_FUNCTION_SRGB ; + + surface->in_transfer_func = input_tf; +/* In case of gamma set, update gamma value */ if (crtc->mode.private_flags &AMDGPU_CRTC_MODE_PRIVATE_FLAGS_GAMMASET ) {
Signature · 6 lines
2.9.3 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/6 drm/amd/display: Fix DP PHY test pre-emphasis not set properly
In reply to a message not in the archiveFrom: Hersen Wu <[email protected]>
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 15 +++++++++++---- drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 9 +++++---- drivers/gpu/drm/amd/display/dc/dc.h | 3 ++- drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 2 +- 4 files changed, 19 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +11 -4
@@ -332,14 +332,21 @@ static bool setup_psr(struct dc *dc, const struct dc_stream *stream) }static void set_drive_settings (struct dc *dc, -struct link_training_settings *lt_settings) +struct link_training_settings *lt_settings, +const struct dc_link *link) {struct core_dc *core_dc =DC_TO_CORE (dc);int i; -for (i =0 ; i < core_dc->link_count; i++) -dc_link_dp_set_drive_settings (&core_dc->links[i]->public, - lt_settings); +for (i =0 ; i < core_dc->link_count; i++) { +if (&core_dc->links[i]->public == link) +break ; + } + +if (i >= core_dc->link_count) +ASSERT_CRITICAL (false); + +dc_link_dp_set_drive_settings (&core_dc->links[i]->public, lt_settings); } static void perform_link_training(struct dc *dc,
drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c +5 -4
@@ -229,10 +229,9 @@ void dp_retrain_link_dp_test(struct core_link *link, link->link_enc, SIGNAL_TYPE_DISPLAY_PORT); -/* Clear current link setting. -* memset(&link->public.cur_link_settings, 0, -* sizeof(link->public.cur_link_settings)); -*/ +/* Clear current link setting. */ +memset (&link->public.cur_link_settings,0 , +sizeof (link->public.cur_link_settings)); link->link_enc->funcs->enable_dp_output( link->link_enc,
@@ -246,6 +245,8 @@ void dp_retrain_link_dp_test(struct core_link *link, link_setting, skip_video_pattern); + link->public.cur_link_settings = *link_setting; + link->dc->hwss.unblank_stream (&pipes[i], link_setting); }
drivers/gpu/drm/amd/display/dc/dc.h +2 -1
@@ -112,7 +112,8 @@ struct link_training_settings;struct dc_link_funcs {void (*set_drive_settings)(struct dc *dc, -struct link_training_settings *lt_settings); +struct link_training_settings *lt_settings, +const struct dc_link *link);void (*perform_link_training)(struct dc *dc,struct dc_link_settings *link_setting,bool skip_video_pattern);
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c +1 -1
@@ -1363,7 +1363,7 @@ void dce110_link_encoder_dp_set_lane_settings( cntl.pixel_clock = link_settings->link_settings.link_rate *LINK_RATE_REF_FREQ_IN_KHZ ; -for (lane =0 ; lane < link_settings->link_settings.lane_count; ++lane) { +for (lane =0 ; lane < link_settings->link_settings.lane_count; lane++) {/* translate lane settings */ training_lane_set.bits.VOLTAGE_SWING_SET =
Signature · 6 lines
2.9.3 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx