From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 54770C004C9 for ; Tue, 7 May 2019 05:36:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2498E21479 for ; Tue, 7 May 2019 05:36:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557207400; bh=vZ7fddoN+6y18PR0+sMC9+VC7G8zQx2whTfDrhw4ZHo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oq+nsS5C4gcBjcLeGZtP9u1vJgGyLlVfjq0w6MyMj7Toyp0ZbFeJNV3zOCMXmDO3e XW+bUDLlN1/81TlBClGuOZDwDBMJbJ8yEKlDAMf+RHJg51BzBNktVOALztCxXbZRku prYFgUH06jz8T/JDS//iqhM3Ob6A9+aIpBV17MKE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728122AbfEGFgi (ORCPT ); Tue, 7 May 2019 01:36:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:56458 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726666AbfEGFgg (ORCPT ); Tue, 7 May 2019 01:36:36 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E6D3D20989; Tue, 7 May 2019 05:36:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557207396; bh=vZ7fddoN+6y18PR0+sMC9+VC7G8zQx2whTfDrhw4ZHo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DVelqyRnJJGRfVddOkWoohK3WxdPRTWt/nL+byB28+pPb13PddhCOe51dhakmwTSh v2lfExPnblu7kiOuJB6ZQngo1TZ/5ah1RZeDBCZ/CaB3qfgg6Hc5ggNE/uAZ0Zc3Bs mD1OnCJk78RrF+MvHnalEzGVxSifho8v0rWaTOMI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Martin Leung , Jun Lei , Joshua Aberback , Leo Li , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.19 20/81] drm/amd/display: extending AUX SW Timeout Date: Tue, 7 May 2019 01:34:51 -0400 Message-Id: <20190507053554.30848-20-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190507053554.30848-1-sashal@kernel.org> References: <20190507053554.30848-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Martin Leung [ Upstream commit f4bbebf8e7eb4d294b040ab2d2ba71e70e69b930 ] [Why] AUX takes longer to reply when using active DP-DVI dongle on some asics resulting in up to 2000+ us edid read (timeout). [How] 1. Adjust AUX poll to match spec 2. Extend the SW timeout. This does not affect normal operation since we exit the loop as soon as AUX acks. Signed-off-by: Martin Leung Reviewed-by: Jun Lei Acked-by: Joshua Aberback Acked-by: Leo Li Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 9 ++++++--- drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c b/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c index 3f5b2e6f7553..df936edac5c7 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c @@ -189,6 +189,12 @@ static void submit_channel_request( 1, 0); } + + REG_UPDATE(AUX_INTERRUPT_CONTROL, AUX_SW_DONE_ACK, 1); + + REG_WAIT(AUX_SW_STATUS, AUX_SW_DONE, 0, + 10, aux110->timeout_period/10); + /* set the delay and the number of bytes to write */ /* The length include @@ -241,9 +247,6 @@ static void submit_channel_request( } } - REG_UPDATE(AUX_INTERRUPT_CONTROL, AUX_SW_DONE_ACK, 1); - REG_WAIT(AUX_SW_STATUS, AUX_SW_DONE, 0, - 10, aux110->timeout_period/10); REG_UPDATE(AUX_SW_CONTROL, AUX_SW_GO, 1); } diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_aux.h b/drivers/gpu/drm/amd/display/dc/dce/dce_aux.h index f7caab85dc80..2c6f50b4245a 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_aux.h +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_aux.h @@ -69,11 +69,11 @@ enum { /* This is the timeout as defined in DP 1.2a, * at most within ~240usec. That means, * increasing this timeout will not affect normal operation, * and we'll timeout after - * SW_AUX_TIMEOUT_PERIOD_MULTIPLIER * AUX_TIMEOUT_PERIOD = 1600usec. + * SW_AUX_TIMEOUT_PERIOD_MULTIPLIER * AUX_TIMEOUT_PERIOD = 2400usec. * This timeout is especially important for - * resume from S3 and CTS. + * converters, resume from S3, and CTS. */ - SW_AUX_TIMEOUT_PERIOD_MULTIPLIER = 4 + SW_AUX_TIMEOUT_PERIOD_MULTIPLIER = 6 }; struct aux_engine_dce110 { struct aux_engine base; -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.19 20/81] drm/amd/display: extending AUX SW Timeout Date: Tue, 7 May 2019 01:34:51 -0400 Message-ID: <20190507053554.30848-20-sashal@kernel.org> References: <20190507053554.30848-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190507053554.30848-1-sashal-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Sasha Levin , Joshua Aberback , Leo Li , amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Martin Leung , Alex Deucher , Jun Lei List-Id: dri-devel@lists.freedesktop.org RnJvbTogTWFydGluIExldW5nIDxtYXJ0aW4ubGV1bmdAYW1kLmNvbT4KClsgVXBzdHJlYW0gY29t bWl0IGY0YmJlYmY4ZTdlYjRkMjk0YjA0MGFiMmQyYmE3MWU3MGU2OWI5MzAgXQoKW1doeV0KQVVY IHRha2VzIGxvbmdlciB0byByZXBseSB3aGVuIHVzaW5nIGFjdGl2ZSBEUC1EVkkgZG9uZ2xlIG9u IHNvbWUgYXNpY3MKcmVzdWx0aW5nIGluIHVwIHRvIDIwMDArIHVzIGVkaWQgcmVhZCAodGltZW91 dCkuCgpbSG93XQoxLiBBZGp1c3QgQVVYIHBvbGwgdG8gbWF0Y2ggc3BlYwoyLiBFeHRlbmQgdGhl IFNXIHRpbWVvdXQuIFRoaXMgZG9lcyBub3QgYWZmZWN0IG5vcm1hbApvcGVyYXRpb24gc2luY2Ug d2UgZXhpdCB0aGUgbG9vcCBhcyBzb29uIGFzIEFVWCBhY2tzLgoKU2lnbmVkLW9mZi1ieTogTWFy dGluIExldW5nIDxtYXJ0aW4ubGV1bmdAYW1kLmNvbT4KUmV2aWV3ZWQtYnk6IEp1biBMZWkgPEp1 bi5MZWlAYW1kLmNvbT4KQWNrZWQtYnk6IEpvc2h1YSBBYmVyYmFjayA8Sm9zaHVhLkFiZXJiYWNr QGFtZC5jb20+CkFja2VkLWJ5OiBMZW8gTGkgPHN1bnBlbmcubGlAYW1kLmNvbT4KU2lnbmVkLW9m Zi1ieTogQWxleCBEZXVjaGVyIDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29tPgpTaWduZWQtb2Zm LWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFsQGtlcm5lbC5vcmc+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2FtZC9kaXNwbGF5L2RjL2RjZS9kY2VfYXV4LmMgfCA5ICsrKysrKy0tLQogZHJpdmVycy9ncHUv ZHJtL2FtZC9kaXNwbGF5L2RjL2RjZS9kY2VfYXV4LmggfCA2ICsrKy0tLQogMiBmaWxlcyBjaGFu Z2VkLCA5IGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZS9kY2VfYXV4LmMgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2Rpc3BsYXkvZGMvZGNlL2RjZV9hdXguYwppbmRleCAzZjViMmU2Zjc1NTMuLmRmOTM2ZWRh YzVjNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZS9kY2Vf YXV4LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZS9kY2VfYXV4LmMK QEAgLTE4OSw2ICsxODksMTIgQEAgc3RhdGljIHZvaWQgc3VibWl0X2NoYW5uZWxfcmVxdWVzdCgK IAkJCQkxLAogCQkJCTApOwogCX0KKworCVJFR19VUERBVEUoQVVYX0lOVEVSUlVQVF9DT05UUk9M LCBBVVhfU1dfRE9ORV9BQ0ssIDEpOworCisJUkVHX1dBSVQoQVVYX1NXX1NUQVRVUywgQVVYX1NX X0RPTkUsIDAsCisJCQkJMTAsIGF1eDExMC0+dGltZW91dF9wZXJpb2QvMTApOworCiAJLyogc2V0 IHRoZSBkZWxheSBhbmQgdGhlIG51bWJlciBvZiBieXRlcyB0byB3cml0ZSAqLwogCiAJLyogVGhl IGxlbmd0aCBpbmNsdWRlCkBAIC0yNDEsOSArMjQ3LDYgQEAgc3RhdGljIHZvaWQgc3VibWl0X2No YW5uZWxfcmVxdWVzdCgKIAkJfQogCX0KIAotCVJFR19VUERBVEUoQVVYX0lOVEVSUlVQVF9DT05U Uk9MLCBBVVhfU1dfRE9ORV9BQ0ssIDEpOwotCVJFR19XQUlUKEFVWF9TV19TVEFUVVMsIEFVWF9T V19ET05FLCAwLAotCQkJCTEwLCBhdXgxMTAtPnRpbWVvdXRfcGVyaW9kLzEwKTsKIAlSRUdfVVBE QVRFKEFVWF9TV19DT05UUk9MLCBBVVhfU1dfR08sIDEpOwogfQogCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlL2RjZV9hdXguaCBiL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvZGlzcGxheS9kYy9kY2UvZGNlX2F1eC5oCmluZGV4IGY3Y2FhYjg1ZGM4MC4uMmM2ZjUw YjQyNDVhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlL2Rj ZV9hdXguaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlL2RjZV9hdXgu aApAQCAtNjksMTEgKzY5LDExIEBAIGVudW0gewkvKiBUaGlzIGlzIHRoZSB0aW1lb3V0IGFzIGRl ZmluZWQgaW4gRFAgMS4yYSwKIAkgKiBhdCBtb3N0IHdpdGhpbiB+MjQwdXNlYy4gVGhhdCBtZWFu cywKIAkgKiBpbmNyZWFzaW5nIHRoaXMgdGltZW91dCB3aWxsIG5vdCBhZmZlY3Qgbm9ybWFsIG9w ZXJhdGlvbiwKIAkgKiBhbmQgd2UnbGwgdGltZW91dCBhZnRlcgotCSAqIFNXX0FVWF9USU1FT1VU X1BFUklPRF9NVUxUSVBMSUVSICogQVVYX1RJTUVPVVRfUEVSSU9EID0gMTYwMHVzZWMuCisJICog U1dfQVVYX1RJTUVPVVRfUEVSSU9EX01VTFRJUExJRVIgKiBBVVhfVElNRU9VVF9QRVJJT0QgPSAy NDAwdXNlYy4KIAkgKiBUaGlzIHRpbWVvdXQgaXMgZXNwZWNpYWxseSBpbXBvcnRhbnQgZm9yCi0J ICogcmVzdW1lIGZyb20gUzMgYW5kIENUUy4KKwkgKiBjb252ZXJ0ZXJzLCByZXN1bWUgZnJvbSBT MywgYW5kIENUUy4KIAkgKi8KLQlTV19BVVhfVElNRU9VVF9QRVJJT0RfTVVMVElQTElFUiA9IDQK KwlTV19BVVhfVElNRU9VVF9QRVJJT0RfTVVMVElQTElFUiA9IDYKIH07CiBzdHJ1Y3QgYXV4X2Vu Z2luZV9kY2UxMTAgewogCXN0cnVjdCBhdXhfZW5naW5lIGJhc2U7Ci0tIAoyLjIwLjEKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGlu ZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeA==