From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753298AbeCNFwf (ORCPT ); Wed, 14 Mar 2018 01:52:35 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:44594 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751155AbeCNFwd (ORCPT ); Wed, 14 Mar 2018 01:52:33 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 3476460592 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=architt@codeaurora.org Subject: Re: [PATCH v5 05/36] drm/bridge: analogix_dp: add fast link train for eDP To: Enric Balletbo i Serra , inki.dae@samsung.com, thierry.reding@gmail.com, hjc@rock-chips.com, seanpaul@chromium.org, airlied@linux.ie, tfiga@chromium.org, heiko@sntech.de Cc: dri-devel@lists.freedesktop.org, dianders@chromium.org, a.hajda@samsung.com, ykk@rock-chips.com, kernel@collabora.com, m.szyprowski@samsung.com, linux-samsung-soc@vger.kernel.org, jy0922.shim@samsung.com, rydberg@bitmath.org, krzk@kernel.org, linux-rockchip@lists.infradead.org, kgene@kernel.org, linux-input@vger.kernel.org, orjan.eide@arm.com, wxt@rock-chips.com, jeffy.chen@rock-chips.com, linux-arm-kernel@lists.infradead.org, mark.yao@rock-chips.com, wzz@rock-chips.com, hl@rock-chips.com, jingoohan1@gmail.com, sw0312.kim@samsung.com, linux-kernel@vger.kernel.org, kyungmin.park@samsung.com, Laurent.pinchart@ideasonboard.com, kuankuan.y@gmail.com, hshi@chromium.org References: <20180309222327.18689-1-enric.balletbo@collabora.com> <20180309222327.18689-6-enric.balletbo@collabora.com> From: Archit Taneja Message-ID: <912773b9-e72b-11d1-e459-bbd765451f3c@codeaurora.org> Date: Wed, 14 Mar 2018 11:22:16 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <20180309222327.18689-6-enric.balletbo@collabora.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Saturday 10 March 2018 03:52 AM, Enric Balletbo i Serra wrote: > From: zain wang > > We would meet a short black screen when exit PSR with the full link > training, In this case, we should use fast link train instead of full > link training. > > Signed-off-by: zain wang > Signed-off-by: Sean Paul > Signed-off-by: Thierry Escande > Signed-off-by: Enric Balletbo i Serra > Tested-by: Marek Szyprowski > --- > > drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 142 ++++++++++++++++----- > drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 3 + > 2 files changed, 114 insertions(+), 31 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c > index ee00d3d920e0..806c3878b3d6 100644 > --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c > +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c > @@ -10,17 +10,18 @@ > * option) any later version. > */ > > -#include > -#include > -#include > #include > -#include > +#include > +#include > +#include > #include > +#include > +#include > +#include > #include > #include > -#include > -#include > #include > +#include This re-ordering doesn't seem like it should be a part of this patch, you can let it stay if it happens to cause conflicts with future patches. Other than that: Reviewed-by: Archit Taneja Thanks, Archit > > #include > #include > @@ -35,6 +36,8 @@ > > #define to_dp(nm) container_of(nm, struct analogix_dp_device, nm) > > +static const bool verify_fast_training; > + > struct bridge_init { > struct i2c_client *client; > struct device_node *node; > @@ -528,7 +531,7 @@ static int analogix_dp_process_equalizer_training(struct analogix_dp_device *dp) > { > int lane, lane_count, retval; > u32 reg; > - u8 link_align, link_status[2], adjust_request[2]; > + u8 link_align, link_status[2], adjust_request[2], spread; > > usleep_range(400, 401); > > @@ -571,6 +574,20 @@ static int analogix_dp_process_equalizer_training(struct analogix_dp_device *dp) > dev_dbg(dp->dev, "final lane count = %.2x\n", > dp->link_train.lane_count); > > + retval = drm_dp_dpcd_readb(&dp->aux, DP_MAX_DOWNSPREAD, > + &spread); > + if (retval != 1) { > + dev_err(dp->dev, "failed to read downspread %d\n", > + retval); > + dp->fast_train_support = false; > + } else { > + dp->fast_train_support = > + (spread & DP_NO_AUX_HANDSHAKE_LINK_TRAINING) ? > + true : false; > + } > + dev_dbg(dp->dev, "fast link training %s\n", > + dp->fast_train_support ? "supported" : "unsupported"); > + > /* set enhanced mode if available */ > analogix_dp_set_enhanced_mode(dp); > dp->link_train.lt_state = FINISHED; > @@ -627,10 +644,12 @@ static void analogix_dp_get_max_rx_lane_count(struct analogix_dp_device *dp, > *lane_count = DPCD_MAX_LANE_COUNT(data); > } > > -static void analogix_dp_init_training(struct analogix_dp_device *dp, > - enum link_lane_count_type max_lane, > - int max_rate) > +static int analogix_dp_full_link_train(struct analogix_dp_device *dp, > + u32 max_lanes, u32 max_rate) > { > + int retval = 0; > + bool training_finished = false; > + > /* > * MACRO_RST must be applied after the PLL_LOCK to avoid > * the DP inter pair skew issue for at least 10 us > @@ -656,18 +675,13 @@ static void analogix_dp_init_training(struct analogix_dp_device *dp, > } > > /* Setup TX lane count & rate */ > - if (dp->link_train.lane_count > max_lane) > - dp->link_train.lane_count = max_lane; > + if (dp->link_train.lane_count > max_lanes) > + dp->link_train.lane_count = max_lanes; > if (dp->link_train.link_rate > max_rate) > dp->link_train.link_rate = max_rate; > > /* All DP analog module power up */ > analogix_dp_set_analog_power_down(dp, POWER_ALL, 0); > -} > - > -static int analogix_dp_sw_link_training(struct analogix_dp_device *dp) > -{ > - int retval = 0, training_finished = 0; > > dp->link_train.lt_state = START; > > @@ -702,22 +716,88 @@ static int analogix_dp_sw_link_training(struct analogix_dp_device *dp) > return retval; > } > > -static int analogix_dp_set_link_train(struct analogix_dp_device *dp, > - u32 count, u32 bwtype) > +static int analogix_dp_fast_link_train(struct analogix_dp_device *dp) > { > - int i; > - int retval; > + int i, ret; > + u8 link_align, link_status[2]; > + enum pll_status status; > > - for (i = 0; i < DP_TIMEOUT_LOOP_COUNT; i++) { > - analogix_dp_init_training(dp, count, bwtype); > - retval = analogix_dp_sw_link_training(dp); > - if (retval == 0) > - break; > + analogix_dp_reset_macro(dp); > + > + analogix_dp_set_link_bandwidth(dp, dp->link_train.link_rate); > + analogix_dp_set_lane_count(dp, dp->link_train.lane_count); > > - usleep_range(100, 110); > + for (i = 0; i < dp->link_train.lane_count; i++) { > + analogix_dp_set_lane_link_training(dp, > + dp->link_train.training_lane[i], i); > } > > - return retval; > + ret = readx_poll_timeout(analogix_dp_get_pll_lock_status, dp, status, > + status != PLL_UNLOCKED, 120, > + 120 * DP_TIMEOUT_LOOP_COUNT); > + if (ret) { > + DRM_DEV_ERROR(dp->dev, "Wait for pll lock failed %d\n", ret); > + return ret; > + } > + > + /* source Set training pattern 1 */ > + analogix_dp_set_training_pattern(dp, TRAINING_PTN1); > + /* From DP spec, pattern must be on-screen for a minimum 500us */ > + usleep_range(500, 600); > + > + analogix_dp_set_training_pattern(dp, TRAINING_PTN2); > + /* From DP spec, pattern must be on-screen for a minimum 500us */ > + usleep_range(500, 600); > + > + /* TODO: enhanced_mode?*/ > + analogix_dp_set_training_pattern(dp, DP_NONE); > + > + /* > + * Useful for debugging issues with fast link training, disable for more > + * speed > + */ > + if (verify_fast_training) { > + ret = drm_dp_dpcd_readb(&dp->aux, DP_LANE_ALIGN_STATUS_UPDATED, > + &link_align); > + if (ret < 0) { > + DRM_DEV_ERROR(dp->dev, "Read align status failed %d\n", > + ret); > + return ret; > + } > + > + ret = drm_dp_dpcd_read(&dp->aux, DP_LANE0_1_STATUS, link_status, > + 2); > + if (ret < 0) { > + DRM_DEV_ERROR(dp->dev, "Read link status failed %d\n", > + ret); > + return ret; > + } > + > + if (analogix_dp_clock_recovery_ok(link_status, > + dp->link_train.lane_count)) { > + DRM_DEV_ERROR(dp->dev, "Clock recovery failed\n"); > + analogix_dp_reduce_link_rate(dp); > + return -EIO; > + } > + > + if (analogix_dp_channel_eq_ok(link_status, link_align, > + dp->link_train.lane_count)) { > + DRM_DEV_ERROR(dp->dev, "Channel EQ failed\n"); > + analogix_dp_reduce_link_rate(dp); > + return -EIO; > + } > + } > + > + return 0; > +} > + > +static int analogix_dp_train_link(struct analogix_dp_device *dp) > +{ > + if (dp->fast_train_support) > + return analogix_dp_fast_link_train(dp); > + > + return analogix_dp_full_link_train(dp, dp->video_info.max_lane_count, > + dp->video_info.max_link_rate); > } > > static int analogix_dp_config_video(struct analogix_dp_device *dp) > @@ -846,10 +926,10 @@ static void analogix_dp_commit(struct analogix_dp_device *dp) > DRM_ERROR("failed to disable the panel\n"); > } > > - ret = analogix_dp_set_link_train(dp, dp->video_info.max_lane_count, > - dp->video_info.max_link_rate); > + ret = readx_poll_timeout(analogix_dp_train_link, dp, ret, !ret, 100, > + DP_TIMEOUT_TRAINING_US * 5); > if (ret) { > - dev_err(dp->dev, "unable to do link train\n"); > + dev_err(dp->dev, "unable to do link train, ret=%d\n", ret); > return; > } > > diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h > index e135a42cb19e..920607d7eb3e 100644 > --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h > +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h > @@ -20,6 +20,8 @@ > #define MAX_CR_LOOP 5 > #define MAX_EQ_LOOP 5 > > +/* Training takes 22ms if AUX channel comm fails. Use this as retry interval */ > +#define DP_TIMEOUT_TRAINING_US 22000 > #define DP_TIMEOUT_PSR_LOOP_MS 300 > > /* DP_MAX_LANE_COUNT */ > @@ -171,6 +173,7 @@ struct analogix_dp_device { > int hpd_gpio; > bool force_hpd; > bool psr_enable; > + bool fast_train_support; > > struct mutex panel_lock; > bool panel_is_modeset; > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Archit Taneja Subject: Re: [PATCH v5 05/36] drm/bridge: analogix_dp: add fast link train for eDP Date: Wed, 14 Mar 2018 11:22:16 +0530 Message-ID: <912773b9-e72b-11d1-e459-bbd765451f3c@codeaurora.org> References: <20180309222327.18689-1-enric.balletbo@collabora.com> <20180309222327.18689-6-enric.balletbo@collabora.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180309222327.18689-6-enric.balletbo@collabora.com> Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Enric Balletbo i Serra , inki.dae@samsung.com, thierry.reding@gmail.com, hjc@rock-chips.com, seanpaul@chromium.org, airlied@linux.ie, tfiga@chromium.org, heiko@sntech.de Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Laurent.pinchart@ideasonboard.com, ykk@rock-chips.com, kernel@collabora.com, m.szyprowski@samsung.com, linux-samsung-soc@vger.kernel.org, rydberg@bitmath.org, krzk@kernel.org, linux-rockchip@lists.infradead.org, kgene@kernel.org, linux-input@vger.kernel.org, orjan.eide@arm.com, wxt@rock-chips.com, jeffy.chen@rock-chips.com, linux-arm-kernel@lists.infradead.org, mark.yao@rock-chips.com, wzz@rock-chips.com, hl@rock-chips.com, jingoohan1@gmail.com, sw0312.kim@samsung.com, dianders@chromium.org, kyungmin.park@samsung.com, kuankuan.y@gmail.com, hshi@chromium.org List-Id: linux-input@vger.kernel.org CgpPbiBTYXR1cmRheSAxMCBNYXJjaCAyMDE4IDAzOjUyIEFNLCBFbnJpYyBCYWxsZXRibyBpIFNl cnJhIHdyb3RlOgo+IEZyb206IHphaW4gd2FuZyA8d3p6QHJvY2stY2hpcHMuY29tPgo+IAo+IFdl IHdvdWxkIG1lZXQgYSBzaG9ydCBibGFjayBzY3JlZW4gd2hlbiBleGl0IFBTUiB3aXRoIHRoZSBm dWxsIGxpbmsKPiB0cmFpbmluZywgSW4gdGhpcyBjYXNlLCB3ZSBzaG91bGQgdXNlIGZhc3QgbGlu ayB0cmFpbiBpbnN0ZWFkIG9mIGZ1bGwKPiBsaW5rIHRyYWluaW5nLgo+IAo+IFNpZ25lZC1vZmYt Ynk6IHphaW4gd2FuZyA8d3p6QHJvY2stY2hpcHMuY29tPgo+IFNpZ25lZC1vZmYtYnk6IFNlYW4g UGF1bCA8c2VhbnBhdWxAY2hyb21pdW0ub3JnPgo+IFNpZ25lZC1vZmYtYnk6IFRoaWVycnkgRXNj YW5kZSA8dGhpZXJyeS5lc2NhbmRlQGNvbGxhYm9yYS5jb20+Cj4gU2lnbmVkLW9mZi1ieTogRW5y aWMgQmFsbGV0Ym8gaSBTZXJyYSA8ZW5yaWMuYmFsbGV0Ym9AY29sbGFib3JhLmNvbT4KPiBUZXN0 ZWQtYnk6IE1hcmVrIFN6eXByb3dza2kgPG0uc3p5cHJvd3NraUBzYW1zdW5nLmNvbT4KPiAtLS0K PiAKPiAgIGRyaXZlcnMvZ3B1L2RybS9icmlkZ2UvYW5hbG9naXgvYW5hbG9naXhfZHBfY29yZS5j IHwgMTQyICsrKysrKysrKysrKysrKystLS0tLQo+ICAgZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9h bmFsb2dpeC9hbmFsb2dpeF9kcF9jb3JlLmggfCAgIDMgKwo+ICAgMiBmaWxlcyBjaGFuZ2VkLCAx MTQgaW5zZXJ0aW9ucygrKSwgMzEgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9icmlkZ2UvYW5hbG9naXgvYW5hbG9naXhfZHBfY29yZS5jIGIvZHJpdmVycy9n cHUvZHJtL2JyaWRnZS9hbmFsb2dpeC9hbmFsb2dpeF9kcF9jb3JlLmMKPiBpbmRleCBlZTAwZDNk OTIwZTAuLjgwNmMzODc4YjNkNiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vYnJpZGdl L2FuYWxvZ2l4L2FuYWxvZ2l4X2RwX2NvcmUuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9icmlk Z2UvYW5hbG9naXgvYW5hbG9naXhfZHBfY29yZS5jCj4gQEAgLTEwLDE3ICsxMCwxOCBAQAo+ICAg KiBvcHRpb24pIGFueSBsYXRlciB2ZXJzaW9uLgo+ICAgKi8KPiAgIAo+IC0jaW5jbHVkZSA8bGlu dXgvbW9kdWxlLmg+Cj4gLSNpbmNsdWRlIDxsaW51eC9wbGF0Zm9ybV9kZXZpY2UuaD4KPiAtI2lu Y2x1ZGUgPGxpbnV4L2Vyci5oPgo+ICAgI2luY2x1ZGUgPGxpbnV4L2Nsay5oPgo+IC0jaW5jbHVk ZSA8bGludXgvaW8uaD4KPiArI2luY2x1ZGUgPGxpbnV4L2NvbXBvbmVudC5oPgo+ICsjaW5jbHVk ZSA8bGludXgvZXJyLmg+Cj4gKyNpbmNsdWRlIDxsaW51eC9ncGlvLmg+Cj4gICAjaW5jbHVkZSA8 bGludXgvaW50ZXJydXB0Lmg+Cj4gKyNpbmNsdWRlIDxsaW51eC9pby5oPgo+ICsjaW5jbHVkZSA8 bGludXgvaW9wb2xsLmg+Cj4gKyNpbmNsdWRlIDxsaW51eC9tb2R1bGUuaD4KPiAgICNpbmNsdWRl IDxsaW51eC9vZi5oPgo+ICAgI2luY2x1ZGUgPGxpbnV4L29mX2dwaW8uaD4KPiAtI2luY2x1ZGUg PGxpbnV4L2dwaW8uaD4KPiAtI2luY2x1ZGUgPGxpbnV4L2NvbXBvbmVudC5oPgo+ICAgI2luY2x1 ZGUgPGxpbnV4L3BoeS9waHkuaD4KPiArI2luY2x1ZGUgPGxpbnV4L3BsYXRmb3JtX2RldmljZS5o PgoKVGhpcyByZS1vcmRlcmluZyBkb2Vzbid0IHNlZW0gbGlrZSBpdCBzaG91bGQgYmUgYSBwYXJ0 IG9mIHRoaXMgcGF0Y2gsCnlvdSBjYW4gbGV0IGl0IHN0YXkgaWYgaXQgaGFwcGVucyB0byBjYXVz ZSBjb25mbGljdHMgd2l0aCBmdXR1cmUKcGF0Y2hlcy4gT3RoZXIgdGhhbiB0aGF0OgoKUmV2aWV3 ZWQtYnk6IEFyY2hpdCBUYW5lamEgPGFyY2hpdHRAY29kZWF1cm9yYS5vcmc+CgpUaGFua3MsCkFy Y2hpdAoKPiAgIAo+ICAgI2luY2x1ZGUgPGRybS9kcm1QLmg+Cj4gICAjaW5jbHVkZSA8ZHJtL2Ry bV9hdG9taWNfaGVscGVyLmg+Cj4gQEAgLTM1LDYgKzM2LDggQEAKPiAgIAo+ICAgI2RlZmluZSB0 b19kcChubSkJY29udGFpbmVyX29mKG5tLCBzdHJ1Y3QgYW5hbG9naXhfZHBfZGV2aWNlLCBubSkK PiAgIAo+ICtzdGF0aWMgY29uc3QgYm9vbCB2ZXJpZnlfZmFzdF90cmFpbmluZzsKPiArCj4gICBz dHJ1Y3QgYnJpZGdlX2luaXQgewo+ICAgCXN0cnVjdCBpMmNfY2xpZW50ICpjbGllbnQ7Cj4gICAJ c3RydWN0IGRldmljZV9ub2RlICpub2RlOwo+IEBAIC01MjgsNyArNTMxLDcgQEAgc3RhdGljIGlu dCBhbmFsb2dpeF9kcF9wcm9jZXNzX2VxdWFsaXplcl90cmFpbmluZyhzdHJ1Y3QgYW5hbG9naXhf ZHBfZGV2aWNlICpkcCkKPiAgIHsKPiAgIAlpbnQgbGFuZSwgbGFuZV9jb3VudCwgcmV0dmFsOwo+ ICAgCXUzMiByZWc7Cj4gLQl1OCBsaW5rX2FsaWduLCBsaW5rX3N0YXR1c1syXSwgYWRqdXN0X3Jl cXVlc3RbMl07Cj4gKwl1OCBsaW5rX2FsaWduLCBsaW5rX3N0YXR1c1syXSwgYWRqdXN0X3JlcXVl c3RbMl0sIHNwcmVhZDsKPiAgIAo+ICAgCXVzbGVlcF9yYW5nZSg0MDAsIDQwMSk7Cj4gICAKPiBA QCAtNTcxLDYgKzU3NCwyMCBAQCBzdGF0aWMgaW50IGFuYWxvZ2l4X2RwX3Byb2Nlc3NfZXF1YWxp emVyX3RyYWluaW5nKHN0cnVjdCBhbmFsb2dpeF9kcF9kZXZpY2UgKmRwKQo+ICAgCQlkZXZfZGJn KGRwLT5kZXYsICJmaW5hbCBsYW5lIGNvdW50ID0gJS4yeFxuIiwKPiAgIAkJCWRwLT5saW5rX3Ry YWluLmxhbmVfY291bnQpOwo+ICAgCj4gKwkJcmV0dmFsID0gZHJtX2RwX2RwY2RfcmVhZGIoJmRw LT5hdXgsIERQX01BWF9ET1dOU1BSRUFELAo+ICsJCQkJCSAgICZzcHJlYWQpOwo+ICsJCWlmIChy ZXR2YWwgIT0gMSkgewo+ICsJCQlkZXZfZXJyKGRwLT5kZXYsICJmYWlsZWQgdG8gcmVhZCBkb3du c3ByZWFkICVkXG4iLAo+ICsJCQkJcmV0dmFsKTsKPiArCQkJZHAtPmZhc3RfdHJhaW5fc3VwcG9y dCA9IGZhbHNlOwo+ICsJCX0gZWxzZSB7Cj4gKwkJCWRwLT5mYXN0X3RyYWluX3N1cHBvcnQgPQo+ ICsJCQkJKHNwcmVhZCAmIERQX05PX0FVWF9IQU5EU0hBS0VfTElOS19UUkFJTklORykgPwo+ICsJ CQkJCXRydWUgOiBmYWxzZTsKPiArCQl9Cj4gKwkJZGV2X2RiZyhkcC0+ZGV2LCAiZmFzdCBsaW5r IHRyYWluaW5nICVzXG4iLAo+ICsJCQlkcC0+ZmFzdF90cmFpbl9zdXBwb3J0ID8gInN1cHBvcnRl ZCIgOiAidW5zdXBwb3J0ZWQiKTsKPiArCj4gICAJCS8qIHNldCBlbmhhbmNlZCBtb2RlIGlmIGF2 YWlsYWJsZSAqLwo+ICAgCQlhbmFsb2dpeF9kcF9zZXRfZW5oYW5jZWRfbW9kZShkcCk7Cj4gICAJ CWRwLT5saW5rX3RyYWluLmx0X3N0YXRlID0gRklOSVNIRUQ7Cj4gQEAgLTYyNywxMCArNjQ0LDEy IEBAIHN0YXRpYyB2b2lkIGFuYWxvZ2l4X2RwX2dldF9tYXhfcnhfbGFuZV9jb3VudChzdHJ1Y3Qg YW5hbG9naXhfZHBfZGV2aWNlICpkcCwKPiAgIAkqbGFuZV9jb3VudCA9IERQQ0RfTUFYX0xBTkVf Q09VTlQoZGF0YSk7Cj4gICB9Cj4gICAKPiAtc3RhdGljIHZvaWQgYW5hbG9naXhfZHBfaW5pdF90 cmFpbmluZyhzdHJ1Y3QgYW5hbG9naXhfZHBfZGV2aWNlICpkcCwKPiAtCQkJCSAgICAgIGVudW0g bGlua19sYW5lX2NvdW50X3R5cGUgbWF4X2xhbmUsCj4gLQkJCQkgICAgICBpbnQgbWF4X3JhdGUp Cj4gK3N0YXRpYyBpbnQgYW5hbG9naXhfZHBfZnVsbF9saW5rX3RyYWluKHN0cnVjdCBhbmFsb2dp eF9kcF9kZXZpY2UgKmRwLAo+ICsJCQkJICAgICAgIHUzMiBtYXhfbGFuZXMsIHUzMiBtYXhfcmF0 ZSkKPiAgIHsKPiArCWludCByZXR2YWwgPSAwOwo+ICsJYm9vbCB0cmFpbmluZ19maW5pc2hlZCA9 IGZhbHNlOwo+ICsKPiAgIAkvKgo+ICAgCSAqIE1BQ1JPX1JTVCBtdXN0IGJlIGFwcGxpZWQgYWZ0 ZXIgdGhlIFBMTF9MT0NLIHRvIGF2b2lkCj4gICAJICogdGhlIERQIGludGVyIHBhaXIgc2tldyBp c3N1ZSBmb3IgYXQgbGVhc3QgMTAgdXMKPiBAQCAtNjU2LDE4ICs2NzUsMTMgQEAgc3RhdGljIHZv aWQgYW5hbG9naXhfZHBfaW5pdF90cmFpbmluZyhzdHJ1Y3QgYW5hbG9naXhfZHBfZGV2aWNlICpk cCwKPiAgIAl9Cj4gICAKPiAgIAkvKiBTZXR1cCBUWCBsYW5lIGNvdW50ICYgcmF0ZSAqLwo+IC0J aWYgKGRwLT5saW5rX3RyYWluLmxhbmVfY291bnQgPiBtYXhfbGFuZSkKPiAtCQlkcC0+bGlua190 cmFpbi5sYW5lX2NvdW50ID0gbWF4X2xhbmU7Cj4gKwlpZiAoZHAtPmxpbmtfdHJhaW4ubGFuZV9j b3VudCA+IG1heF9sYW5lcykKPiArCQlkcC0+bGlua190cmFpbi5sYW5lX2NvdW50ID0gbWF4X2xh bmVzOwo+ICAgCWlmIChkcC0+bGlua190cmFpbi5saW5rX3JhdGUgPiBtYXhfcmF0ZSkKPiAgIAkJ ZHAtPmxpbmtfdHJhaW4ubGlua19yYXRlID0gbWF4X3JhdGU7Cj4gICAKPiAgIAkvKiBBbGwgRFAg YW5hbG9nIG1vZHVsZSBwb3dlciB1cCAqLwo+ICAgCWFuYWxvZ2l4X2RwX3NldF9hbmFsb2dfcG93 ZXJfZG93bihkcCwgUE9XRVJfQUxMLCAwKTsKPiAtfQo+IC0KPiAtc3RhdGljIGludCBhbmFsb2dp eF9kcF9zd19saW5rX3RyYWluaW5nKHN0cnVjdCBhbmFsb2dpeF9kcF9kZXZpY2UgKmRwKQo+IC17 Cj4gLQlpbnQgcmV0dmFsID0gMCwgdHJhaW5pbmdfZmluaXNoZWQgPSAwOwo+ICAgCj4gICAJZHAt PmxpbmtfdHJhaW4ubHRfc3RhdGUgPSBTVEFSVDsKPiAgIAo+IEBAIC03MDIsMjIgKzcxNiw4OCBA QCBzdGF0aWMgaW50IGFuYWxvZ2l4X2RwX3N3X2xpbmtfdHJhaW5pbmcoc3RydWN0IGFuYWxvZ2l4 X2RwX2RldmljZSAqZHApCj4gICAJcmV0dXJuIHJldHZhbDsKPiAgIH0KPiAgIAo+IC1zdGF0aWMg aW50IGFuYWxvZ2l4X2RwX3NldF9saW5rX3RyYWluKHN0cnVjdCBhbmFsb2dpeF9kcF9kZXZpY2Ug KmRwLAo+IC0JCQkJICAgICAgdTMyIGNvdW50LCB1MzIgYnd0eXBlKQo+ICtzdGF0aWMgaW50IGFu YWxvZ2l4X2RwX2Zhc3RfbGlua190cmFpbihzdHJ1Y3QgYW5hbG9naXhfZHBfZGV2aWNlICpkcCkK PiAgIHsKPiAtCWludCBpOwo+IC0JaW50IHJldHZhbDsKPiArCWludCBpLCByZXQ7Cj4gKwl1OCBs aW5rX2FsaWduLCBsaW5rX3N0YXR1c1syXTsKPiArCWVudW0gcGxsX3N0YXR1cyBzdGF0dXM7Cj4g ICAKPiAtCWZvciAoaSA9IDA7IGkgPCBEUF9USU1FT1VUX0xPT1BfQ09VTlQ7IGkrKykgewo+IC0J CWFuYWxvZ2l4X2RwX2luaXRfdHJhaW5pbmcoZHAsIGNvdW50LCBid3R5cGUpOwo+IC0JCXJldHZh bCA9IGFuYWxvZ2l4X2RwX3N3X2xpbmtfdHJhaW5pbmcoZHApOwo+IC0JCWlmIChyZXR2YWwgPT0g MCkKPiAtCQkJYnJlYWs7Cj4gKwlhbmFsb2dpeF9kcF9yZXNldF9tYWNybyhkcCk7Cj4gKwo+ICsJ YW5hbG9naXhfZHBfc2V0X2xpbmtfYmFuZHdpZHRoKGRwLCBkcC0+bGlua190cmFpbi5saW5rX3Jh dGUpOwo+ICsJYW5hbG9naXhfZHBfc2V0X2xhbmVfY291bnQoZHAsIGRwLT5saW5rX3RyYWluLmxh bmVfY291bnQpOwo+ICAgCj4gLQkJdXNsZWVwX3JhbmdlKDEwMCwgMTEwKTsKPiArCWZvciAoaSA9 IDA7IGkgPCBkcC0+bGlua190cmFpbi5sYW5lX2NvdW50OyBpKyspIHsKPiArCQlhbmFsb2dpeF9k cF9zZXRfbGFuZV9saW5rX3RyYWluaW5nKGRwLAo+ICsJCQlkcC0+bGlua190cmFpbi50cmFpbmlu Z19sYW5lW2ldLCBpKTsKPiAgIAl9Cj4gICAKPiAtCXJldHVybiByZXR2YWw7Cj4gKwlyZXQgPSBy ZWFkeF9wb2xsX3RpbWVvdXQoYW5hbG9naXhfZHBfZ2V0X3BsbF9sb2NrX3N0YXR1cywgZHAsIHN0 YXR1cywKPiArCQkJCSBzdGF0dXMgIT0gUExMX1VOTE9DS0VELCAxMjAsCj4gKwkJCQkgMTIwICog RFBfVElNRU9VVF9MT09QX0NPVU5UKTsKPiArCWlmIChyZXQpIHsKPiArCQlEUk1fREVWX0VSUk9S KGRwLT5kZXYsICJXYWl0IGZvciBwbGwgbG9jayBmYWlsZWQgJWRcbiIsIHJldCk7Cj4gKwkJcmV0 dXJuIHJldDsKPiArCX0KPiArCj4gKwkvKiBzb3VyY2UgU2V0IHRyYWluaW5nIHBhdHRlcm4gMSAq Lwo+ICsJYW5hbG9naXhfZHBfc2V0X3RyYWluaW5nX3BhdHRlcm4oZHAsIFRSQUlOSU5HX1BUTjEp Owo+ICsJLyogRnJvbSBEUCBzcGVjLCBwYXR0ZXJuIG11c3QgYmUgb24tc2NyZWVuIGZvciBhIG1p bmltdW0gNTAwdXMgKi8KPiArCXVzbGVlcF9yYW5nZSg1MDAsIDYwMCk7Cj4gKwo+ICsJYW5hbG9n aXhfZHBfc2V0X3RyYWluaW5nX3BhdHRlcm4oZHAsIFRSQUlOSU5HX1BUTjIpOwo+ICsJLyogRnJv bSBEUCBzcGVjLCBwYXR0ZXJuIG11c3QgYmUgb24tc2NyZWVuIGZvciBhIG1pbmltdW0gNTAwdXMg Ki8KPiArCXVzbGVlcF9yYW5nZSg1MDAsIDYwMCk7Cj4gKwo+ICsJLyogVE9ETzogZW5oYW5jZWRf bW9kZT8qLwo+ICsJYW5hbG9naXhfZHBfc2V0X3RyYWluaW5nX3BhdHRlcm4oZHAsIERQX05PTkUp Owo+ICsKPiArCS8qCj4gKwkgKiBVc2VmdWwgZm9yIGRlYnVnZ2luZyBpc3N1ZXMgd2l0aCBmYXN0 IGxpbmsgdHJhaW5pbmcsIGRpc2FibGUgZm9yIG1vcmUKPiArCSAqIHNwZWVkCj4gKwkgKi8KPiAr CWlmICh2ZXJpZnlfZmFzdF90cmFpbmluZykgewo+ICsJCXJldCA9IGRybV9kcF9kcGNkX3JlYWRi KCZkcC0+YXV4LCBEUF9MQU5FX0FMSUdOX1NUQVRVU19VUERBVEVELAo+ICsJCQkJCSZsaW5rX2Fs aWduKTsKPiArCQlpZiAocmV0IDwgMCkgewo+ICsJCQlEUk1fREVWX0VSUk9SKGRwLT5kZXYsICJS ZWFkIGFsaWduIHN0YXR1cyBmYWlsZWQgJWRcbiIsCj4gKwkJCQkgICAgICByZXQpOwo+ICsJCQly ZXR1cm4gcmV0Owo+ICsJCX0KPiArCj4gKwkJcmV0ID0gZHJtX2RwX2RwY2RfcmVhZCgmZHAtPmF1 eCwgRFBfTEFORTBfMV9TVEFUVVMsIGxpbmtfc3RhdHVzLAo+ICsJCQkJICAgICAgIDIpOwo+ICsJ CWlmIChyZXQgPCAwKSB7Cj4gKwkJCURSTV9ERVZfRVJST1IoZHAtPmRldiwgIlJlYWQgbGluayBz dGF0dXMgZmFpbGVkICVkXG4iLAo+ICsJCQkJICAgICAgcmV0KTsKPiArCQkJcmV0dXJuIHJldDsK PiArCQl9Cj4gKwo+ICsJCWlmIChhbmFsb2dpeF9kcF9jbG9ja19yZWNvdmVyeV9vayhsaW5rX3N0 YXR1cywKPiArCQkJCQkJICBkcC0+bGlua190cmFpbi5sYW5lX2NvdW50KSkgewo+ICsJCQlEUk1f REVWX0VSUk9SKGRwLT5kZXYsICJDbG9jayByZWNvdmVyeSBmYWlsZWRcbiIpOwo+ICsJCQlhbmFs b2dpeF9kcF9yZWR1Y2VfbGlua19yYXRlKGRwKTsKPiArCQkJcmV0dXJuIC1FSU87Cj4gKwkJfQo+ ICsKPiArCQlpZiAoYW5hbG9naXhfZHBfY2hhbm5lbF9lcV9vayhsaW5rX3N0YXR1cywgbGlua19h bGlnbiwKPiArCQkJCQkgICAgICBkcC0+bGlua190cmFpbi5sYW5lX2NvdW50KSkgewo+ICsJCQlE Uk1fREVWX0VSUk9SKGRwLT5kZXYsICJDaGFubmVsIEVRIGZhaWxlZFxuIik7Cj4gKwkJCWFuYWxv Z2l4X2RwX3JlZHVjZV9saW5rX3JhdGUoZHApOwo+ICsJCQlyZXR1cm4gLUVJTzsKPiArCQl9Cj4g Kwl9Cj4gKwo+ICsJcmV0dXJuIDA7Cj4gK30KPiArCj4gK3N0YXRpYyBpbnQgYW5hbG9naXhfZHBf dHJhaW5fbGluayhzdHJ1Y3QgYW5hbG9naXhfZHBfZGV2aWNlICpkcCkKPiArewo+ICsJaWYgKGRw LT5mYXN0X3RyYWluX3N1cHBvcnQpCj4gKwkJcmV0dXJuIGFuYWxvZ2l4X2RwX2Zhc3RfbGlua190 cmFpbihkcCk7Cj4gKwo+ICsJcmV0dXJuIGFuYWxvZ2l4X2RwX2Z1bGxfbGlua190cmFpbihkcCwg ZHAtPnZpZGVvX2luZm8ubWF4X2xhbmVfY291bnQsCj4gKwkJCQkJICAgZHAtPnZpZGVvX2luZm8u bWF4X2xpbmtfcmF0ZSk7Cj4gICB9Cj4gICAKPiAgIHN0YXRpYyBpbnQgYW5hbG9naXhfZHBfY29u ZmlnX3ZpZGVvKHN0cnVjdCBhbmFsb2dpeF9kcF9kZXZpY2UgKmRwKQo+IEBAIC04NDYsMTAgKzky NiwxMCBAQCBzdGF0aWMgdm9pZCBhbmFsb2dpeF9kcF9jb21taXQoc3RydWN0IGFuYWxvZ2l4X2Rw X2RldmljZSAqZHApCj4gICAJCQlEUk1fRVJST1IoImZhaWxlZCB0byBkaXNhYmxlIHRoZSBwYW5l bFxuIik7Cj4gICAJfQo+ICAgCj4gLQlyZXQgPSBhbmFsb2dpeF9kcF9zZXRfbGlua190cmFpbihk cCwgZHAtPnZpZGVvX2luZm8ubWF4X2xhbmVfY291bnQsCj4gLQkJCQkJIGRwLT52aWRlb19pbmZv Lm1heF9saW5rX3JhdGUpOwo+ICsJcmV0ID0gcmVhZHhfcG9sbF90aW1lb3V0KGFuYWxvZ2l4X2Rw X3RyYWluX2xpbmssIGRwLCByZXQsICFyZXQsIDEwMCwKPiArCQkJCSBEUF9USU1FT1VUX1RSQUlO SU5HX1VTICogNSk7Cj4gICAJaWYgKHJldCkgewo+IC0JCWRldl9lcnIoZHAtPmRldiwgInVuYWJs ZSB0byBkbyBsaW5rIHRyYWluXG4iKTsKPiArCQlkZXZfZXJyKGRwLT5kZXYsICJ1bmFibGUgdG8g ZG8gbGluayB0cmFpbiwgcmV0PSVkXG4iLCByZXQpOwo+ICAgCQlyZXR1cm47Cj4gICAJfQo+ICAg Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9icmlkZ2UvYW5hbG9naXgvYW5hbG9naXhf ZHBfY29yZS5oIGIvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9hbmFsb2dpeC9hbmFsb2dpeF9kcF9j b3JlLmgKPiBpbmRleCBlMTM1YTQyY2IxOWUuLjkyMDYwN2Q3ZWIzZSAxMDA2NDQKPiAtLS0gYS9k cml2ZXJzL2dwdS9kcm0vYnJpZGdlL2FuYWxvZ2l4L2FuYWxvZ2l4X2RwX2NvcmUuaAo+ICsrKyBi L2RyaXZlcnMvZ3B1L2RybS9icmlkZ2UvYW5hbG9naXgvYW5hbG9naXhfZHBfY29yZS5oCj4gQEAg LTIwLDYgKzIwLDggQEAKPiAgICNkZWZpbmUgTUFYX0NSX0xPT1AgNQo+ICAgI2RlZmluZSBNQVhf RVFfTE9PUCA1Cj4gICAKPiArLyogVHJhaW5pbmcgdGFrZXMgMjJtcyBpZiBBVVggY2hhbm5lbCBj b21tIGZhaWxzLiBVc2UgdGhpcyBhcyByZXRyeSBpbnRlcnZhbCAqLwo+ICsjZGVmaW5lIERQX1RJ TUVPVVRfVFJBSU5JTkdfVVMJCQkyMjAwMAo+ICAgI2RlZmluZSBEUF9USU1FT1VUX1BTUl9MT09Q X01TCQkJMzAwCj4gICAKPiAgIC8qIERQX01BWF9MQU5FX0NPVU5UICovCj4gQEAgLTE3MSw2ICsx NzMsNyBAQCBzdHJ1Y3QgYW5hbG9naXhfZHBfZGV2aWNlIHsKPiAgIAlpbnQJCQlocGRfZ3BpbzsK PiAgIAlib29sICAgICAgICAgICAgICAgICAgICBmb3JjZV9ocGQ7Cj4gICAJYm9vbAkJCXBzcl9l bmFibGU7Cj4gKwlib29sCQkJZmFzdF90cmFpbl9zdXBwb3J0Owo+ICAgCj4gICAJc3RydWN0IG11 dGV4CQlwYW5lbF9sb2NrOwo+ICAgCWJvb2wJCQlwYW5lbF9pc19tb2Rlc2V0Owo+IApfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGlu ZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 From: architt@codeaurora.org (Archit Taneja) Date: Wed, 14 Mar 2018 11:22:16 +0530 Subject: [PATCH v5 05/36] drm/bridge: analogix_dp: add fast link train for eDP In-Reply-To: <20180309222327.18689-6-enric.balletbo@collabora.com> References: <20180309222327.18689-1-enric.balletbo@collabora.com> <20180309222327.18689-6-enric.balletbo@collabora.com> Message-ID: <912773b9-e72b-11d1-e459-bbd765451f3c@codeaurora.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Saturday 10 March 2018 03:52 AM, Enric Balletbo i Serra wrote: > From: zain wang > > We would meet a short black screen when exit PSR with the full link > training, In this case, we should use fast link train instead of full > link training. > > Signed-off-by: zain wang > Signed-off-by: Sean Paul > Signed-off-by: Thierry Escande > Signed-off-by: Enric Balletbo i Serra > Tested-by: Marek Szyprowski > --- > > drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 142 ++++++++++++++++----- > drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 3 + > 2 files changed, 114 insertions(+), 31 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c > index ee00d3d920e0..806c3878b3d6 100644 > --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c > +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c > @@ -10,17 +10,18 @@ > * option) any later version. > */ > > -#include > -#include > -#include > #include > -#include > +#include > +#include > +#include > #include > +#include > +#include > +#include > #include > #include > -#include > -#include > #include > +#include This re-ordering doesn't seem like it should be a part of this patch, you can let it stay if it happens to cause conflicts with future patches. Other than that: Reviewed-by: Archit Taneja Thanks, Archit > > #include > #include > @@ -35,6 +36,8 @@ > > #define to_dp(nm) container_of(nm, struct analogix_dp_device, nm) > > +static const bool verify_fast_training; > + > struct bridge_init { > struct i2c_client *client; > struct device_node *node; > @@ -528,7 +531,7 @@ static int analogix_dp_process_equalizer_training(struct analogix_dp_device *dp) > { > int lane, lane_count, retval; > u32 reg; > - u8 link_align, link_status[2], adjust_request[2]; > + u8 link_align, link_status[2], adjust_request[2], spread; > > usleep_range(400, 401); > > @@ -571,6 +574,20 @@ static int analogix_dp_process_equalizer_training(struct analogix_dp_device *dp) > dev_dbg(dp->dev, "final lane count = %.2x\n", > dp->link_train.lane_count); > > + retval = drm_dp_dpcd_readb(&dp->aux, DP_MAX_DOWNSPREAD, > + &spread); > + if (retval != 1) { > + dev_err(dp->dev, "failed to read downspread %d\n", > + retval); > + dp->fast_train_support = false; > + } else { > + dp->fast_train_support = > + (spread & DP_NO_AUX_HANDSHAKE_LINK_TRAINING) ? > + true : false; > + } > + dev_dbg(dp->dev, "fast link training %s\n", > + dp->fast_train_support ? "supported" : "unsupported"); > + > /* set enhanced mode if available */ > analogix_dp_set_enhanced_mode(dp); > dp->link_train.lt_state = FINISHED; > @@ -627,10 +644,12 @@ static void analogix_dp_get_max_rx_lane_count(struct analogix_dp_device *dp, > *lane_count = DPCD_MAX_LANE_COUNT(data); > } > > -static void analogix_dp_init_training(struct analogix_dp_device *dp, > - enum link_lane_count_type max_lane, > - int max_rate) > +static int analogix_dp_full_link_train(struct analogix_dp_device *dp, > + u32 max_lanes, u32 max_rate) > { > + int retval = 0; > + bool training_finished = false; > + > /* > * MACRO_RST must be applied after the PLL_LOCK to avoid > * the DP inter pair skew issue for at least 10 us > @@ -656,18 +675,13 @@ static void analogix_dp_init_training(struct analogix_dp_device *dp, > } > > /* Setup TX lane count & rate */ > - if (dp->link_train.lane_count > max_lane) > - dp->link_train.lane_count = max_lane; > + if (dp->link_train.lane_count > max_lanes) > + dp->link_train.lane_count = max_lanes; > if (dp->link_train.link_rate > max_rate) > dp->link_train.link_rate = max_rate; > > /* All DP analog module power up */ > analogix_dp_set_analog_power_down(dp, POWER_ALL, 0); > -} > - > -static int analogix_dp_sw_link_training(struct analogix_dp_device *dp) > -{ > - int retval = 0, training_finished = 0; > > dp->link_train.lt_state = START; > > @@ -702,22 +716,88 @@ static int analogix_dp_sw_link_training(struct analogix_dp_device *dp) > return retval; > } > > -static int analogix_dp_set_link_train(struct analogix_dp_device *dp, > - u32 count, u32 bwtype) > +static int analogix_dp_fast_link_train(struct analogix_dp_device *dp) > { > - int i; > - int retval; > + int i, ret; > + u8 link_align, link_status[2]; > + enum pll_status status; > > - for (i = 0; i < DP_TIMEOUT_LOOP_COUNT; i++) { > - analogix_dp_init_training(dp, count, bwtype); > - retval = analogix_dp_sw_link_training(dp); > - if (retval == 0) > - break; > + analogix_dp_reset_macro(dp); > + > + analogix_dp_set_link_bandwidth(dp, dp->link_train.link_rate); > + analogix_dp_set_lane_count(dp, dp->link_train.lane_count); > > - usleep_range(100, 110); > + for (i = 0; i < dp->link_train.lane_count; i++) { > + analogix_dp_set_lane_link_training(dp, > + dp->link_train.training_lane[i], i); > } > > - return retval; > + ret = readx_poll_timeout(analogix_dp_get_pll_lock_status, dp, status, > + status != PLL_UNLOCKED, 120, > + 120 * DP_TIMEOUT_LOOP_COUNT); > + if (ret) { > + DRM_DEV_ERROR(dp->dev, "Wait for pll lock failed %d\n", ret); > + return ret; > + } > + > + /* source Set training pattern 1 */ > + analogix_dp_set_training_pattern(dp, TRAINING_PTN1); > + /* From DP spec, pattern must be on-screen for a minimum 500us */ > + usleep_range(500, 600); > + > + analogix_dp_set_training_pattern(dp, TRAINING_PTN2); > + /* From DP spec, pattern must be on-screen for a minimum 500us */ > + usleep_range(500, 600); > + > + /* TODO: enhanced_mode?*/ > + analogix_dp_set_training_pattern(dp, DP_NONE); > + > + /* > + * Useful for debugging issues with fast link training, disable for more > + * speed > + */ > + if (verify_fast_training) { > + ret = drm_dp_dpcd_readb(&dp->aux, DP_LANE_ALIGN_STATUS_UPDATED, > + &link_align); > + if (ret < 0) { > + DRM_DEV_ERROR(dp->dev, "Read align status failed %d\n", > + ret); > + return ret; > + } > + > + ret = drm_dp_dpcd_read(&dp->aux, DP_LANE0_1_STATUS, link_status, > + 2); > + if (ret < 0) { > + DRM_DEV_ERROR(dp->dev, "Read link status failed %d\n", > + ret); > + return ret; > + } > + > + if (analogix_dp_clock_recovery_ok(link_status, > + dp->link_train.lane_count)) { > + DRM_DEV_ERROR(dp->dev, "Clock recovery failed\n"); > + analogix_dp_reduce_link_rate(dp); > + return -EIO; > + } > + > + if (analogix_dp_channel_eq_ok(link_status, link_align, > + dp->link_train.lane_count)) { > + DRM_DEV_ERROR(dp->dev, "Channel EQ failed\n"); > + analogix_dp_reduce_link_rate(dp); > + return -EIO; > + } > + } > + > + return 0; > +} > + > +static int analogix_dp_train_link(struct analogix_dp_device *dp) > +{ > + if (dp->fast_train_support) > + return analogix_dp_fast_link_train(dp); > + > + return analogix_dp_full_link_train(dp, dp->video_info.max_lane_count, > + dp->video_info.max_link_rate); > } > > static int analogix_dp_config_video(struct analogix_dp_device *dp) > @@ -846,10 +926,10 @@ static void analogix_dp_commit(struct analogix_dp_device *dp) > DRM_ERROR("failed to disable the panel\n"); > } > > - ret = analogix_dp_set_link_train(dp, dp->video_info.max_lane_count, > - dp->video_info.max_link_rate); > + ret = readx_poll_timeout(analogix_dp_train_link, dp, ret, !ret, 100, > + DP_TIMEOUT_TRAINING_US * 5); > if (ret) { > - dev_err(dp->dev, "unable to do link train\n"); > + dev_err(dp->dev, "unable to do link train, ret=%d\n", ret); > return; > } > > diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h > index e135a42cb19e..920607d7eb3e 100644 > --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h > +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h > @@ -20,6 +20,8 @@ > #define MAX_CR_LOOP 5 > #define MAX_EQ_LOOP 5 > > +/* Training takes 22ms if AUX channel comm fails. Use this as retry interval */ > +#define DP_TIMEOUT_TRAINING_US 22000 > #define DP_TIMEOUT_PSR_LOOP_MS 300 > > /* DP_MAX_LANE_COUNT */ > @@ -171,6 +173,7 @@ struct analogix_dp_device { > int hpd_gpio; > bool force_hpd; > bool psr_enable; > + bool fast_train_support; > > struct mutex panel_lock; > bool panel_is_modeset; >