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=-10.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,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 91299C04EB9 for ; Wed, 5 Dec 2018 09:55:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5815D20661 for ; Wed, 5 Dec 2018 09:55:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="SLl7QWvD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5815D20661 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730053AbeLEJx6 (ORCPT ); Wed, 5 Dec 2018 04:53:58 -0500 Received: from mail.kernel.org ([198.145.29.99]:60650 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727767AbeLEJx4 (ORCPT ); Wed, 5 Dec 2018 04:53:56 -0500 Received: from sasha-vm.mshome.net (unknown [213.57.143.11]) (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 B0A2A2082B; Wed, 5 Dec 2018 09:53:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544003635; bh=Gj1XP6HVnpEpmyu7AfozOicVf2oFGcbSgdhBBGPnJ/E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SLl7QWvDxY0IDikHS2mjOI9spqg1Ffubf6ATOVZWXtui80HhAuFEIu4g3C0sUsaIo WQY94ZE3Fh2i7sLskEzy5aRrXRcV2JkZ6QdoAWc04HyKGcuUsNuEPtAuknD7xeFUPi tJGVAxYg2VkWCJQ4srVnMPhamvstaSUCoNEgBIik= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: "Y.C. Chen" , Dave Airlie , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.4 24/33] drm/ast: fixed reading monitor EDID not stable issue Date: Wed, 5 Dec 2018 04:51:22 -0500 Message-Id: <20181205095131.7685-24-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181205095131.7685-1-sashal@kernel.org> References: <20181205095131.7685-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Y.C. Chen" [ Upstream commit 300625620314194d9e6d4f6dda71f2dc9cf62d9f ] v1: over-sample data to increase the stability with some specific monitors v2: refine to avoid infinite loop v3: remove un-necessary "volatile" declaration [airlied: fix two checkpatch warnings] Signed-off-by: Y.C. Chen Signed-off-by: Dave Airlie Link: https://patchwork.freedesktop.org/patch/msgid/1542858988-1127-1-git-send-email-yc_chen@aspeedtech.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/ast/ast_mode.c | 36 ++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c index 21085f669e21..b19ba1792607 100644 --- a/drivers/gpu/drm/ast/ast_mode.c +++ b/drivers/gpu/drm/ast/ast_mode.c @@ -968,9 +968,21 @@ static int get_clock(void *i2c_priv) { struct ast_i2c_chan *i2c = i2c_priv; struct ast_private *ast = i2c->dev->dev_private; - uint32_t val; + uint32_t val, val2, count, pass; + + count = 0; + pass = 0; + val = (ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb7, 0x10) >> 4) & 0x01; + do { + val2 = (ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb7, 0x10) >> 4) & 0x01; + if (val == val2) { + pass++; + } else { + pass = 0; + val = (ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb7, 0x10) >> 4) & 0x01; + } + } while ((pass < 5) && (count++ < 0x10000)); - val = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb7, 0x10) >> 4; return val & 1 ? 1 : 0; } @@ -978,9 +990,21 @@ static int get_data(void *i2c_priv) { struct ast_i2c_chan *i2c = i2c_priv; struct ast_private *ast = i2c->dev->dev_private; - uint32_t val; + uint32_t val, val2, count, pass; + + count = 0; + pass = 0; + val = (ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb7, 0x20) >> 5) & 0x01; + do { + val2 = (ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb7, 0x20) >> 5) & 0x01; + if (val == val2) { + pass++; + } else { + pass = 0; + val = (ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb7, 0x20) >> 5) & 0x01; + } + } while ((pass < 5) && (count++ < 0x10000)); - val = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb7, 0x20) >> 5; return val & 1 ? 1 : 0; } @@ -993,7 +1017,7 @@ static void set_clock(void *i2c_priv, int clock) for (i = 0; i < 0x10000; i++) { ujcrb7 = ((clock & 0x01) ? 0 : 1); - ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb7, 0xfe, ujcrb7); + ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb7, 0xf4, ujcrb7); jtemp = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb7, 0x01); if (ujcrb7 == jtemp) break; @@ -1009,7 +1033,7 @@ static void set_data(void *i2c_priv, int data) for (i = 0; i < 0x10000; i++) { ujcrb7 = ((data & 0x01) ? 0 : 1) << 2; - ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb7, 0xfb, ujcrb7); + ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb7, 0xf1, ujcrb7); jtemp = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb7, 0x04); if (ujcrb7 == jtemp) break; -- 2.17.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.4 24/33] drm/ast: fixed reading monitor EDID not stable issue Date: Wed, 5 Dec 2018 04:51:22 -0500 Message-ID: <20181205095131.7685-24-sashal@kernel.org> References: <20181205095131.7685-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id AAECD6E3C2 for ; Wed, 5 Dec 2018 09:53:55 +0000 (UTC) In-Reply-To: <20181205095131.7685-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sasha Levin , Dave Airlie , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogIlkuQy4gQ2hlbiIgPHljX2NoZW5AYXNwZWVkdGVjaC5jb20+CgpbIFVwc3RyZWFtIGNv bW1pdCAzMDA2MjU2MjAzMTQxOTRkOWU2ZDRmNmRkYTcxZjJkYzljZjYyZDlmIF0KCnYxOiBvdmVy LXNhbXBsZSBkYXRhIHRvIGluY3JlYXNlIHRoZSBzdGFiaWxpdHkgd2l0aCBzb21lIHNwZWNpZmlj IG1vbml0b3JzCnYyOiByZWZpbmUgdG8gYXZvaWQgaW5maW5pdGUgbG9vcAp2MzogcmVtb3ZlIHVu LW5lY2Vzc2FyeSAidm9sYXRpbGUiIGRlY2xhcmF0aW9uCgpbYWlybGllZDogZml4IHR3byBjaGVj a3BhdGNoIHdhcm5pbmdzXQoKU2lnbmVkLW9mZi1ieTogWS5DLiBDaGVuIDx5Y19jaGVuQGFzcGVl ZHRlY2guY29tPgpTaWduZWQtb2ZmLWJ5OiBEYXZlIEFpcmxpZSA8YWlybGllZEByZWRoYXQuY29t PgpMaW5rOiBodHRwczovL3BhdGNod29yay5mcmVlZGVza3RvcC5vcmcvcGF0Y2gvbXNnaWQvMTU0 Mjg1ODk4OC0xMTI3LTEtZ2l0LXNlbmQtZW1haWwteWNfY2hlbkBhc3BlZWR0ZWNoLmNvbQpTaWdu ZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFsQGtlcm5lbC5vcmc+Ci0tLQogZHJpdmVycy9n cHUvZHJtL2FzdC9hc3RfbW9kZS5jIHwgMzYgKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0t LS0tLQogMSBmaWxlIGNoYW5nZWQsIDMwIGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FzdC9hc3RfbW9kZS5jIGIvZHJpdmVycy9ncHUv ZHJtL2FzdC9hc3RfbW9kZS5jCmluZGV4IDIxMDg1ZjY2OWUyMS4uYjE5YmExNzkyNjA3IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYXN0L2FzdF9tb2RlLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2FzdC9hc3RfbW9kZS5jCkBAIC05NjgsOSArOTY4LDIxIEBAIHN0YXRpYyBpbnQgZ2V0X2Ns b2NrKHZvaWQgKmkyY19wcml2KQogewogCXN0cnVjdCBhc3RfaTJjX2NoYW4gKmkyYyA9IGkyY19w cml2OwogCXN0cnVjdCBhc3RfcHJpdmF0ZSAqYXN0ID0gaTJjLT5kZXYtPmRldl9wcml2YXRlOwot CXVpbnQzMl90IHZhbDsKKwl1aW50MzJfdCB2YWwsIHZhbDIsIGNvdW50LCBwYXNzOworCisJY291 bnQgPSAwOworCXBhc3MgPSAwOworCXZhbCA9IChhc3RfZ2V0X2luZGV4X3JlZ19tYXNrKGFzdCwg QVNUX0lPX0NSVENfUE9SVCwgMHhiNywgMHgxMCkgPj4gNCkgJiAweDAxOworCWRvIHsKKwkJdmFs MiA9IChhc3RfZ2V0X2luZGV4X3JlZ19tYXNrKGFzdCwgQVNUX0lPX0NSVENfUE9SVCwgMHhiNywg MHgxMCkgPj4gNCkgJiAweDAxOworCQlpZiAodmFsID09IHZhbDIpIHsKKwkJCXBhc3MrKzsKKwkJ fSBlbHNlIHsKKwkJCXBhc3MgPSAwOworCQkJdmFsID0gKGFzdF9nZXRfaW5kZXhfcmVnX21hc2so YXN0LCBBU1RfSU9fQ1JUQ19QT1JULCAweGI3LCAweDEwKSA+PiA0KSAmIDB4MDE7CisJCX0KKwl9 IHdoaWxlICgocGFzcyA8IDUpICYmIChjb3VudCsrIDwgMHgxMDAwMCkpOwogCi0JdmFsID0gYXN0 X2dldF9pbmRleF9yZWdfbWFzayhhc3QsIEFTVF9JT19DUlRDX1BPUlQsIDB4YjcsIDB4MTApID4+ IDQ7CiAJcmV0dXJuIHZhbCAmIDEgPyAxIDogMDsKIH0KIApAQCAtOTc4LDkgKzk5MCwyMSBAQCBz dGF0aWMgaW50IGdldF9kYXRhKHZvaWQgKmkyY19wcml2KQogewogCXN0cnVjdCBhc3RfaTJjX2No YW4gKmkyYyA9IGkyY19wcml2OwogCXN0cnVjdCBhc3RfcHJpdmF0ZSAqYXN0ID0gaTJjLT5kZXYt PmRldl9wcml2YXRlOwotCXVpbnQzMl90IHZhbDsKKwl1aW50MzJfdCB2YWwsIHZhbDIsIGNvdW50 LCBwYXNzOworCisJY291bnQgPSAwOworCXBhc3MgPSAwOworCXZhbCA9IChhc3RfZ2V0X2luZGV4 X3JlZ19tYXNrKGFzdCwgQVNUX0lPX0NSVENfUE9SVCwgMHhiNywgMHgyMCkgPj4gNSkgJiAweDAx OworCWRvIHsKKwkJdmFsMiA9IChhc3RfZ2V0X2luZGV4X3JlZ19tYXNrKGFzdCwgQVNUX0lPX0NS VENfUE9SVCwgMHhiNywgMHgyMCkgPj4gNSkgJiAweDAxOworCQlpZiAodmFsID09IHZhbDIpIHsK KwkJCXBhc3MrKzsKKwkJfSBlbHNlIHsKKwkJCXBhc3MgPSAwOworCQkJdmFsID0gKGFzdF9nZXRf aW5kZXhfcmVnX21hc2soYXN0LCBBU1RfSU9fQ1JUQ19QT1JULCAweGI3LCAweDIwKSA+PiA1KSAm IDB4MDE7CisJCX0KKwl9IHdoaWxlICgocGFzcyA8IDUpICYmIChjb3VudCsrIDwgMHgxMDAwMCkp OwogCi0JdmFsID0gYXN0X2dldF9pbmRleF9yZWdfbWFzayhhc3QsIEFTVF9JT19DUlRDX1BPUlQs IDB4YjcsIDB4MjApID4+IDU7CiAJcmV0dXJuIHZhbCAmIDEgPyAxIDogMDsKIH0KIApAQCAtOTkz LDcgKzEwMTcsNyBAQCBzdGF0aWMgdm9pZCBzZXRfY2xvY2sodm9pZCAqaTJjX3ByaXYsIGludCBj bG9jaykKIAogCWZvciAoaSA9IDA7IGkgPCAweDEwMDAwOyBpKyspIHsKIAkJdWpjcmI3ID0gKChj bG9jayAmIDB4MDEpID8gMCA6IDEpOwotCQlhc3Rfc2V0X2luZGV4X3JlZ19tYXNrKGFzdCwgQVNU X0lPX0NSVENfUE9SVCwgMHhiNywgMHhmZSwgdWpjcmI3KTsKKwkJYXN0X3NldF9pbmRleF9yZWdf bWFzayhhc3QsIEFTVF9JT19DUlRDX1BPUlQsIDB4YjcsIDB4ZjQsIHVqY3JiNyk7CiAJCWp0ZW1w ID0gYXN0X2dldF9pbmRleF9yZWdfbWFzayhhc3QsIEFTVF9JT19DUlRDX1BPUlQsIDB4YjcsIDB4 MDEpOwogCQlpZiAodWpjcmI3ID09IGp0ZW1wKQogCQkJYnJlYWs7CkBAIC0xMDA5LDcgKzEwMzMs NyBAQCBzdGF0aWMgdm9pZCBzZXRfZGF0YSh2b2lkICppMmNfcHJpdiwgaW50IGRhdGEpCiAKIAlm b3IgKGkgPSAwOyBpIDwgMHgxMDAwMDsgaSsrKSB7CiAJCXVqY3JiNyA9ICgoZGF0YSAmIDB4MDEp ID8gMCA6IDEpIDw8IDI7Ci0JCWFzdF9zZXRfaW5kZXhfcmVnX21hc2soYXN0LCBBU1RfSU9fQ1JU Q19QT1JULCAweGI3LCAweGZiLCB1amNyYjcpOworCQlhc3Rfc2V0X2luZGV4X3JlZ19tYXNrKGFz dCwgQVNUX0lPX0NSVENfUE9SVCwgMHhiNywgMHhmMSwgdWpjcmI3KTsKIAkJanRlbXAgPSBhc3Rf Z2V0X2luZGV4X3JlZ19tYXNrKGFzdCwgQVNUX0lPX0NSVENfUE9SVCwgMHhiNywgMHgwNCk7CiAJ CWlmICh1amNyYjcgPT0ganRlbXApCiAJCQlicmVhazsKLS0gCjIuMTcuMQoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlz dApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==