drm/msm/dp: Add DP compliance tests on Snapdragon Chipsets
PATCH 1/1 drm/msm/dp: Add DP compliance tests on Snapdragon Chipsets
add event thread to execute events serially from event queue. Also timeout mode is supported which allow an event be deferred to be executed at later time. Both link and phy compliant tests had been done successfully.
This change depends-on following series:
https://lore.kernel.org/dri-devel/[email protected]/
--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 12 +- drivers/gpu/drm/msm/dp/dp_aux.c | 4 + drivers/gpu/drm/msm/dp/dp_aux.h | 1 + drivers/gpu/drm/msm/dp/dp_catalog.c | 78 ++- drivers/gpu/drm/msm/dp/dp_ctrl.c | 361 +++++++---- drivers/gpu/drm/msm/dp/dp_ctrl.h | 3 +- drivers/gpu/drm/msm/dp/dp_display.c | 654 +++++++++++++------- drivers/gpu/drm/msm/dp/dp_hpd.c | 2 +- drivers/gpu/drm/msm/dp/dp_hpd.h | 1 + drivers/gpu/drm/msm/dp/dp_link.c | 22 +- drivers/gpu/drm/msm/dp/dp_panel.c | 56 +- drivers/gpu/drm/msm/dp/dp_panel.h | 10 +- drivers/gpu/drm/msm/dp/dp_parser.c | 45 +- drivers/gpu/drm/msm/dp/dp_parser.h | 2 + drivers/gpu/drm/msm/dp/dp_power.c | 32 +- drivers/gpu/drm/msm/dp/dp_power.h | 1 + drivers/gpu/drm/msm/dp/dp_reg.h | 1 + 17 files changed, 861 insertions(+), 424 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +5 -7
@@ -1183,13 +1183,6 @@ static void dpu_encoder_virt_disable(struct drm_encoder *drm_enc) dpu_kms =to_dpu_kms (priv->kms); global_state =dpu_kms_get_existing_global_state (dpu_kms); -if (drm_enc->encoder_type ==DRM_MODE_ENCODER_TMDS && priv->dp) { -if (msm_dp_display_disable (priv->dp, drm_enc)) { -DPU_ERROR_ENC (dpu_enc,"dp display disable failed\n" ); -return ; - } - } -trace_dpu_enc_disable (DRMID (drm_enc));/* wait for idle */
@@ -1220,6 +1213,11 @@ static void dpu_encoder_virt_disable(struct drm_encoder *drm_enc)dpu_rm_release (global_state, drm_enc); +if (drm_enc->encoder_type ==DRM_MODE_ENCODER_TMDS && priv->dp) { +if (msm_dp_display_disable (priv->dp, drm_enc)) +DPU_ERROR_ENC (dpu_enc,"dp display disable failed\n" ); + } +mutex_unlock (&dpu_enc->enc_lock); }
drivers/gpu/drm/msm/dp/dp_aux.c +4 -0
@@ -189,6 +189,8 @@ static void dp_aux_native_handler(struct dp_aux_private *aux) aux->aux_error_num =DP_AUX_ERR_TOUT ;if (isr &DP_INTR_NACK_DEFER ) aux->aux_error_num =DP_AUX_ERR_NACK ; +if (isr &DP_INTR_AUX_ERROR ) + aux->aux_error_num =DP_AUX_ERR_DPPHY_AUX ;complete (&aux->comp); }
@@ -359,6 +361,8 @@ static ssize_t dp_aux_transfer(struct drm_dp_aux *dp_aux, PHY_AUX_CFG1);dp_catalog_aux_reset (aux->catalog); } +if (aux->aux_error_num ==DP_AUX_ERR_DPPHY_AUX ) +usleep_range (400 ,400 );/* need 400us before next try */ goto unlock_exit; }
drivers/gpu/drm/msm/dp/dp_aux.h +1 -0
@@ -15,6 +15,7 @@#define DP_AUX_ERR_NACK -3#define DP_AUX_ERR_DEFER -4#define DP_AUX_ERR_NACK_DEFER -5 +#define DP_AUX_ERR_DPPHY_AUX -6int dp_aux_register (struct drm_dp_aux *dp_aux);void dp_aux_unregister (struct drm_dp_aux *dp_aux);
drivers/gpu/drm/msm/dp/dp_catalog.c +52 -26
128 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_ctrl.c +255 -106
659 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_ctrl.h +2 -1
@@ -21,7 +21,8 @@ struct dp_ctrl {int dp_ctrl_host_init (struct dp_ctrl *dp_ctrl,bool flip);void dp_ctrl_host_deinit (struct dp_ctrl *dp_ctrl); -int dp_ctrl_on (struct dp_ctrl *dp_ctrl); +int dp_ctrl_on_link (struct dp_ctrl *dp_ctrl); +int dp_ctrl_on_stream (struct dp_ctrl *dp_ctrl);int dp_ctrl_off (struct dp_ctrl *dp_ctrl);void dp_ctrl_push_idle (struct dp_ctrl *dp_ctrl);void dp_ctrl_isr (struct dp_ctrl *dp_ctrl);
drivers/gpu/drm/msm/dp/dp_display.c +424 -230
896 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_hpd.c +1 -1
@@ -24,7 +24,7 @@ struct dp_hpd_private {struct dp_usbpd dp_usbpd; }; -static int dp_hpd_connect (struct dp_usbpd *dp_usbpd,bool hpd) +int dp_hpd_connect (struct dp_usbpd *dp_usbpd,bool hpd) {int rc =0 ;struct dp_hpd_private *hpd_priv;
drivers/gpu/drm/msm/dp/dp_hpd.h +1 -0
@@ -75,5 +75,6 @@ struct dp_usbpd *dp_hpd_get(struct device *dev, struct dp_usbpd_cb *cb);int dp_hpd_register (struct dp_usbpd *dp_usbpd);void dp_hpd_unregister (struct dp_usbpd *dp_usbpd); +int dp_hpd_connect (struct dp_usbpd *dp_usbpd,bool hpd);#endif /* _DP_HPD_H_ */
drivers/gpu/drm/msm/dp/dp_link.c +8 -14
@@ -38,7 +38,6 @@ struct dp_link_private {struct dp_link dp_link;struct dp_link_request request; -struct mutex test_response_mutex;struct mutex psm_mutex;u8 link_status[DP_LINK_STATUS_SIZE ]; };
@@ -580,17 +579,18 @@ static int dp_link_parse_phy_test_params(struct dp_link_private *link)return rlen; } - link->dp_link.phy_params.phy_test_pattern_sel = data; + link->dp_link.phy_params.phy_test_pattern_sel = data &0x07 ;DRM_DEBUG_DP ("phy_test_pattern_sel = 0x%x\n" , data);switch (data) { -case DP_LINK_QUAL_PATTERN_DISABLE : -case DP_LINK_QUAL_PATTERN_D10_2 : -case DP_LINK_QUAL_PATTERN_ERROR_RATE : -case DP_LINK_QUAL_PATTERN_PRBS7 : -case DP_LINK_QUAL_PATTERN_80BIT_CUSTOM : -case DP_LINK_QUAL_PATTERN_HBR2_EYE : +case DP_PHY_TEST_PATTERN_NONE : +case DP_PHY_TEST_PATTERN_SEL_MASK : +case DP_PHY_TEST_PATTERN_D10_2 : +case DP_PHY_TEST_PATTERN_ERROR_COUNT : +case DP_PHY_TEST_PATTERN_PRBS7 : +case DP_PHY_TEST_PATTERN_80BIT_CUSTOM : +case DP_PHY_TEST_PATTERN_CP2520 :return 0 ;default :return -EINVAL ;
@@ -661,7 +661,6 @@ static int dp_link_parse_request(struct dp_link_private *link)DRM_DEBUG_DP ("Test:(0x%x) requested\n" , data); link->request.test_requested = data; -if (link->request.test_requested ==DP_TEST_LINK_PHY_TEST_PATTERN ) { ret =dp_link_parse_phy_test_params (link);if (ret)
@@ -788,10 +787,8 @@ bool dp_link_send_test_response(struct dp_link *dp_link) link = container_of(dp_link, struct dp_link_private, dp_link); -mutex_lock (&link->test_response_mutex); ret =drm_dp_dpcd_writeb (link->aux,DP_TEST_RESPONSE , dp_link->test_response); -mutex_unlock (&link->test_response_mutex);return ret ==1 ; }
@@ -1027,11 +1024,9 @@ int dp_link_process_request(struct dp_link *dp_link) link = container_of(dp_link, struct dp_link_private, dp_link); -mutex_lock (&link->test_response_mutex);dp_link_reset_data (link);dp_link_parse_sink_status_field (link); -mutex_unlock (&link->test_response_mutex);if (link->request.test_requested ==DP_TEST_LINK_EDID_READ ) { dp_link->sink_request |=DP_TEST_LINK_EDID_READ ;
@@ -1208,7 +1203,6 @@ struct dp_link *dp_link_get(struct device *dev, struct drm_dp_aux *aux) link->dev = dev; link->aux = aux; -mutex_init (&link->test_response_mutex);mutex_init (&link->psm_mutex); dp_link = &link->dp_link;
drivers/gpu/drm/msm/dp/dp_panel.c +38 -18
102 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_panel.h +7 -3
@@ -14,8 +14,9 @@struct edid ; -#define DP_MAX_DOWNSTREAM_PORTS 0x10 -#define DPRX_EXTENDED_DPCD_FIELD 0x2200 +#define DPRX_EXTENDED_DPCD_FIELD 0x2200 + +#define DP_RECEIVER_EXT_CAP_SIZE 4struct dp_display_mode {struct drm_display_mode drm_mode;
@@ -34,7 +35,10 @@ struct dp_panel_in {struct dp_panel {/* dpcd raw data */ -u8 dpcd[DP_RECEIVER_CAP_SIZE +1 ]; +u8 dpcd[DP_RECEIVER_CAP_SIZE +DP_RECEIVER_EXT_CAP_SIZE +1 ]; +u8 ds_cap_info[DP_MAX_DOWNSTREAM_PORTS ]; +u32 ds_port_cnt; +u32 dfp_present;struct dp_link_info link_info;struct drm_dp_desc desc;
drivers/gpu/drm/msm/dp/dp_parser.c +32 -13
96 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_parser.h +2 -0
@@ -19,6 +19,7 @@enum dp_pm_type {DP_CORE_PM ,DP_CTRL_PM , +DP_STREAM_PM ,DP_PHY_PM ,DP_MAX_PM };
@@ -33,6 +34,7 @@ static inline const char *dp_parser_pm_name(enum dp_pm_type module)switch (module) {case DP_CORE_PM :return "DP_CORE_PM" ;case DP_CTRL_PM :return "DP_CTRL_PM" ; +case DP_STREAM_PM :return "DP_STREAM_PM" ;case DP_PHY_PM :return "DP_PHY_PM" ;default :return "???" ; }
drivers/gpu/drm/msm/dp/dp_power.c +27 -5
@@ -95,11 +95,12 @@ static int dp_power_regulator_init(struct dp_power_private *power)static int dp_power_clk_init (struct dp_power_private *power) {int rc =0 ; -struct dss_module_power *core, *ctrl; +struct dss_module_power *core, *ctrl, *stream;struct device *dev = &power->pdev->dev; core = &power->parser->mp[DP_CORE_PM ]; ctrl = &power->parser->mp[DP_CTRL_PM ]; + stream = &power->parser->mp[DP_STREAM_PM ];if (power->parser->pll && power->parser->pll->get_provider) { rc = power->parser->pll->get_provider(power->parser->pll,
@@ -126,21 +127,33 @@ static int dp_power_clk_init(struct dp_power_private *power)return -ENODEV ; } + rc =msm_dss_get_clk (dev, stream->clk_config, stream->num_clk); +if (rc) { +DRM_ERROR ("failed to get %s clk. err=%d\n" , +dp_parser_pm_name (DP_CTRL_PM ), rc); +msm_dss_put_clk (core->clk_config, core->num_clk); +return -ENODEV ; + } +return 0 ; }static int dp_power_clk_deinit (struct dp_power_private *power) { -struct dss_module_power *core, *ctrl; +struct dss_module_power *core, *ctrl, *stream; core = &power->parser->mp[DP_CORE_PM ]; ctrl = &power->parser->mp[DP_CTRL_PM ]; + stream = &power->parser->mp[DP_STREAM_PM ]; -if (!core || !ctrl) +if (!core || !ctrl || !stream) { +DRM_ERROR ("invalid power_data\n" );return -EINVAL ; + }msm_dss_put_clk (ctrl->clk_config, ctrl->num_clk);msm_dss_put_clk (core->clk_config, core->num_clk); +msm_dss_put_clk (stream->clk_config, stream->num_clk);return 0 ; }
@@ -177,7 +190,8 @@ int dp_power_clk_enable(struct dp_power *dp_power, power = container_of(dp_power, struct dp_power_private, dp_power); mp = &power->parser->mp[pm_type]; -if (pm_type !=DP_CORE_PM && pm_type !=DP_CTRL_PM ) { +if (pm_type !=DP_CORE_PM && pm_type !=DP_CTRL_PM && + pm_type !=DP_STREAM_PM ) {DRM_ERROR ("unsupported power module: %s\n" ,dp_parser_pm_name (pm_type));return -EINVAL ;
@@ -194,6 +208,11 @@ int dp_power_clk_enable(struct dp_power *dp_power,return 0 ; } +if (pm_type ==DP_STREAM_PM && dp_power->stream_clks_on) { +DRM_DEBUG_DP ("pixel clks already enabled\n" ); +return 0 ; + } +if ((pm_type ==DP_CTRL_PM ) && (!dp_power->core_clks_on)) {DRM_DEBUG_DP ("Enable core clks before link clks\n" );
@@ -217,13 +236,16 @@ int dp_power_clk_enable(struct dp_power *dp_power,if (pm_type ==DP_CORE_PM ) dp_power->core_clks_on = enable; +else if (pm_type ==DP_STREAM_PM ) + dp_power->stream_clks_on = enable;else dp_power->link_clks_on = enable;DRM_DEBUG_DP ("%s clocks for %s\n" , enable ?"enable" :"disable" ,dp_parser_pm_name (pm_type)); -DRM_DEBUG_DP ("link_clks:%s core_clks:%s\n" , +DRM_DEBUG_DP ("strem_clks:%s link_clks:%s core_clks:%s\n" , + dp_power->stream_clks_on ?"on" :"off" , dp_power->link_clks_on ?"on" :"off" , dp_power->core_clks_on ?"on" :"off" );
drivers/gpu/drm/msm/dp/dp_power.h +1 -0
@@ -19,6 +19,7 @@struct dp_power {bool core_clks_on;bool link_clks_on; +bool stream_clks_on; };/**
drivers/gpu/drm/msm/dp/dp_reg.h +1 -0
@@ -101,6 +101,7 @@#define REG_DP_MAINLINK_CTRL (0x00000000)#define DP_MAINLINK_CTRL_ENABLE (0x00000001)#define DP_MAINLINK_CTRL_RESET (0x00000002) +#define DP_MAINLINK_CTRL_SW_BYPASS_SCRAMBLER (0x00000010)#define DP_MAINLINK_FB_BOUNDARY_SEL (0x02000000)#define REG_DP_STATE_CTRL (0x00000004)
base-commit: 0a19b068acc47d05212f03e494381926dc0381e2
prerequisite-patch-id: 8058026a54241aa728a91dd1685419afb249959e
prerequisite-patch-id: ed730eb83f84501579332a0f0ab98f7ef649e868
prerequisite-patch-id: 0f8ca45d012f041f0fd24dd1066d42c890924896
prerequisite-patch-id: aa650e8353e003be0075deea0dee92a82e321432
prerequisite-patch-id: df8743ddc813a1bb0cfe0d318ce77b8735d3b72d
prerequisite-patch-id: 428c283413802eefee3a74244fea7d27db9322a8
prerequisite-patch-id: ac467cb99ea60ee186ab9bbe47a3e4d9c13a1313
prerequisite-patch-id: 4eff0531912abbfa748181e90baffba9eb52e295
prerequisite-patch-id: 1550cc117fdb0f33c93815cd07e5d5a82ac62be6
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Quoting Kuogee Hsieh (2020-07-07 11:41:25)
Quoted 8 lines
add event thread to execute events serially from event queue. Also timeout mode is supported which allow an event be deferred to be executed at later time. Both link and phy compliant tests had been done successfully.
This change depends-on following series:
https://lore.kernel.org/dri-devel/[email protected]/
Can this be sent along with that series?
Quoted 12 lines
Signed-off-by Kuogee Hsieh <[email protected]>--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 12 +- drivers/gpu/drm/msm/dp/dp_aux.c | 4 + drivers/gpu/drm/msm/dp/dp_aux.h | 1 + drivers/gpu/drm/msm/dp/dp_catalog.c | 78 ++- drivers/gpu/drm/msm/dp/dp_ctrl.c | 361 +++++++---- drivers/gpu/drm/msm/dp/dp_ctrl.h | 3 +- drivers/gpu/drm/msm/dp/dp_display.c | 654 +++++++++++++------- drivers/gpu/drm/msm/dp/dp_hpd.c | 2 +- drivers/gpu/drm/msm/dp/dp_hpd.h | 1 + drivers/gpu/drm/msm/dp/dp_link.c | 22 +-
Quoted 8 lines
drivers/gpu/drm/msm/dp/dp_panel.c | 56 +- drivers/gpu/drm/msm/dp/dp_panel.h | 10 +- drivers/gpu/drm/msm/dp/dp_parser.c | 45 +- drivers/gpu/drm/msm/dp/dp_parser.h | 2 + drivers/gpu/drm/msm/dp/dp_power.c | 32 +- drivers/gpu/drm/msm/dp/dp_power.h | 1 + drivers/gpu/drm/msm/dp/dp_reg.h | 1 + 17 files changed, 861 insertions(+), 424 deletions(-)
It seems to spread various changes throughout the DP bits and only has a short description about what's changing. Given that the series above isn't merged it would be better to get rid of this change and make the changes in the patches that introduce these files.
Quoted 45 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +5
-7@@ -1183,13 +1183,6 @@ static void dpu_encoder_virt_disable(struct drm_encoder *drm_enc) dpu_kms =to_dpu_kms (priv->kms); global_state =dpu_kms_get_existing_global_state (dpu_kms); -if (drm_enc->encoder_type ==DRM_MODE_ENCODER_TMDS && priv->dp) { -if (msm_dp_display_disable (priv->dp, drm_enc)) { -DPU_ERROR_ENC (dpu_enc,"dp display disable failed\n" ); -return ; - } - } -trace_dpu_enc_disable (DRMID (drm_enc));/* wait for idle */ @@ -1220,6 +1213,11 @@ static void dpu_encoder_virt_disable(struct drm_encoder *drm_enc)dpu_rm_release (global_state, drm_enc); +if (drm_enc->encoder_type ==DRM_MODE_ENCODER_TMDS && priv->dp) { +if (msm_dp_display_disable (priv->dp, drm_enc)) +DPU_ERROR_ENC (dpu_enc,"dp display disable failed\n" ); + } +mutex_unlock (&dpu_enc->enc_lock); }drivers/gpu/drm/msm/dp/dp_aux.c +2
-0@@ -189,6 +189,8 @@ static void dp_aux_native_handler(struct dp_aux_private *aux) aux->aux_error_num =DP_AUX_ERR_TOUT ;if (isr &DP_INTR_NACK_DEFER ) aux->aux_error_num =DP_AUX_ERR_NACK ; +if (isr &DP_INTR_AUX_ERROR ) + aux->aux_error_num =DP_AUX_ERR_DPPHY_AUX ;complete (&aux->comp); }
drivers/gpu/drm/msm/dp/dp_aux.c static ssize_t dp_aux_transfer(struct drm_dp_aux *dp_aux, · line 365
Quoted 5 lines
drivers/gpu/drm/msm/dp/dp_aux.c +2
-0@@ -359,6 +361,8 @@ static ssize_t dp_aux_transfer(struct drm_dp_aux *dp_aux, PHY_AUX_CFG1);dp_catalog_aux_reset (aux->catalog); } +if (aux->aux_error_num ==DP_AUX_ERR_DPPHY_AUX ) +usleep_range (400 ,400 );/* need 400us before next try */
Typically usleep_range() should be a range, and not the same number for both ends of the range.
drivers/gpu/drm/msm/dp/dp_catalog.c void dp_catalog_aux_setup(struct dp_catalog *dp_catalog) · line 455
Quoted 12 lines
drivers/gpu/drm/msm/dp/dp_aux.c +0
-0goto unlock_exit; }drivers/gpu/drm/msm/dp/dp_catalog.c +0
-1@@ -452,7 +452,6 @@ void dp_catalog_aux_setup(struct dp_catalog *dp_catalog)dp_write_phy (catalog,REG_DP_PHY_PD_CTL ,DP_PHY_PD_CTL_PSR_PWRDN );/* Make sure that hardware is done with PSR power down */ -wmb ();
Is that comment above now not needed?
Quoted 160 lines
drivers/gpu/drm/msm/dp/dp_catalog.c +0
-0dp_write_phy (catalog,REG_DP_PHY_PD_CTL ,DP_PHY_PD_CTL_PWRDN |DP_PHY_PD_CTL_AUX_PWRDN |DP_PHY_PD_CTL_LANE_0_1_PWRDN | DP_PHY_PD_CTL_LANE_2_3_PWRDN | DP_PHY_PD_CTL_PLL_PWRDNdrivers/gpu/drm/msm/dp/dp_ctrl.c +36
-15@@ -26,6 +26,13 @@#define MR_LINK_SYMBOL_ERM 0x80#define MR_LINK_PRBS7 0x100#define MR_LINK_CUSTOM80 0x200 +#define MR_LINK_TRAINING4 0x40 + +enum { +DP_TRAINING_NONE , +DP_TRAINING_1 , +DP_TRAINING_2 , +};struct dp_tu_calc_input {u64 lclk;/* 162, 270, 540 and 810 */ @@ -58,7 +65,6 @@ struct dp_vc_tu_mapping_table {struct dp_ctrl_private {struct dp_ctrl dp_ctrl; -struct device *dev;struct drm_dp_aux *aux;struct dp_panel *panel;@@ -68,10 +74,16 @@ struct dp_ctrl_private {struct dp_catalog *catalog;struct completion idle_comp; -struct mutex push_idle_mutex;struct completion video_comp; }; +struct dp_cr_status { +u8 lane_0_1; +u8 lane_2_3; +}; + +#define DP_LANE0_1_CR_DONE 0x11 +static int dp_aux_link_configure (struct drm_dp_aux *aux,struct dp_link_info *link) {@@ -97,8 +109,6 @@ void dp_ctrl_push_idle(struct dp_ctrl *dp_ctrl) ctrl = container_of(dp_ctrl, struct dp_ctrl_private, dp_ctrl); -mutex_lock (&ctrl->push_idle_mutex); -reinit_completion (&ctrl->idle_comp);dp_catalog_ctrl_state_ctrl (ctrl->catalog,DP_STATE_CTRL_PUSH_IDLE );@@ -106,7 +116,6 @@ void dp_ctrl_push_idle(struct dp_ctrl *dp_ctrl) IDLE_PATTERN_COMPLETION_TIMEOUT_JIFFIES)) pr_warn("PUSH_IDLE pattern timedout\n"); -mutex_unlock (&ctrl->push_idle_mutex);pr_debug ("mainlink off done\n" ); }@@ -985,7 +994,7 @@ static int dp_ctrl_wait4video_ready(struct dp_ctrl_private *ctrl)if (!wait_for_completion_timeout (&ctrl->video_comp,WAIT_FOR_VIDEO_READY_TIMEOUT_JIFFIES )) { -DRM_ERROR ("Link Train timedout\n" ); +DRM_ERROR ("wait4video timedout\n" ); ret = -ETIMEDOUT ; }return ret;@@ -1006,13 +1015,13 @@ static int dp_ctrl_update_vx_px(struct dp_ctrl_private *ctrl)if (ret)return ret; -if (voltage_swing_level >DP_TRAIN_VOLTAGE_SWING_MAX ) { +if (voltage_swing_level >=DP_TRAIN_VOLTAGE_SWING_MAX ) {DRM_DEBUG_DP ("max. voltage swing level reached %d\n" , voltage_swing_level); max_level_reached |=DP_TRAIN_MAX_SWING_REACHED ; } -if (pre_emphasis_level ==DP_TRAIN_PRE_EMPHASIS_MAX ) { +if (pre_emphasis_level >=DP_TRAIN_PRE_EMPHASIS_MAX ) {DRM_DEBUG_DP ("max. pre-emphasis level reached %d\n" , pre_emphasis_level); max_level_reached |=DP_TRAIN_MAX_PRE_EMPHASIS_REACHED ;@@ -1044,8 +1053,11 @@ static bool dp_ctrl_train_pattern_set(struct dp_ctrl_private *ctrl,DRM_DEBUG_DP ("sink: pattern=%x\n" , pattern); buf = pattern; - ret =drm_dp_dpcd_writeb (ctrl->aux, -DP_TRAINING_PATTERN_SET , buf); + +if (pattern && pattern !=DP_TRAINING_PATTERN_4 ) + buf |=DP_LINK_SCRAMBLING_DISABLE ; + + ret =drm_dp_dpcd_writeb (ctrl->aux,DP_TRAINING_PATTERN_SET , buf);return ret ==1 ; }@@ -1071,19 +1083,23 @@ static int dp_ctrl_read_link_status(struct dp_ctrl_private *ctrl,return -ETIMEDOUT ; } -static int dp_ctrl_link_train_1 (struct dp_ctrl_private *ctrl) +static int dp_ctrl_link_train_1 (struct dp_ctrl_private *ctrl, +struct dp_cr_status *cr,int *training_step) {int tries, old_v_level, ret =0 ;u8 link_status[DP_LINK_STATUS_SIZE ]; -int const maximum_retries =5 ; +int const maximum_retries =4 ;dp_catalog_ctrl_state_ctrl (ctrl->catalog,0 ); + *training_step =DP_TRAINING_1 ; + ret =dp_catalog_ctrl_set_pattern (ctrl->catalog,DP_TRAINING_PATTERN_1 );if (ret)return ret;dp_ctrl_train_pattern_set (ctrl,DP_TRAINING_PATTERN_1 |DP_LINK_SCRAMBLING_DISABLE ); + ret =dp_ctrl_update_vx_px (ctrl);if (ret)return ret;@@ -1097,12 +1113,15 @@ static int dp_ctrl_link_train_1(struct dp_ctrl_private *ctrl)if (ret)return ret; + cr->lane_0_1 = link_status[0 ]; + cr->lane_2_3 = link_status[1 ]; +if (drm_dp_clock_recovery_ok (link_status, ctrl->link->link_params.num_lanes)) { -return ret; +return 0 ; } -if (ctrl->link->phy_params.v_level > +if (ctrl->link->phy_params.v_level >=DP_TRAIN_VOLTAGE_SWING_MAX ) {DRM_ERROR_RATELIMITED ("max v_level reached\n" );return -EAGAIN ;@@ -1125,8 +1144,10 @@ static int dp_ctrl_link_train_1(struct dp_ctrl_private *ctrl)return -ETIMEDOUT ; } -static void dp_ctrl_link_rate_down_shift (struct dp_ctrl_private *ctrl) +static int dp_ctrl_link_rate_down_shift (struct dp_ctrl_private *ctrl) { +int ret =0 ; +switch (ctrl->link->link_params.rate) {case 810000 : ctrl->link->link_params.rate =540000 ;
drivers/gpu/drm/msm/dp/dp_ctrl.c static void dp_ctrl_link_rate_down_shift(struct dp_ctrl_private *ctrl) · line 1163
Quoted 9 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +3
-1@@ -1135,13 +1156,32 @@ static void dp_ctrl_link_rate_down_shift(struct dp_ctrl_private *ctrl) ctrl->link->link_params.rate =270000 ;break ;case 270000 : + ctrl->link->link_params.rate =162000 ; +break ;case 162000 :default : - ctrl->link->link_params.rate =162000 ; + ret =-1 ;
Use a real error code instead of -1?
drivers/gpu/drm/msm/dp/dp_ctrl.c static void dp_ctrl_link_rate_down_shift(struct dp_ctrl_private *ctrl) · line 1167
Quoted 4 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +0
-0break ; };DRM_DEBUG_DP ("new rate=0x%x\n" , ctrl->link->link_params.rate);
Maybe this should be under a condition like if (!ret)?
Quoted 15 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +6
-1+ +return ret; +} +static void dp_ctrl_clear_training_pattern (struct dp_ctrl_private *ctrl)@@ -1214,18 +1260,20 @@ static int dp_ctrl_link_train(struct dp_ctrl_private *ctrl)drm_dp_dpcd_write (ctrl->aux,DP_MAIN_LINK_CHANNEL_CODING_SET , &encoding,1 ); - ret =dp_ctrl_link_train_1 (ctrl); + ret =dp_ctrl_link_train_1 (ctrl, cr, training_step);if (ret) {DRM_ERROR ("link training #1 failed. ret=%d\n" , ret); + ret = -EAGAIN ; goto end;
drivers/gpu/drm/msm/dp/dp_ctrl.c static int dp_ctrl_link_train(struct dp_ctrl_private *ctrl) · line 1276
Quoted 10 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +2
-1}/* print success info as this is a result of user initiated action */ DRM_DEBUG_DP ("link training #1 successful\n" ); - ret =dp_ctrl_link_training_2 (ctrl); + ret =dp_ctrl_link_train_2 (ctrl, cr, training_step);if (ret) {DRM_ERROR ("link training #2 failed. ret=%d\n" , ret); + ret = -EAGAIN ;
Why override ret?
Quoted 241 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +65
-70goto end; }@@ -1235,58 +1283,36 @@ static int dp_ctrl_link_train(struct dp_ctrl_private *ctrl) -static int dp_ctrl_setup_main_link (struct dp_ctrl_private *ctrl,bool train) +static int dp_ctrl_setup_main_link (struct dp_ctrl_private *ctrl, +struct dp_cr_status *cr,int *training_step) { -bool mainlink_ready = false;int ret =0 ;dp_catalog_ctrl_mainlink_ctrl (ctrl->catalog, true); - ret =dp_link_psm_config (ctrl->link, &ctrl->panel->link_info, false); -if (ret) -return ret; -if (ctrl->link->sink_request &DP_TEST_LINK_PHY_TEST_PATTERN )return ret; -if (train) { -/* -* As part of previous calls, DP controller state might have -* transitioned to PUSH_IDLE. In order to start transmitting -* a link training pattern, we have to first do soft reset. -*/ -dp_catalog_ctrl_reset (ctrl->catalog); - - ret =dp_ctrl_link_train (ctrl); -if (ret) -return ret; - } -/* -* Set up transfer unit values and set controller state to send -* video. +* As part of previous calls, DP controller state might have +* transitioned to PUSH_IDLE. In order to start transmitting +* a link training pattern, we have to first do soft reset. */ -dp_ctrl_setup_tr_unit (ctrl); -dp_catalog_ctrl_state_ctrl (ctrl->catalog,DP_STATE_CTRL_SEND_VIDEO ); +dp_catalog_ctrl_reset (ctrl->catalog); - ret =dp_ctrl_wait4video_ready (ctrl); -if (ret) -return ret; + ret =dp_ctrl_link_train (ctrl, cr, training_step); - mainlink_ready =dp_catalog_ctrl_mainlink_ready (ctrl->catalog); -DRM_DEBUG_DP ("mainlink %s\n" , mainlink_ready ?"READY" :"NOT READY" );return ret; }static void dp_ctrl_set_clock_rate (struct dp_ctrl_private *ctrl, -char *name,u32 rate) +enum dp_pm_type module,char *name,u32 rate) { -u32 num = ctrl->parser->mp[DP_CTRL_PM ].num_clk; -struct dss_clk *cfg = ctrl->parser->mp[DP_CTRL_PM ].clk_config; +u32 num = ctrl->parser->mp[module].num_clk; +struct dss_clk *cfg = ctrl->parser->mp[module].clk_config;while (num &&strcmp (cfg->clk_name, name)) { num--;@@ -1308,16 +1334,33 @@ static int dp_ctrl_enable_mainlink_clocks(struct dp_ctrl_private *ctrl)dp_power_set_link_clk_parent (ctrl->power); -dp_ctrl_set_clock_rate (ctrl,"ctrl_link" , +dp_ctrl_set_clock_rate (ctrl,DP_CTRL_PM ,"ctrl_link" , ctrl->link->link_params.rate); -dp_ctrl_set_clock_rate (ctrl,"stream_pixel" , - ctrl->dp_ctrl.pixel_rate); - ret =dp_power_clk_enable (ctrl->power,DP_CTRL_PM , true);if (ret)DRM_ERROR ("Unable to start link clocks. ret=%d\n" , ret); +DRM_DEBUG_DP ("link rate=%d pixel_clk=%d\n" , + ctrl->link->link_params.rate, ctrl->dp_ctrl.pixel_rate); + +return ret; +} + +static int dp_ctrl_enable_stream_clocks (struct dp_ctrl_private *ctrl) +{ +int ret =0 ; + +dp_ctrl_set_clock_rate (ctrl,DP_STREAM_PM ,"stream_pixel" , + ctrl->dp_ctrl.pixel_rate); + + ret =dp_power_clk_enable (ctrl->power,DP_STREAM_PM , true); +if (ret) +DRM_ERROR ("Unabled to start pixel clocks. ret=%d\n" , ret); + +DRM_DEBUG_DP ("link rate=%d pixel_clk=%d\n" , + ctrl->link->link_params.rate, ctrl->dp_ctrl.pixel_rate); +return ret; }@@ -1407,37 +1450,30 @@ static int dp_ctrl_reinitialize_mainlink(struct dp_ctrl_private *ctrl)return ret; } -dp_ctrl_configure_source_params (ctrl); -dp_catalog_ctrl_config_msa (ctrl->catalog, - ctrl->link->link_params.rate, - ctrl->dp_ctrl.pixel_rate,dp_ctrl_use_fixed_nvid (ctrl)); -reinit_completion (&ctrl->idle_comp); -return ret; }static int dp_ctrl_link_maintenance (struct dp_ctrl_private *ctrl) {int ret =0 ; -int tries; +struct dp_cr_status cr; +int training_step =DP_TRAINING_NONE ;dp_ctrl_push_idle (&ctrl->dp_ctrl);dp_catalog_ctrl_reset (ctrl->catalog); ctrl->dp_ctrl.pixel_rate = ctrl->panel->dp_mode.drm_mode.clock; -for (tries =0 ; tries <10 ; tries++) { - ret =dp_ctrl_reinitialize_mainlink (ctrl); -if (ret) { -DRM_ERROR ("Failed to reinitialize mainlink. ret=%d\n" , - ret); -break ; - } + ret =dp_ctrl_setup_main_link (ctrl, &cr, &training_step); +if (ret) + goto end; - ret =dp_ctrl_setup_main_link (ctrl, true); -if (ret == -EAGAIN )/* try with lower link rate */ -dp_ctrl_link_rate_down_shift (ctrl); - } +dp_ctrl_clear_training_pattern (ctrl); + +dp_catalog_ctrl_state_ctrl (ctrl->catalog,DP_STATE_CTRL_SEND_VIDEO ); + + ret =dp_ctrl_wait4video_ready (ctrl); +end:return ret; }@@ -1450,22 +1486,22 @@ static int dp_ctrl_process_phy_test_request(struct dp_ctrl_private *ctrl)return ret; } -dp_ctrl_push_idle (&ctrl->dp_ctrl);/* * The global reset will need DP link related clocks to be * running. Add the global reset just before disabling the * link clocks and core clocks. */ -dp_catalog_ctrl_reset (ctrl->catalog); ret =dp_ctrl_off (&ctrl->dp_ctrl);if (ret) {DRM_ERROR ("failed to disable DP controller\n" );return ret; } - ret =dp_ctrl_on (&ctrl->dp_ctrl); -if (ret) -DRM_ERROR ("failed to enable DP controller\n" ); + ret =dp_ctrl_on_link (&ctrl->dp_ctrl); +if (!ret) + ret =dp_ctrl_on_stream (&ctrl->dp_ctrl); +else +DRM_ERROR ("failed to enable DP link controller\n" );return ret; }@@ -1485,27 +1521,33 @@ static bool dp_ctrl_send_phy_test_pattern(struct dp_ctrl_private *ctrl)return false; }dp_catalog_ctrl_send_phy_pattern (ctrl->catalog, pattern_requested); +dp_ctrl_update_vx_px (ctrl);dp_link_send_test_response (ctrl->link); pattern_sent =dp_catalog_ctrl_read_phy_pattern (ctrl->catalog);switch (pattern_sent) {case MR_LINK_TRAINING1 : - success = pattern_requested == -DP_LINK_QUAL_PATTERN_D10_2 ; + success = (pattern_requested == +DP_PHY_TEST_PATTERN_D10_2 );break ;case MR_LINK_SYMBOL_ERM : - success = (pattern_requested == -DP_LINK_QUAL_PATTERN_ERROR_RATE ) - || (pattern_requested == -DP_LINK_QUAL_PATTERN_HBR2_EYE ); + success = ((pattern_requested == +DP_PHY_TEST_PATTERN_ERROR_COUNT ) || + (pattern_requested == +DP_PHY_TEST_PATTERN_CP2520 ));break ;case MR_LINK_PRBS7 : - success = pattern_requested ==DP_LINK_QUAL_PATTERN_PRBS7 ; + success = (pattern_requested == +DP_PHY_TEST_PATTERN_PRBS7 );break ;case MR_LINK_CUSTOM80 : - success = pattern_requested == -DP_LINK_QUAL_PATTERN_80BIT_CUSTOM ; + success = (pattern_requested == +DP_PHY_TEST_PATTERN_80BIT_CUSTOM ); +break ; +case MR_LINK_TRAINING4 : + success = (pattern_requested == +DP_PHY_TEST_PATTERN_SEL_MASK );break ;default : success = false;@@ -1537,12 +1579,12 @@ void dp_ctrl_handle_sink_request(struct dp_ctrl *dp_ctrl) } } -if (sink_request &DP_LINK_STATUS_UPDATED ) +if (sink_request &DP_LINK_STATUS_UPDATED ) {if (dp_ctrl_link_maintenance (ctrl)) { -DRM_ERROR ("LM failed: STATUS_UPDATED\n" ); +DRM_ERROR ("LM failed: TEST_LINK_TRAINING\n" );return ; } - + }if (sink_request &DP_TEST_LINK_TRAINING ) {dp_link_send_test_response (ctrl->link);@@ -1553,13 +1595,15 @@ void dp_ctrl_handle_sink_request(struct dp_ctrl *dp_ctrl) }
drivers/gpu/drm/msm/dp/dp_ctrl.c void dp_ctrl_handle_sink_request(struct dp_ctrl *dp_ctrl) · line 1603
Quoted 10 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +2
-2} -int dp_ctrl_on (struct dp_ctrl *dp_ctrl) +int dp_ctrl_on_link (struct dp_ctrl *dp_ctrl) {int rc =0 ;struct dp_ctrl_private *ctrl;u32 rate =0 ; -u32 link_train_max_retries =10 ; +u32 link_train_max_retries =5 ;
Any reason these variables are u32 instead of unsigned int? Does the size of the variable matter if we're counting things?
drivers/gpu/drm/msm/dp/dp_ctrl.c void dp_ctrl_handle_sink_request(struct dp_ctrl *dp_ctrl) · line 1606
Quoted 3 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +2
-0u32 const phy_cts_pixel_clk_khz =148500 ; +struct dp_cr_status cr; +int training_step;
Any reason to be int vs unsigned int?
Quoted 11 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +2
-2if (!dp_ctrl)return -EINVAL ;@@ -1601,16 +1648,115 @@ int dp_ctrl_on(struct dp_ctrl *dp_ctrl) rc);break ; } - rc =dp_ctrl_setup_main_link (ctrl, true); -if (!rc) + + training_step =DP_TRAINING_NONE ;
drivers/gpu/drm/msm/dp/dp_ctrl.c int dp_ctrl_on(struct dp_ctrl *dp_ctrl) · line 1660
Quoted 10 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +7
-2+ rc =dp_ctrl_setup_main_link (ctrl, &cr, &training_step); +if (rc ==0 ) { +/* training completed successfully */ break ; -/* try with lower link rate */ -dp_ctrl_link_rate_down_shift (ctrl); + }else if (training_step ==DP_TRAINING_1 ) { +/* link train_1 failed */ + rc =dp_ctrl_link_rate_down_shift (ctrl); +if (rc <0 ) {/* alread in RBR = 1.6G */
already?
Quoted 9 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +9
-0+if (cr.lane_0_1 &DP_LANE0_1_CR_DONE ) { +/* +* some lanes are ready, +* reduce lane number +*/ + rc =dp_ctrl_link_lane_down_shift (ctrl); +if (rc <0 ) {/* lane == 1 already */ +/* end with failure */ +break ;
[..]
Quoted 101 lines
drivers/gpu/drm/msm/dp/dp_display.c +93
-0@@ -783,6 +807,182 @@ int dp_display_get_test_bpp(struct msm_dp *dp) dp_display->link->test_video.test_bit_depth); } +static void dp_display_config_hpd (struct dp_display_private *dp) +{ + +dp_display_host_init (dp); +dp_catalog_ctrl_hpd_config (dp->catalog); + +/* Enable interrupt first time +* we are leaving dp clocks on during disconnect +* and never disable interrupt +*/ +enable_irq (dp->irq); +} + +static int hpd_event_thread (void *data) +{ +struct dp_display_private *dp_priv; +unsigned long flag; +struct dp_event *todo; +int timeout_mode =0 ; +int ret; + + dp_priv = (struct dp_display_private *)data; + +while (1 ) { +if (timeout_mode) { + ret =wait_event_timeout (dp_priv->event_q, + (dp_priv->event_pndx == dp_priv->event_gndx), +EVENT_TIMEOUT ); + }else { + ret =wait_event_timeout (dp_priv->event_q, + (dp_priv->event_pndx != dp_priv->event_gndx), +EVENT_TIMEOUT ); + } +spin_lock_irqsave (&dp_priv->event_lock, flag); + todo = &dp_priv->event_list[dp_priv->event_gndx]; +if (todo->delay) { +struct dp_event *todo_next; + + dp_priv->event_gndx++; + dp_priv->event_gndx %=DP_EVENT_Q_MAX ; + +/* re enter delay event into q */ + todo_next = &dp_priv->event_list[dp_priv->event_pndx++]; + dp_priv->event_pndx %=DP_EVENT_Q_MAX ; + todo_next->event_id = todo->event_id; + todo_next->data = todo->data; + todo_next->delay = todo->delay -1 ; + +/* clean up older event */ + todo->event_id =EV_NO_EVENT ; + todo->delay =0 ; + +/* switch to timeout mode */ + timeout_mode =1 ; +spin_unlock_irqrestore (&dp_priv->event_lock, flag); +continue ; + } + +/* timeout with no events in q */ +if (dp_priv->event_pndx == dp_priv->event_gndx) { +spin_unlock_irqrestore (&dp_priv->event_lock, flag); +continue ; + } + + dp_priv->event_gndx++; + dp_priv->event_gndx %=DP_EVENT_Q_MAX ; + timeout_mode =0 ; +spin_unlock_irqrestore (&dp_priv->event_lock, flag); + +switch (todo->event_id) { +case EV_HPD_INIT_SETUP : +dp_display_config_hpd (dp_priv); +break ; +case EV_HPD_PLUG_INT : +dp_hpd_plug_handle (dp_priv, todo->data); +break ; +case EV_HPD_UNPLUG_INT : +dp_hpd_unplug_handle (dp_priv, todo->data); +break ; +case EV_IRQ_HPD_INT : +dp_irq_hpd_handle (dp_priv, todo->data); +break ; +case EV_HPD_REPLUG_INT : +/* do nothing */ +break ; +case EV_USER_NOTIFICATION : +dp_display_send_hpd_notification (dp_priv, + todo->data); +break ; +default : +break ; + } + }
drivers/gpu/drm/msm/dp/dp_display.c int dp_display_get_test_bpp(struct msm_dp *dp) · line 912
Quoted 10 lines
drivers/gpu/drm/msm/dp/dp_display.c +10
-0+ +return 0 ; +} + +static void dp_hpd_event_setup (struct dp_display_private *dp_priv) +{ +init_waitqueue_head (&dp_priv->event_q); +spin_lock_init (&dp_priv->event_lock); + +kthread_run (hpd_event_thread, (void *)dp_priv,"dp_hpd_handler" );
Is the cast necessary?
drivers/gpu/drm/msm/dp/dp_display.c void msm_dp_irq_postinstall(struct msm_dp *dp_display) · line 1075
Quoted 12 lines
drivers/gpu/drm/msm/dp/dp_display.c +6
-2+} +@@ -890,8 +1069,13 @@ void msm_dp_irq_postinstall(struct msm_dp *dp_display) dp = container_of(dp_display, struct dp_display_private, dp_display); -INIT_DELAYED_WORK (&dp->config_hpd_work, dp_display_config_hpd_work); -queue_delayed_work (system_wq, &dp->config_hpd_work,HZ *10 ); +dp_hpd_event_setup (dp); + +/* This hack Delays HPD configuration by 10 sec +* ToDo(User): Implement correct boot sequence of
Typically todo is written "TODO(email@domain)" instead of User.
Quoted 112 lines
drivers/gpu/drm/msm/dp/dp_display.c +25
-12+* HPD configuration and remove this hack +*/ +dp_add_event (dp,EV_HPD_INIT_SETUP ,0 ,100 ); } int msm_dp_modeset_init(struct msm_dp *dp_display, struct drm_device *dev,@@ -938,37 +1122,47 @@ int msm_dp_display_enable(struct msm_dp *dp, struct drm_encoder *encoder)return -EINVAL ; } +mutex_lock (&dp_display->event_mutex); + rc =dp_display_set_mode (dp, &dp_display->dp_mode);if (rc) {DRM_ERROR ("Failed to perform a mode set, rc=%d\n" , rc); +mutex_unlock (&dp_display->event_mutex);return rc; } rc =dp_display_prepare (dp);if (rc) {DRM_ERROR ("DP display prepare failed, rc=%d\n" , rc); +mutex_unlock (&dp_display->event_mutex);return rc; } - rc =dp_display_enable (dp); -if (rc) { -DRM_ERROR ("DP display enable failed, rc=%d\n" , rc); -dp_display_unprepare (dp); -return rc; - } +dp_display_enable (dp_display,0 ); rc =dp_display_post_enable (dp);if (rc) {DRM_ERROR ("DP display post enable failed, rc=%d\n" , rc); -dp_display_disable (dp); +dp_display_disable (dp_display,0 );dp_display_unprepare (dp); } + +/* completed connection */ +atomic_set (&dp_display->hpd_state,ST_CONNECTED ); + +mutex_unlock (&dp_display->event_mutex); +return rc; }int msm_dp_display_disable (struct msm_dp *dp,struct drm_encoder *encoder) {int rc =0 ; +struct dp_display_private *dp_display; + + dp_display = container_of(dp, struct dp_display_private, dp_display); + +mutex_lock (&dp_display->event_mutex); rc =dp_display_pre_disable (dp);if (rc) {@@ -976,16 +1170,16 @@ int msm_dp_display_disable(struct msm_dp *dp, struct drm_encoder *encoder)return rc; } - rc =dp_display_disable (dp); -if (rc) { -DRM_ERROR ("DP display disable failed, rc=%d\n" , rc); -return rc; - } +dp_display_disable (dp_display,0 ); rc =dp_display_unprepare (dp);if (rc)DRM_ERROR ("DP display unprepare failed, rc=%d\n" , rc); +/* completed disconnection */ +atomic_set (&dp_display->hpd_state,ST_DISCONNECTED ); + +mutex_unlock (&dp_display->event_mutex);return rc; }drivers/gpu/drm/msm/dp/dp_hpd.c +1
-1@@ -24,7 +24,7 @@ struct dp_hpd_private {struct dp_usbpd dp_usbpd; }; -static int dp_hpd_connect (struct dp_usbpd *dp_usbpd,bool hpd) +int dp_hpd_connect (struct dp_usbpd *dp_usbpd,bool hpd) {int rc =0 ;struct dp_hpd_private *hpd_priv;drivers/gpu/drm/msm/dp/dp_hpd.h +1
-0@@ -75,5 +75,6 @@ struct dp_usbpd *dp_hpd_get(struct device *dev, struct dp_usbpd_cb *cb);int dp_hpd_register (struct dp_usbpd *dp_usbpd);void dp_hpd_unregister (struct dp_usbpd *dp_usbpd); +int dp_hpd_connect (struct dp_usbpd *dp_usbpd,bool hpd);#endif /* _DP_HPD_H_ */ drivers/gpu/drm/msm/dp/dp_link.c +0
-0
drivers/gpu/drm/msm/dp/dp_link.c static int dp_link_parse_request(struct dp_link_private *link) · line 666
Quoted 7 lines
drivers/gpu/drm/msm/dp/dp_link.c +0
-1@@ -661,7 +661,6 @@ static int dp_link_parse_request(struct dp_link_private *link)DRM_DEBUG_DP ("Test:(0x%x) requested\n" , data); link->request.test_requested = data; -if (link->request.test_requested ==DP_TEST_LINK_PHY_TEST_PATTERN ) { ret =dp_link_parse_phy_test_params (link);if (ret)
Drop this hunk?
Quoted 35 lines · Stephen Boyd
Quoting Kuogee Hsieh (2020-07-07 11:41:25)
Quoted 9 lines
add event thread to execute events serially from event queue. Also timeout mode is supported which allow an event be deferred to be executed at later time. Both link and phy compliant tests had been done successfully.
This change depends-on following series:
Can this be sent along with that series?
Quoted 13 lines
Signed-off-by Kuogee Hsieh <[email protected]>--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 12 +- drivers/gpu/drm/msm/dp/dp_aux.c | 4 + drivers/gpu/drm/msm/dp/dp_aux.h | 1 + drivers/gpu/drm/msm/dp/dp_catalog.c | 78 ++- drivers/gpu/drm/msm/dp/dp_ctrl.c | 361 +++++++---- drivers/gpu/drm/msm/dp/dp_ctrl.h | 3 +- drivers/gpu/drm/msm/dp/dp_display.c | 654 +++++++++++++------- drivers/gpu/drm/msm/dp/dp_hpd.c | 2 +- drivers/gpu/drm/msm/dp/dp_hpd.h | 1 + drivers/gpu/drm/msm/dp/dp_link.c | 22 +-Quoted 8 lines
drivers/gpu/drm/msm/dp/dp_panel.c | 56 +- drivers/gpu/drm/msm/dp/dp_panel.h | 10 +- drivers/gpu/drm/msm/dp/dp_parser.c | 45 +- drivers/gpu/drm/msm/dp/dp_parser.h | 2 + drivers/gpu/drm/msm/dp/dp_power.c | 32 +- drivers/gpu/drm/msm/dp/dp_power.h | 1 + drivers/gpu/drm/msm/dp/dp_reg.h | 1 + 17 files changed, 861 insertions(+), 424 deletions(-)
Quoted 5 lines
It seems to spread various changes throughout the DP bits and only has a short description about what's changing. Given that the series above isn't merged it would be better to get rid of this change and make the changes in the patches that introduce these files.
Yes, the base DP driver is not yet merged as its still in reviews and has been for a while.
While it is being reviewed, different developers are working on different aspects of DP such as base DP driver, DP compliance, audio etc to keep things going in parallel. To maintain the authorship of the different developers, we prefer having them as separate changes and not merge them.
We can make all these changes as part of the same series if that shall help to keep things together but would prefer the changes themselves to be separate. Please consider this and let us know if that works.
Quoted 900 lines
Quoted 58 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +0
-7@@ -1183,13 +1183,6 @@ static void dpu_encoder_virt_disable(struct drm_encoder *drm_enc) dpu_kms =to_dpu_kms (priv->kms); global_state =dpu_kms_get_existing_global_state (dpu_kms); -if (drm_enc->encoder_type ==DRM_MODE_ENCODER_TMDS && priv->dp) { -if (msm_dp_display_disable (priv->dp, drm_enc)) { -DPU_ERROR_ENC (dpu_enc,"dp display disable failed\n"); -return ; - } - } -trace_dpu_enc_disable(DRMID(drm_enc)); /* wait for idle */drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +5
-0@@ -1220,6 +1213,11 @@ static void dpu_encoder_virt_disable(struct drm_encoder *drm_enc)dpu_rm_release (global_state ,drm_enc ); +if (drm_enc->encoder_type ==DRM_MODE_ENCODER_TMDS && priv->dp) { +if (msm_dp_display_disable (priv->dp, drm_enc)) +DPU_ERROR_ENC (dpu_enc,"dp display disable failed\n"); + } +mutex_unlock(&dpu_enc->enc_lock);}
drivers/gpu/drm/msm/dp/dp_aux.c +2
-0@@ -189,6 +189,8 @@ static void dp_aux_native_handler(struct dp_aux_private *aux) aux->aux_error_num = DP_AUX_ERR_TOUT;if (isr &DP_INTR_NACK_DEFER ) aux->aux_error_num =DP_AUX_ERR_NACK ; +if (isr &DP_INTR_AUX_ERROR ) + aux->aux_error_num =DP_AUX_ERR_DPPHY_AUX ;complete (&aux->comp);}
drivers/gpu/drm/msm/dp/dp_aux.c +2
-0@@ -359,6 +361,8 @@ static ssize_t dp_aux_transfer(struct drm_dp_aux *dp_aux, PHY_AUX_CFG1);dp_catalog_aux_reset (aux->catalog); } +if (aux->aux_error_num ==DP_AUX_ERR_DPPHY_AUX ) +usleep_range (400 ,400 );/* need 400us before Quoted 1 line
next try */
Typically
usleep_range()should be a range, and not the same number for both ends of the range.Quoted 8 lines
goto unlock_exit; }drivers/gpu/drm/msm/dp/dp_catalog.c +0
-0drivers/gpu/drm/msm/dp/dp_catalog.c void dp_catalog_aux_setup(struct dp_catalog · line 457
Quoted 6 lines
drivers/gpu/drm/msm/dp/dp_catalog.c +0
-1@@ -452,7 +452,6 @@ void dp_catalog_aux_setup(struct dp_catalog *dp_catalog)dp_write_phy (catalog,REG_DP_PHY_PD_CTL ,DP_PHY_PD_CTL_PSR_PWRDN );/* Make sure that hardware is done with PSR power down */ -wmb ();Is that comment above now not needed?
Quoted 174 lines
drivers/gpu/drm/msm/dp/dp_catalog.c +0
-0dp_write_phy(catalog, REG_DP_PHY_PD_CTL, DP_PHY_PD_CTL_PWRDN |DP_PHY_PD_CTL_AUX_PWRDN | DP_PHY_PD_CTL_LANE_0_1_PWRDN | DP_PHY_PD_CTL_LANE_2_3_PWRDN |
DP_PHY_PD_CTL_PLL_PWRDNdrivers/gpu/drm/msm/dp/dp_ctrl.c +15
-6@@ -26,6 +26,13 @@#define MR_LINK_SYMBOL_ERM 0x80#define MR_LINK_PRBS7 0x100#define MR_LINK_CUSTOM80 0x200 +#define MR_LINK_TRAINING4 0x40 + +enum { +DP_TRAINING_NONE , +DP_TRAINING_1 , +DP_TRAINING_2 , +};struct dp_tu_calc_input {u64 lclk;/* 162, 270, 540 and 810 */ @@ -58,7 +65,6 @@ struct dp_vc_tu_mapping_table {struct dp_ctrl_private {struct dp_ctrl dp_ctrl; -struct device *dev;struct drm_dp_aux *aux;struct dp_panel *panel;@@ -68,10 +74,16 @@ struct dp_ctrl_private {struct dp_catalog *catalog;struct completion idle_comp; -struct mutex push_idle_mutex;struct completion video_comp; }; +struct dp_cr_status { +u8 lane_0_1; +u8 lane_2_3; +}; + +#define DP_LANE0_1_CR_DONE 0x11 +static int dp_aux_link_configure (struct drm_dp_aux *aux,struct dp_link_info *link) {@@ -97,8 +109,6 @@ void dp_ctrl_push_idle(struct dp_ctrl *dp_ctrl) ctrl = container_of(dp_ctrl, struct dp_ctrl_private, dp_ctrl); -mutex_lock (&ctrl->push_idle_mutex); -reinit_completion (&ctrl->idle_comp);dp_catalog_ctrl_state_ctrl (ctrl->catalog,DP_STATE_CTRL_PUSH_IDLE );@@ -106,7 +116,6 @@ void dp_ctrl_push_idle(struct dp_ctrl *dp_ctrl) IDLE_PATTERN_COMPLETION_TIMEOUT_JIFFIES)) pr_warn("PUSH_IDLE pattern timedout\n"); -mutex_unlock (&ctrl->push_idle_mutex);pr_debug ("mainlink off done\n" ); }@@ -985,7 +994,7 @@ static int dp_ctrl_wait4video_ready(struct dp_ctrl_private *ctrl)if (!wait_for_completion_timeout (&ctrl->video_comp,WAIT_FOR_VIDEO_READY_TIMEOUT_JIFFIES )) { -DRM_ERROR ("Link Train timedout\n" ); +DRM_ERROR ("wait4video timedout\n" ); ret = -ETIMEDOUT ;} return ret;drivers/gpu/drm/msm/dp/dp_ctrl.c +2
-2@@ -1006,13 +1015,13 @@ static int dp_ctrl_update_vx_px(struct dp_ctrl_private *ctrl)if (ret)return ret; -if (voltage_swing_level >DP_TRAIN_VOLTAGE_SWING_MAX ) { +if (voltage_swing_level >=DP_TRAIN_VOLTAGE_SWING_MAX ) {DRM_DEBUG_DP ("max. voltage swing level reached %d\n" , voltage_swing_level); max_level_reached |=DP_TRAIN_MAX_SWING_REACHED ; } -if (pre_emphasis_level ==DP_TRAIN_PRE_EMPHASIS_MAX ) { +if (pre_emphasis_level >=DP_TRAIN_PRE_EMPHASIS_MAX ) {DRM_DEBUG_DP ("max. pre-emphasis level reached %d\n" , pre_emphasis_level);max_level_reached |=
DP_TRAIN_MAX_PRE_EMPHASIS_REACHED;drivers/gpu/drm/msm/dp/dp_ctrl.c +5
-2@@ -1044,8 +1053,11 @@ static bool dp_ctrl_train_pattern_set(struct dp_ctrl_private *ctrl,DRM_DEBUG_DP ("sink: pattern=%x\n" , pattern); buf = pattern; - ret =drm_dp_dpcd_writeb (ctrl->aux, -DP_TRAINING_PATTERN_SET , buf); + +if (pattern && pattern !=DP_TRAINING_PATTERN_4 ) + buf |=DP_LINK_SCRAMBLING_DISABLE ; + + ret =drm_dp_dpcd_writeb (ctrl->aux,DP_TRAINING_PATTERN_SET , buf);return ret ==1 ;}
drivers/gpu/drm/msm/dp/dp_ctrl.c +6
-2@@ -1071,19 +1083,23 @@ static int dp_ctrl_read_link_status(struct dp_ctrl_private *ctrl, return -ETIMEDOUT ; } -static int dp_ctrl_link_train_1 (struct dp_ctrl_private *ctrl) +static int dp_ctrl_link_train_1 (struct dp_ctrl_private *ctrl, +struct dp_cr_status *cr,int *training_step) {int tries, old_v_level, ret =0 ;u8 link_status[DP_LINK_STATUS_SIZE ]; -int const maximum_retries =5 ; +int const maximum_retries =4 ;dp_catalog_ctrl_state_ctrl (ctrl->catalog,0 ); + *training_step =DP_TRAINING_1 ; + ret =dp_catalog_ctrl_set_pattern (ctrl->catalog,DP_TRAINING_PATTERN_1 );if (ret)return ret;dp_ctrl_train_pattern_set (ctrl,DP_TRAINING_PATTERN_1 |DP_LINK_SCRAMBLING_DISABLE ); + ret =dp_ctrl_update_vx_px (ctrl);if (ret) return ret;drivers/gpu/drm/msm/dp/dp_ctrl.c +5
-2@@ -1097,12 +1113,15 @@ static int dp_ctrl_link_train_1(struct dp_ctrl_private *ctrl)if (ret)return ret; + cr->lane_0_1 = link_status[0 ]; + cr->lane_2_3 = link_status[1 ]; +if (drm_dp_clock_recovery_ok (link_status, ctrl->link->link_params.num_lanes)) { -return ret; +return 0 ; } -if (ctrl->link->phy_params.v_level > +if (ctrl->link->phy_params.v_level >=DP_TRAIN_VOLTAGE_SWING_MAX ) { DRM_ERROR_RATELIMITED("max v_levelreached\n"); return -EAGAIN;drivers/gpu/drm/msm/dp/dp_ctrl.c +3
-1@@ -1125,8 +1144,10 @@ static int dp_ctrl_link_train_1(struct dp_ctrl_private *ctrl)return -ETIMEDOUT ; } -static void dp_ctrl_link_rate_down_shift (struct dp_ctrl_private *ctrl) +static int dp_ctrl_link_rate_down_shift (struct dp_ctrl_private *ctrl) { +int ret =0 ; +switch (ctrl->link->link_params.rate) {case 810000: ctrl->link->link_params.rate = 540000;drivers/gpu/drm/msm/dp/dp_ctrl.c static void · line 1164
Quoted 10 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +3
-1@@ -1135,13 +1156,32 @@ static void dp_ctrl_link_rate_down_shift(struct dp_ctrl_private *ctrl) ctrl->link->link_params.rate = 270000;break ;case 270000 : + ctrl->link->link_params.rate =162000 ; +break ;case 162000 :default : - ctrl->link->link_params.rate =162000 ; + ret =-1 ;Use a real error code instead of -1?
drivers/gpu/drm/msm/dp/dp_ctrl.c static void dp_ctrl_link_rate_down_shift(struct dp_ctrl_private *ctrl) · line 1167
Quoted 4 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +0
-0break ; };DRM_DEBUG_DP ("new rate=0x%x\n" , ctrl->link->link_params.rate);Maybe this should be under a condition like if (!ret)?
Quoted 23 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +6
-1+ +return ret; +} +static void dp_ctrl_clear_training_pattern (struct dp_ctrl_private *ctrl)@@ -1214,18 +1260,20 @@ static int dp_ctrl_link_train(struct dp_ctrl_private *ctrl) drm_dp_dpcd_write(ctrl->aux, DP_MAIN_LINK_CHANNEL_CODING_SET, &encoding, 1); - ret =dp_ctrl_link_train_1 (ctrl); + ret =dp_ctrl_link_train_1 (ctrl, cr, training_step);if (ret) {DRM_ERROR ("link training #1 failed. ret=%d\n" , ret); + ret = -EAGAIN ; goto end; }/* print success info as this is a result of user initiated action */
DRM_DEBUG_DP("link training #1 successful\n");drivers/gpu/drm/msm/dp/dp_ctrl.c static int dp_ctrl_link_train(struct dp_ctrl_private *ctrl) · line 1276
Quoted 5 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +2
-1- ret =dp_ctrl_link_training_2 (ctrl); + ret =dp_ctrl_link_train_2 (ctrl, cr, training_step);if (ret) {DRM_ERROR ("link training #2 failed. ret=%d\n" , ret); + ret = -EAGAIN ;Why override ret?
Quoted 268 lines
goto end; }drivers/gpu/drm/msm/dp/dp_ctrl.c +2
-9@@ -1235,58 +1283,36 @@ static int dp_ctrl_link_train(struct dp_ctrl_private *ctrl) -static int dp_ctrl_setup_main_link (struct dp_ctrl_private *ctrl,bool train) +static int dp_ctrl_setup_main_link (struct dp_ctrl_private *ctrl, +struct dp_cr_status *cr,int *training_step) { -bool mainlink_ready = false;int ret =0 ;dp_catalog_ctrl_mainlink_ctrl (ctrl->catalog, true); - ret =dp_link_psm_config (ctrl->link, &ctrl->panel->link_info, false); -if (ret) -return ret; -if (ctrl->link->sink_request &DP_TEST_LINK_PHY_TEST_PATTERN )return ret; -if (train) { -/* -* As part of previous calls, DP controller state might have
- * transitioned toPUSH_IDLE. In order to start
transmitting
- * a link training pattern, we have to first do soft
reset.drivers/gpu/drm/msm/dp/dp_ctrl.c +0
-9-*/ -dp_catalog_ctrl_reset (ctrl->catalog); - - ret =dp_ctrl_link_train (ctrl); -if (ret) -return ret; - } -/* -* Set up transfer unit values and set controller state to send
drivers/gpu/drm/msm/dp/dp_ctrl.c +3
-3-* video. +* As part of previous calls, DP controller state might have +* transitioned to PUSH_IDLE. In order to start transmitting +* a link training pattern, we have to first do soft reset. */ -dp_ctrl_setup_tr_unit (ctrl); - dp_catalog_ctrl_state_ctrl(ctrl->catalog,
DP_STATE_CTRL_SEND_VIDEO);drivers/gpu/drm/msm/dp/dp_ctrl.c +2
-4+dp_catalog_ctrl_reset (ctrl->catalog); - ret =dp_ctrl_wait4video_ready (ctrl); -if (ret) -return ret; + ret =dp_ctrl_link_train (ctrl, cr, training_step); - mainlink_ready =
dp_catalog_ctrl_mainlink_ready(ctrl->catalog);
- DRM_DEBUG_DP("mainlink %s\n",mainlink_ready? "READY" : "NOTREADY"); return ret;}
static void dp_ctrl_set_clock_rate(struct
dp_ctrl_private*ctrl,drivers/gpu/drm/msm/dp/dp_ctrl.c +20
-7- char *name, u32 rate) + enum dp_pm_type module, char *name, u32 rate) { -u32 num = ctrl->parser->mp[DP_CTRL_PM ].num_clk; -struct dss_clk *cfg = ctrl->parser->mp[DP_CTRL_PM ].clk_config; + u32 num = ctrl->parser->mp[module].num_clk; +struct dss_clk *cfg = ctrl->parser->mp[module].clk_config;while (num &&strcmp (cfg->clk_name, name)) { num--;@@ -1308,16 +1334,33 @@ static int dp_ctrl_enable_mainlink_clocks(struct dp_ctrl_private *ctrl) dp_power_set_link_clk_parent(ctrl->power); -dp_ctrl_set_clock_rate (ctrl,"ctrl_link" , +dp_ctrl_set_clock_rate (ctrl,DP_CTRL_PM ,"ctrl_link" , ctrl->link->link_params.rate); -dp_ctrl_set_clock_rate (ctrl,"stream_pixel" , - ctrl->dp_ctrl.pixel_rate); - ret =dp_power_clk_enable (ctrl->power,DP_CTRL_PM , true);if (ret)DRM_ERROR ("Unable to start link clocks. ret=%d\n" , ret); +DRM_DEBUG_DP ("link rate=%d pixel_clk=%d\n" , + ctrl->link->link_params.rate, ctrl->dp_ctrl.pixel_rate); + +return ret; +} + +static int dp_ctrl_enable_stream_clocks (struct dp_ctrl_private *ctrl) +{ +int ret =0 ; + +dp_ctrl_set_clock_rate (ctrl,DP_STREAM_PM ,"stream_pixel" , + ctrl->dp_ctrl.pixel_rate); + + ret =dp_power_clk_enable (ctrl->power,DP_STREAM_PM , true); +if (ret) + DRM_ERROR("Unabled to start pixel clocks. ret=%d\n",ret);
drivers/gpu/drm/msm/dp/dp_ctrl.c +3
-0+ + DRM_DEBUG_DP("link rate=%d pixel_clk=%d\n", + ctrl->link->link_params.rate,
ctrl->dp_ctrl.pixel_rate);drivers/gpu/drm/msm/dp/dp_ctrl.c +9
-18+return ret; }@@ -1407,37 +1450,30 @@ static int dp_ctrl_reinitialize_mainlink(struct dp_ctrl_private *ctrl) return ret; } -dp_ctrl_configure_source_params (ctrl); -dp_catalog_ctrl_config_msa (ctrl->catalog, - ctrl->link->link_params.rate, - ctrl->dp_ctrl.pixel_rate, dp_ctrl_use_fixed_nvid(ctrl)); -reinit_completion (&ctrl->idle_comp); -return ret; }static int dp_ctrl_link_maintenance (struct dp_ctrl_private *ctrl) {int ret =0 ; -int tries; +struct dp_cr_status cr; +int training_step =DP_TRAINING_NONE ;dp_ctrl_push_idle (&ctrl->dp_ctrl);dp_catalog_ctrl_reset (ctrl->catalog); ctrl->dp_ctrl.pixel_rate = ctrl->panel->dp_mode.drm_mode.clock; -for (tries =0 ; tries <10 ; tries++) { - ret =dp_ctrl_reinitialize_mainlink (ctrl); -if (ret) { -DRM_ERROR ("Failed to reinitialize mainlink. ret=%d\n", - ret); -break ; - } + ret = dp_ctrl_setup_main_link(ctrl, &cr, &training_step); +if (ret) + goto end; - ret =dp_ctrl_setup_main_link (ctrl, true); -if (ret == -EAGAIN )/* try with lower link rate */ -dp_ctrl_link_rate_down_shift (ctrl); - } +dp_ctrl_clear_training_pattern (ctrl); + + dp_catalog_ctrl_state_ctrl(ctrl->catalog,
DP_STATE_CTRL_SEND_VIDEO);drivers/gpu/drm/msm/dp/dp_ctrl.c +8
-5+ + ret =dp_ctrl_wait4video_ready (ctrl); +end:return ret; }@@ -1450,22 +1486,22 @@ static int dp_ctrl_process_phy_test_request(struct dp_ctrl_private *ctrl) return ret; } -dp_ctrl_push_idle (&ctrl->dp_ctrl);/* * The global reset will need DP link related clocks to be * running. Add the global reset just before disabling the * link clocks and core clocks. */ -dp_catalog_ctrl_reset (ctrl->catalog); ret =dp_ctrl_off (&ctrl->dp_ctrl);if (ret) {DRM_ERROR ("failed to disable DP controller\n" );return ret; } - ret =dp_ctrl_on (&ctrl->dp_ctrl); -if (ret) -DRM_ERROR ("failed to enable DP controller\n" ); + ret =dp_ctrl_on_link (&ctrl->dp_ctrl); +if (!ret) + ret =dp_ctrl_on_stream (&ctrl->dp_ctrl); +else +DRM_ERROR ("failed to enable DP link controller\n" );return ret;}
drivers/gpu/drm/msm/dp/dp_ctrl.c +18
-12@@ -1485,27 +1521,33 @@ static bool dp_ctrl_send_phy_test_pattern(struct dp_ctrl_private *ctrl) return false; }dp_catalog_ctrl_send_phy_pattern (ctrl->catalog, pattern_requested); +dp_ctrl_update_vx_px (ctrl);dp_link_send_test_response (ctrl->link); pattern_sent =dp_catalog_ctrl_read_phy_pattern (ctrl->catalog);switch (pattern_sent) {case MR_LINK_TRAINING1 : - success = pattern_requested == -DP_LINK_QUAL_PATTERN_D10_2 ; + success = (pattern_requested == +DP_PHY_TEST_PATTERN_D10_2 );break ;case MR_LINK_SYMBOL_ERM : - success = (pattern_requested == -DP_LINK_QUAL_PATTERN_ERROR_RATE ) - || (pattern_requested == -DP_LINK_QUAL_PATTERN_HBR2_EYE ); + success = ((pattern_requested == +DP_PHY_TEST_PATTERN_ERROR_COUNT ) || + (pattern_requested == +DP_PHY_TEST_PATTERN_CP2520 ));break ;case MR_LINK_PRBS7 : - success = pattern_requested ==DP_LINK_QUAL_PATTERN_PRBS7 ; + success = (pattern_requested == +DP_PHY_TEST_PATTERN_PRBS7 );break ;case MR_LINK_CUSTOM80 : - success = pattern_requested == -DP_LINK_QUAL_PATTERN_80BIT_CUSTOM ; + success = (pattern_requested == +DP_PHY_TEST_PATTERN_80BIT_CUSTOM ); +break ; +case MR_LINK_TRAINING4 : + success = (pattern_requested == +DP_PHY_TEST_PATTERN_SEL_MASK );break ;default : success = false;@@ -1537,12 +1579,12 @@ void dp_ctrl_handle_sink_request(struct dp_ctrl *dp_ctrl) } } -if (sink_request &DP_LINK_STATUS_UPDATED ) +if (sink_request &DP_LINK_STATUS_UPDATED ) {if (dp_ctrl_link_maintenance (ctrl)) { -DRM_ERROR ("LM failed: STATUS_UPDATED\n" ); +DRM_ERROR ("LM failed: TEST_LINK_TRAINING\n" );return ; } - + }if (sink_request &DP_TEST_LINK_TRAINING ) {dp_link_send_test_response(ctrl->link);drivers/gpu/drm/msm/dp/dp_ctrl.c +0
-0@@ -1553,13 +1595,15 @@ void dp_ctrl_handle_sink_request(struct dp_ctrl *dp_ctrl) }drivers/gpu/drm/msm/dp/dp_ctrl.c void dp_ctrl_handle_sink_request(struct · line 1604
Quoted 10 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +2
-2} -int dp_ctrl_on (struct dp_ctrl *dp_ctrl) +int dp_ctrl_on_link (struct dp_ctrl *dp_ctrl) {int rc =0 ;struct dp_ctrl_private *ctrl;u32 rate =0 ; -u32 link_train_max_retries =10 ; +u32 link_train_max_retries =5 ;Any reason these variables are u32 instead of unsigned int? Does the size of the variable matter if we're counting things?
drivers/gpu/drm/msm/dp/dp_ctrl.c void dp_ctrl_handle_sink_request(struct dp_ctrl *dp_ctrl) · line 1606
Quoted 3 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +2
-0u32 const phy_cts_pixel_clk_khz =148500 ; +struct dp_cr_status cr; +int training_step;Any reason to be int vs unsigned int?
Quoted 12 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +3
-2if (!dp_ctrl)return -EINVAL ;@@ -1601,16 +1648,115 @@ int dp_ctrl_on(struct dp_ctrl *dp_ctrl) rc);break ; } - rc =dp_ctrl_setup_main_link (ctrl, true); -if (!rc) + + training_step =DP_TRAINING_NONE ; + rc = dp_ctrl_setup_main_link(ctrl, &cr,drivers/gpu/drm/msm/dp/dp_ctrl.c int dp_ctrl_on(struct dp_ctrl *dp_ctrl) · line 1661
Quoted 10 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +6
-2&training_step); +if (rc ==0 ) { +/* training completed successfully */ break ; -/* try with lower link rate */ -dp_ctrl_link_rate_down_shift (ctrl); + }else if (training_step ==DP_TRAINING_1 ) { +/* link train_1 failed */ + rc =dp_ctrl_link_rate_down_shift (ctrl); +if (rc <0 ) {/* alread in RBR = 1.6G */ already?
Quoted 12 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +7
-0+if (cr.lane_0_1 &DP_LANE0_1_CR_DONE ) { +/* +* some lanes are ready, +* reduce lane number +*/ + rc =dp_ctrl_link_lane_down_shift (ctrl); +if (rc <0 ) {/* lane == 1 already */
drivers/gpu/drm/msm/dp/dp_ctrl.c +2
-0+/* end with failure */ +break ;[..]
Quoted 116 lines
drivers/gpu/drm/msm/dp/dp_display.c +55
-0@@ -783,6 +807,182 @@ int dp_display_get_test_bpp(struct msm_dp *dp) dp_display->link->test_video.test_bit_depth); } +static void dp_display_config_hpd (struct dp_display_private *dp) +{ + +dp_display_host_init (dp); +dp_catalog_ctrl_hpd_config (dp->catalog); + +/* Enable interrupt first time +* we are leaving dp clocks on during disconnect +* and never disable interrupt +*/ +enable_irq (dp->irq); +} + +static int hpd_event_thread (void *data) +{ +struct dp_display_private *dp_priv; +unsigned long flag; +struct dp_event *todo; +int timeout_mode =0 ; +int ret; + + dp_priv = (struct dp_display_private *)data; + +while (1 ) { +if (timeout_mode) { + ret =wait_event_timeout (dp_priv->event_q, + (dp_priv->event_pndx == dp_priv->event_gndx), +EVENT_TIMEOUT ); + }else { + ret =wait_event_timeout (dp_priv->event_q, + (dp_priv->event_pndx != dp_priv->event_gndx), +EVENT_TIMEOUT ); + } +spin_lock_irqsave (&dp_priv->event_lock, flag); + todo = &dp_priv->event_list[dp_priv->event_gndx]; +if (todo->delay) { +struct dp_event *todo_next; + + dp_priv->event_gndx++; + dp_priv->event_gndx %=DP_EVENT_Q_MAX ; + +/* re enter delay event into q */ + todo_next = &dp_priv->event_list[dp_priv->event_pndx++]; + dp_priv->event_pndx %=DP_EVENT_Q_MAX ; + todo_next->event_id = todo->event_id; + todo_next->data = todo->data; + todo_next->delay = todo->delay -1 ; + +/* clean up older event */ + todo->event_id =EV_NO_EVENT ; + todo->delay =0 ; + +/* switch to timeout mode */ + timeout_mode =1 ; + spin_unlock_irqrestore(&dp_priv->event_lock,flag);
drivers/gpu/drm/msm/dp/dp_display.c +6
-0+continue ; + } + +/* timeout with no events in q */ +if (dp_priv->event_pndx == dp_priv->event_gndx) { + spin_unlock_irqrestore(&dp_priv->event_lock,flag);
drivers/gpu/drm/msm/dp/dp_display.c +42
-0+continue ; + } + + dp_priv->event_gndx++; + dp_priv->event_gndx %=DP_EVENT_Q_MAX ; + timeout_mode =0 ; +spin_unlock_irqrestore (&dp_priv->event_lock, flag); + +switch (todo->event_id) { +case EV_HPD_INIT_SETUP : +dp_display_config_hpd (dp_priv); +break ; +case EV_HPD_PLUG_INT : +dp_hpd_plug_handle (dp_priv, todo->data); +break ; +case EV_HPD_UNPLUG_INT : +dp_hpd_unplug_handle (dp_priv, todo->data); +break ; +case EV_IRQ_HPD_INT : +dp_irq_hpd_handle (dp_priv, todo->data); +break ; +case EV_HPD_REPLUG_INT : +/* do nothing */ +break ; +case EV_USER_NOTIFICATION : +dp_display_send_hpd_notification (dp_priv, + todo->data); +break ; +default : +break ; + } + } + +return 0 ; +} + +static void dp_hpd_event_setup (struct dp_display_private *dp_priv) +{ +init_waitqueue_head (&dp_priv->event_q); +spin_lock_init (&dp_priv->event_lock); + + kthread_run(hpd_event_thread, (void *)dp_priv,Quoted 1 line
"
dp_hpd_handler");Is the cast necessary?
Quoted 5 lines
drivers/gpu/drm/msm/dp/dp_display.c +2
-0+} +@@ -890,8 +1069,13 @@ void msm_dp_irq_postinstall(struct msm_dp *dp_display)drivers/gpu/drm/msm/dp/dp_display.c void msm_dp_irq_postinstall(struct msm_dp · line 1078
Quoted 10 lines
drivers/gpu/drm/msm/dp/dp_display.c +4
-2dp = container_of(dp_display, struct dp_display_private, dp_display); -INIT_DELAYED_WORK (&dp->config_hpd_work, dp_display_config_hpd_work); -queue_delayed_work (system_wq, &dp->config_hpd_work,HZ *10 ); +dp_hpd_event_setup (dp); + +/* This hack Delays HPD configuration by 10 sec +* ToDo(User): Implement correct boot sequence of Typically todo is written "TODO(email@domain)" instead of User.
Quoted 127 lines
drivers/gpu/drm/msm/dp/dp_display.c +3
-0+* HPD configuration and remove this hack +*/ +dp_add_event (dp,EV_HPD_INIT_SETUP ,0 ,100 );}
int msm_dp_modeset_init(struct
msm_dp*dp_display, structdrm_device
*dev,drivers/gpu/drm/msm/dp/dp_display.c +15
-7@@ -938,37 +1122,47 @@ int msm_dp_display_enable(struct msm_dp *dp, struct drm_encoder *encoder)return -EINVAL ; } +mutex_lock (&dp_display->event_mutex); + rc =dp_display_set_mode (dp, &dp_display->dp_mode);if (rc) {DRM_ERROR ("Failed to perform a mode set, rc=%d\n" , rc); +mutex_unlock (&dp_display->event_mutex);return rc; } rc =dp_display_prepare (dp);if (rc) {DRM_ERROR ("DP display prepare failed, rc=%d\n" , rc); +mutex_unlock (&dp_display->event_mutex);return rc; } - rc =dp_display_enable (dp); -if (rc) { -DRM_ERROR ("DP display enable failed, rc=%d\n" , rc); -dp_display_unprepare (dp); -return rc; - } +dp_display_enable (dp_display,0 ); rc =dp_display_post_enable (dp);if (rc) {DRM_ERROR ("DP display post enable failed, rc=%d\n" , rc); -dp_display_disable (dp); +dp_display_disable (dp_display,0 );dp_display_unprepare (dp); } + +/* completed connection */ +atomic_set (&dp_display->hpd_state,ST_CONNECTED ); + +mutex_unlock (&dp_display->event_mutex); +return rc; }int msm_dp_display_disable (struct msm_dp *dp,struct drm_encoder *encoder) {int rc =0 ; +struct dp_display_private *dp_display; + + dp_display = container_of(dp, struct dp_display_private,
dp_display);drivers/gpu/drm/msm/dp/dp_display.c +7
-5+ +mutex_lock (&dp_display->event_mutex); rc =dp_display_pre_disable (dp);if (rc) {@@ -976,16 +1170,16 @@ int msm_dp_display_disable(struct msm_dp *dp, struct drm_encoder *encoder)return rc; } - rc =dp_display_disable (dp); -if (rc) { -DRM_ERROR ("DP display disable failed, rc=%d\n" , rc); -return rc; - } +dp_display_disable (dp_display,0 ); rc =dp_display_unprepare (dp);if (rc)DRM_ERROR ("DP display unprepare failed, rc=%d\n" , rc); +/* completed disconnection */ +atomic_set (&dp_display->hpd_state,ST_DISCONNECTED ); + +mutex_unlock (&dp_display->event_mutex);return rc; }drivers/gpu/drm/msm/dp/dp_hpd.c +1
-1@@ -24,7 +24,7 @@ struct dp_hpd_private {struct dp_usbpd dp_usbpd; }; -static int dp_hpd_connect (struct dp_usbpd *dp_usbpd,bool hpd) +int dp_hpd_connect (struct dp_usbpd *dp_usbpd,bool hpd) {int rc =0 ;struct dp_hpd_private *hpd_priv;drivers/gpu/drm/msm/dp/dp_hpd.h +1
-0@@ -75,5 +75,6 @@ struct dp_usbpd *dp_hpd_get(struct device *dev, struct dp_usbpd_cb *cb);int dp_hpd_register (struct dp_usbpd *dp_usbpd);void dp_hpd_unregister (struct dp_usbpd *dp_usbpd); +int dp_hpd_connect (struct dp_usbpd *dp_usbpd,bool hpd);#endif /* _DP_HPD_H_ */
drivers/gpu/drm/msm/dp/dp_link.c +0
-1@@ -661,7 +661,6 @@ static int dp_link_parse_request(struct dp_link_private *link) DRM_DEBUG_DP("Test:(0x%x) requested\n", data); link->request.test_requested = data; -if (link->request.test_requested ==DP_TEST_LINK_PHY_TEST_PATTERN ) {Quoted 2 lines
ret = dp_link_parse_phy_test_params(link); if (ret)Drop this hunk?
Quoting [email protected] (2020-07-20 15:48:13)
Quoted 14 lines · Stephen Boyd
Quoted 6 lines
Quoting Kuogee Hsieh (2020-07-07 11:41:25)
Quoted 4 lines
drivers/gpu/drm/msm/dp/dp_power.c | 32 +- drivers/gpu/drm/msm/dp/dp_power.h | 1 + drivers/gpu/drm/msm/dp/dp_reg.h | 1 + 17 files changed, 861 insertions(+), 424 deletions(-)Quoted 6 lines
It seems to spread various changes throughout the DP bits and only has a
short description about what's changing. Given that the series above isn't merged it would be better to get rid of this change and make the changes in the patches that introduce these files.
Quoted 12 lines
Yes, the base DP driver is not yet merged as its still in reviews and has been for a while.
While it is being reviewed, different developers are working on different aspects of DP such as base DP driver, DP compliance, audio etc to keep things going in parallel.
To maintain the authorship of the different developers, we prefer having them as separate changes and not merge them.
We can make all these changes as part of the same series if that shall help to keep things together but would prefer the changes themselves to be separate.
Please consider this and let us know if that works.
I'm not the maintainer here so it's not really up to me, but this is why we have the Co-developed-by tag, to show that multiple people worked on some patch. The patch is supposed to logically stand on its own regardless of how many people worked on it. Authorship is a single person but the Co-developed-by tag helps express that more than one person is the actual author of the patch. Can you use that tag instead and then squash this into the other DP patches?
Quoted 29 lines · Stephen Boyd
Quoting [email protected] (2020-07-20 15:48:13)
Quoted 14 lines · Stephen Boyd
Quoted 6 lines
Quoting Kuogee Hsieh (2020-07-07 11:41:25)
Quoted 4 lines
drivers/gpu/drm/msm/dp/dp_power.c | 32 +- drivers/gpu/drm/msm/dp/dp_power.h | 1 + drivers/gpu/drm/msm/dp/dp_reg.h | 1 + 17 files changed, 861 insertions(+), 424 deletions(-)Quoted 6 lines
It seems to spread various changes throughout the DP bits and only has a
short description about what's changing. Given that the series above isn't merged it would be better to get rid of this change and make the changes in the patches that introduce these files.Quoted 12 lines
Yes, the base DP driver is not yet merged as its still in reviews and has been for a while.
While it is being reviewed, different developers are working on different aspects of DP such as base DP driver, DP compliance, audio etc to keep things going in parallel.
To maintain the authorship of the different developers, we prefer having them as separate changes and not merge them.
We can make all these changes as part of the same series if that shall help to keep things together but would prefer the changes themselves to be separate.
Please consider this and let us know if that works.
Quoted 7 lines
I'm not the maintainer here so it's not really up to me, but this is why we have the Co-developed-by tag, to show that multiple people worked on some patch. The patch is supposed to logically stand on its own regardless of how many people worked on it. Authorship is a single person but the Co-developed-by tag helps express that more than one person is the actual author of the patch. Can you use that tag instead and then squash this into the other DP patches?
The dpu mega-patches are hard enough to review already.. I'd really appreciated it if the dpu dev's sort out some way to squash later fixups into earlier patches
BR,
-R
Quoted 38 lines · Rob Clark
Quoted 29 lines · Stephen Boyd
Quoting [email protected] (2020-07-20 15:48:13)
Quoted 14 lines · Stephen Boyd
Quoted 6 lines
Quoting Kuogee Hsieh (2020-07-07 11:41:25)
Quoted 4 lines
drivers/gpu/drm/msm/dp/dp_power.c | 32 +- drivers/gpu/drm/msm/dp/dp_power.h | 1 + drivers/gpu/drm/msm/dp/dp_reg.h | 1 + 17 files changed, 861 insertions(+), 424 deletions(-)Quoted 6 lines
It seems to spread various changes throughout the DP bits and only has a
short description about what's changing. Given that the series above isn't merged it would be better to get rid of this change and make the changes in the patches that introduce these files.Quoted 12 lines
Yes, the base DP driver is not yet merged as its still in reviews and has been for a while.
While it is being reviewed, different developers are working on different aspects of DP such as base DP driver, DP compliance, audio etc to keep things going in parallel.
To maintain the authorship of the different developers, we prefer having them as separate changes and not merge them.
We can make all these changes as part of the same series if that shall help to keep things together but would prefer the changes themselves to be separate.
Please consider this and let us know if that works.Quoted 7 lines
I'm not the maintainer here so it's not really up to me, but this is why we have the Co-developed-by tag, to show that multiple people worked on some patch. The patch is supposed to logically stand on its own regardless of how many people worked on it. Authorship is a single person but the Co-developed-by tag helps express that more than one person is the actual author of the patch. Can you use that tag instead and then squash this into the other DP patches?
Quoted 6 lines
The dpu mega-patches are hard enough to review already.. I'd really appreciated it if the dpu dev's sort out some way to squash later fixups into earlier patches
BR,
-R
as per discussion on IRC, I have separated the parts of this change which are unrelated to compliance and we have merged it to the base DP driver and added the Co-developed-by tag there. Since this change adds supports for DP compliance on MSM chipsets which is a new feature and not fixes to the base driver, we will prefer to have this as a separate change as it will make it easier for you to review it instead of continuing to expand the base DP driver