From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754102AbcC1Odw (ORCPT ); Mon, 28 Mar 2016 10:33:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53774 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753790AbcC1Ods (ORCPT ); Mon, 28 Mar 2016 10:33:48 -0400 From: Lyude To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: arthur.j.runyan@intel.com, =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Jani Nikula , Lyude , David Airlie , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v4 RESEND 2/5] drm/dp_helper: Always wait before retrying native aux transactions Date: Mon, 28 Mar 2016 10:33:23 -0400 Message-Id: <1459175606-13875-3-git-send-email-cpaul@redhat.com> In-Reply-To: <1459175606-13875-1-git-send-email-cpaul@redhat.com> References: <1459175606-13875-1-git-send-email-cpaul@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is part of a patch series to migrate all of the workarounds for commonly seen behavior from bad sinks in intel_dp_dpcd_read_wake() to drm's DP helper. Some sinks need some time during the process of resuming the system from sleep before they're ready to handle transactions. While it would be nice if they responded with NACKs in these scenarios, this isn't always the case as a few sinks will just timeout on all of the transactions they receive until they're ready. Signed-off-by: Lyude --- drivers/gpu/drm/drm_dp_helper.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c index d1128fb..3b915e2 100644 --- a/drivers/gpu/drm/drm_dp_helper.c +++ b/drivers/gpu/drm/drm_dp_helper.c @@ -179,7 +179,7 @@ static int drm_dp_dpcd_access(struct drm_dp_aux *aux, u8 request, { struct drm_dp_aux_msg msg; unsigned int retry; - int err; + int err = 0; memset(&msg, 0, sizeof(msg)); msg.address = offset; @@ -194,6 +194,10 @@ static int drm_dp_dpcd_access(struct drm_dp_aux *aux, u8 request, * sufficient, bump to 32 which makes Dell 4k monitors happier. */ for (retry = 0; retry < 32; retry++) { + if (err != 0 && err != -ETIMEDOUT) { + usleep_range(AUX_RETRY_INTERVAL, + AUX_RETRY_INTERVAL + 100); + } mutex_lock(&aux->hw_mutex); err = aux->transfer(aux, &msg); @@ -205,7 +209,6 @@ static int drm_dp_dpcd_access(struct drm_dp_aux *aux, u8 request, return err; } - switch (msg.reply & DP_AUX_NATIVE_REPLY_MASK) { case DP_AUX_NATIVE_REPLY_ACK: if (err < size) @@ -214,10 +217,6 @@ static int drm_dp_dpcd_access(struct drm_dp_aux *aux, u8 request, case DP_AUX_NATIVE_REPLY_NACK: return -EIO; - - case DP_AUX_NATIVE_REPLY_DEFER: - usleep_range(AUX_RETRY_INTERVAL, AUX_RETRY_INTERVAL + 100); - break; } } -- 2.5.5 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lyude Subject: [PATCH v4 RESEND 2/5] drm/dp_helper: Always wait before retrying native aux transactions Date: Mon, 28 Mar 2016 10:33:23 -0400 Message-ID: <1459175606-13875-3-git-send-email-cpaul@redhat.com> References: <1459175606-13875-1-git-send-email-cpaul@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1459175606-13875-1-git-send-email-cpaul@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: arthur.j.runyan@intel.com, open list , Lyude List-Id: dri-devel@lists.freedesktop.org VGhpcyBpcyBwYXJ0IG9mIGEgcGF0Y2ggc2VyaWVzIHRvIG1pZ3JhdGUgYWxsIG9mIHRoZSB3b3Jr YXJvdW5kcyBmb3IKY29tbW9ubHkgc2VlbiBiZWhhdmlvciBmcm9tIGJhZCBzaW5rcyBpbiBpbnRl bF9kcF9kcGNkX3JlYWRfd2FrZSgpIHRvCmRybSdzIERQIGhlbHBlci4KClNvbWUgc2lua3MgbmVl ZCBzb21lIHRpbWUgZHVyaW5nIHRoZSBwcm9jZXNzIG9mIHJlc3VtaW5nIHRoZSBzeXN0ZW0gZnJv bQpzbGVlcCBiZWZvcmUgdGhleSdyZSByZWFkeSB0byBoYW5kbGUgdHJhbnNhY3Rpb25zLiBXaGls ZSBpdCB3b3VsZCBiZQpuaWNlIGlmIHRoZXkgcmVzcG9uZGVkIHdpdGggTkFDS3MgaW4gdGhlc2Ug c2NlbmFyaW9zLCB0aGlzIGlzbid0IGFsd2F5cwp0aGUgY2FzZSBhcyBhIGZldyBzaW5rcyB3aWxs IGp1c3QgdGltZW91dCBvbiBhbGwgb2YgdGhlIHRyYW5zYWN0aW9ucwp0aGV5IHJlY2VpdmUgdW50 aWwgdGhleSdyZSByZWFkeS4KClNpZ25lZC1vZmYtYnk6IEx5dWRlIDxjcGF1bEByZWRoYXQuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fZHBfaGVscGVyLmMgfCAxMSArKysrKy0tLS0tLQog MSBmaWxlIGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2RwX2hlbHBlci5jIGIvZHJpdmVycy9ncHUvZHJtL2Ry bV9kcF9oZWxwZXIuYwppbmRleCBkMTEyOGZiLi4zYjkxNWUyIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vZHJtX2RwX2hlbHBlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZHBfaGVs cGVyLmMKQEAgLTE3OSw3ICsxNzksNyBAQCBzdGF0aWMgaW50IGRybV9kcF9kcGNkX2FjY2Vzcyhz dHJ1Y3QgZHJtX2RwX2F1eCAqYXV4LCB1OCByZXF1ZXN0LAogewogCXN0cnVjdCBkcm1fZHBfYXV4 X21zZyBtc2c7CiAJdW5zaWduZWQgaW50IHJldHJ5OwotCWludCBlcnI7CisJaW50IGVyciA9IDA7 CiAKIAltZW1zZXQoJm1zZywgMCwgc2l6ZW9mKG1zZykpOwogCW1zZy5hZGRyZXNzID0gb2Zmc2V0 OwpAQCAtMTk0LDYgKzE5NCwxMCBAQCBzdGF0aWMgaW50IGRybV9kcF9kcGNkX2FjY2VzcyhzdHJ1 Y3QgZHJtX2RwX2F1eCAqYXV4LCB1OCByZXF1ZXN0LAogCSAqIHN1ZmZpY2llbnQsIGJ1bXAgdG8g MzIgd2hpY2ggbWFrZXMgRGVsbCA0ayBtb25pdG9ycyBoYXBwaWVyLgogCSAqLwogCWZvciAocmV0 cnkgPSAwOyByZXRyeSA8IDMyOyByZXRyeSsrKSB7CisJCWlmIChlcnIgIT0gMCAmJiBlcnIgIT0g LUVUSU1FRE9VVCkgeworCQkJdXNsZWVwX3JhbmdlKEFVWF9SRVRSWV9JTlRFUlZBTCwKKwkJCQkg ICAgIEFVWF9SRVRSWV9JTlRFUlZBTCArIDEwMCk7CisJCX0KIAogCQltdXRleF9sb2NrKCZhdXgt Pmh3X211dGV4KTsKIAkJZXJyID0gYXV4LT50cmFuc2ZlcihhdXgsICZtc2cpOwpAQCAtMjA1LDcg KzIwOSw2IEBAIHN0YXRpYyBpbnQgZHJtX2RwX2RwY2RfYWNjZXNzKHN0cnVjdCBkcm1fZHBfYXV4 ICphdXgsIHU4IHJlcXVlc3QsCiAJCQlyZXR1cm4gZXJyOwogCQl9CiAKLQogCQlzd2l0Y2ggKG1z Zy5yZXBseSAmIERQX0FVWF9OQVRJVkVfUkVQTFlfTUFTSykgewogCQljYXNlIERQX0FVWF9OQVRJ VkVfUkVQTFlfQUNLOgogCQkJaWYgKGVyciA8IHNpemUpCkBAIC0yMTQsMTAgKzIxNyw2IEBAIHN0 YXRpYyBpbnQgZHJtX2RwX2RwY2RfYWNjZXNzKHN0cnVjdCBkcm1fZHBfYXV4ICphdXgsIHU4IHJl cXVlc3QsCiAKIAkJY2FzZSBEUF9BVVhfTkFUSVZFX1JFUExZX05BQ0s6CiAJCQlyZXR1cm4gLUVJ TzsKLQotCQljYXNlIERQX0FVWF9OQVRJVkVfUkVQTFlfREVGRVI6Ci0JCQl1c2xlZXBfcmFuZ2Uo QVVYX1JFVFJZX0lOVEVSVkFMLCBBVVhfUkVUUllfSU5URVJWQUwgKyAxMDApOwotCQkJYnJlYWs7 CiAJCX0KIAl9CiAKLS0gCjIuNS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9kcmktZGV2ZWwK