drm/msm/dp: Add DP compliance tests on Snapdragon Chipsets
PATCH v4 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.
Changes in v2:
- Fix potential deadlock by removing redundant connect_mutex
- Check and enable link clock during modeset
- Drop unused code and fix function prototypes.
- set sink power to normal operation state (D0) before DPCD read
Changes in v3:
- push idle pattern at main link before timing generator off
- add timeout handles for both connect and disconnect
Changes in v4:
- fix crash while device in suspend mode
- also fix modeset test
This patch depends-on:
https://lkml.kernel.org/lkml/[email protected]/
--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 6 + drivers/gpu/drm/msm/dp/dp_aux.c | 5 +- drivers/gpu/drm/msm/dp/dp_catalog.c | 77 +- drivers/gpu/drm/msm/dp/dp_ctrl.c | 370 ++++++--- drivers/gpu/drm/msm/dp/dp_ctrl.h | 3 +- drivers/gpu/drm/msm/dp/dp_display.c | 789 +++++++++++++------- drivers/gpu/drm/msm/dp/dp_display.h | 1 - drivers/gpu/drm/msm/dp/dp_drm.c | 4 - 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 | 78 +- drivers/gpu/drm/msm/dp/dp_panel.h | 9 +- drivers/gpu/drm/msm/dp/dp_parser.c | 42 +- drivers/gpu/drm/msm/dp/dp_parser.h | 2 + drivers/gpu/drm/msm/dp/dp_power.c | 46 +- drivers/gpu/drm/msm/dp/dp_power.h | 13 + drivers/gpu/drm/msm/dp/dp_reg.h | 1 + drivers/gpu/drm/msm/msm_drv.h | 1 + 19 files changed, 1012 insertions(+), 460 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +6 -0
@@ -1221,6 +1221,11 @@ static void dpu_encoder_virt_disable(struct drm_encoder *drm_enc)/* wait for idle */ dpu_encoder_wait_for_event (drm_enc,MSM_ENC_TX_COMPLETE ); +if (drm_enc->encoder_type ==DRM_MODE_ENCODER_TMDS && priv->dp) { +if (msm_dp_display_pre_disable (priv->dp, drm_enc)) +DPU_ERROR_ENC (dpu_enc,"dp display push idle failed\n" ); + } +dpu_encoder_resource_control (drm_enc,DPU_ENC_RC_EVENT_PRE_STOP );for (i =0 ; i < dpu_enc->num_phys_encs; i++) {
@@ -1230,6 +1235,7 @@ static void dpu_encoder_virt_disable(struct drm_encoder *drm_enc) phys->ops.disable (phys); } +/* after phys waits for frame-done, should be no more frames pending */ if (atomic_xchg (&dpu_enc->frame_done_timeout_ms,0 )) {DPU_ERROR ("enc%d timeout pending\n" , drm_enc->base.id);
drivers/gpu/drm/msm/dp/dp_aux.c +3 -2
@@ -188,9 +188,9 @@ static void dp_aux_native_handler(struct dp_aux_private *aux) aux->aux_error_num =DP_AUX_ERR_ADDR ; else if (isr & DP_INTR_TIMEOUT) aux->aux_error_num = DP_AUX_ERR_TOUT; -if (isr &DP_INTR_NACK_DEFER ) + else if (isr & DP_INTR_NACK_DEFER) aux->aux_error_num = DP_AUX_ERR_NACK; -if (isr &DP_INTR_AUX_ERROR ) { + else if (isr & DP_INTR_AUX_ERROR) { aux->aux_error_num =DP_AUX_ERR_PHY ;dp_catalog_aux_clear_hw_interrupts (aux->catalog); }
@@ -384,6 +384,7 @@ static ssize_t dp_aux_transfer(struct drm_dp_aux *dp_aux, PHY_AUX_CFG1);dp_catalog_aux_reset (aux->catalog); } +usleep_range (400 ,500 );/* at least 400us to next try */ goto unlock_exit; }
drivers/gpu/drm/msm/dp/dp_catalog.c +52 -25
121 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_ctrl.c +263 -107
661 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 +529 -260
1,041 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_display.h +0 -1
@@ -13,7 +13,6 @@ struct msm_dp {struct drm_connector *connector;struct drm_encoder *encoder;bool is_connected; -struct mutex connect_mutex;u32 max_pclk_khz;u32 max_dp_lanes; };
drivers/gpu/drm/msm/dp/dp_drm.c +0 -4
@@ -58,7 +58,6 @@ static int dp_connector_get_modes(struct drm_connector *connector)if (!dp_mode)return 0 ; -mutex_lock (&dp->connect_mutex);/* pluggable case assumes EDID is read when HPD */ if (dp->is_connected) {/*
@@ -71,7 +70,6 @@ static int dp_connector_get_modes(struct drm_connector *connector)if (rc <=0 ) {DRM_ERROR ("failed to get DP sink modes, rc=%d\n" , rc);kfree (dp_mode); -mutex_unlock (&dp->connect_mutex);return rc; }if (dp_mode->drm_mode.clock) {/* valid DP mode */
@@ -83,7 +81,6 @@ static int dp_connector_get_modes(struct drm_connector *connector) drm_mode.hdisplay, drm_mode.vdisplay);kfree (dp_mode); -mutex_unlock (&dp->connect_mutex);return 0 ; }drm_mode_probed_add (connector, m);
@@ -91,7 +88,6 @@ static int dp_connector_get_modes(struct drm_connector *connector) }else {DRM_DEBUG_DP ("No sink connected\n" ); } -mutex_unlock (&dp->connect_mutex);kfree (dp_mode);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 +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_SEL_MASK : +case DP_PHY_TEST_PATTERN_NONE : +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)
@@ -789,10 +788,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 ; }
@@ -1028,11 +1025,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 ;
@@ -1206,7 +1201,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 +51 -27
140 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_panel.h +7 -2
@@ -14,8 +14,10 @@struct edid ; -#define DP_MAX_DOWNSTREAM_PORTS 0x10 -#define DPRX_EXTENDED_DPCD_FIELD 0x2200 +#define DPRX_EXTENDED_DPCD_FIELD 0x2200 + +#define DP_DOWNSTREAM_PORTS 4 +#define DP_DOWNSTREAM_CAP_SIZE 4struct dp_display_mode {struct drm_display_mode drm_mode;
@@ -35,6 +37,9 @@ struct dp_panel_in {struct dp_panel {/* dpcd raw data */ u8 dpcd[DP_RECEIVER_CAP_SIZE +1 ]; +u8 ds_cap_info[DP_DOWNSTREAM_PORTS *DP_DOWNSTREAM_CAP_SIZE ]; +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 +31 -11
92 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 +41 -5
105 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_power.h +13 -0
@@ -19,6 +19,7 @@struct dp_power {bool core_clks_on;bool link_clks_on; +bool stream_clks_on; };/**
@@ -43,6 +44,18 @@ int dp_power_init(struct dp_power *power, bool flip);*/ int dp_power_deinit (struct dp_power *power); +/** +* dp_power_clk_status() - display controller clocks status +* +* @power: instance of power module +* @pm_type: type of pm, core/ctrl/phy +* return: status of power clocks +* +* This API return status of DP clocks +*/ + +int dp_power_clk_status (struct dp_power *dp_power,enum dp_pm_type pm_type); +/** * dp_power_clk_enable() - enable display controller clocks *
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)
drivers/gpu/drm/msm/msm_drv.h +1 -0
@@ -387,6 +387,7 @@ int msm_dp_modeset_init(struct msm_dp *dp_display, struct drm_device *dev, struct drm_encoder *encoder);int msm_dp_display_enable (struct msm_dp *dp,struct drm_encoder *encoder);int msm_dp_display_disable (struct msm_dp *dp,struct drm_encoder *encoder); +int msm_dp_display_pre_disable (struct msm_dp *dp,struct drm_encoder *encoder);void msm_dp_display_mode_set (struct msm_dp *dp,struct drm_encoder *encoder,struct drm_display_mode *mode,struct drm_display_mode *adjusted_mode);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project