From patchwork Tue Nov 5 16:37:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fangzhi Zuo X-Patchwork-Id: 11228285 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9817814E5 for ; Tue, 5 Nov 2019 16:38:00 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7F97E21A4A for ; Tue, 5 Nov 2019 16:38:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7F97E21A4A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8DBD56EAF0; Tue, 5 Nov 2019 16:37:59 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM04-CO1-obe.outbound.protection.outlook.com (mail-eopbgr690063.outbound.protection.outlook.com [40.107.69.63]) by gabe.freedesktop.org (Postfix) with ESMTPS id BE6286EAED; Tue, 5 Nov 2019 16:37:57 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G7tN79cOya89EKTR12k2JxcYqXg/ctgIxupYaliZ2SFZ8NtcqkAW8gk4ggEAm7OrsA5MiCgSPOlNad1qGlccvGUwQH3LtQPfgr+oew7Swe1f/WQUHpdWCvEE1oLl/DwySjxvNNinEkIkErc83LGEFz2nahNx2lvD1hLzKY+YLeAZwXBtMUjHhOU8YIsGEiOx2loBApdDjweggNk9DfdCgp0lpyX1fMdwmSioMVbA/gTOxPQRK+/tTwkYOWVwOFE13Ye1WJM/0S5UHA2fI7QLuEZy6T0PwjdNRgNngLNC/4b+2Hup6D/rRVkOqJPLXEonp+GuIBE1zmqYNM0bpoJb5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VPKUiB7ndkymeOXbJvKFGu+AL/cfF3r7mPK+22VTmdI=; b=Z0icfBILvDEK+O+u6wmhTWZq8ldUIiWAeLeCcyUYX/wjkkVLNFu+dPgk0taI4XV2h3GUv3AAEQQ9E7s6mZ+dJ5Ajo90jxHUmx27DONZbV5fnmKHWXddxjdAepuX50H7umRVYvWyW5JjOItt+EiZcXB8G8I9p3auJKM+f4WGuO4F+stee8aGAlp+X7yWR6qRZuN5rfXNePqAUoAQ5glYXVILzDS1s/sP0xfl3apn+Km2LAARGgFPlxnkNuFTiykU3hn5fSG9ITnRdY0IG/F/wMCBNVcc+YaHFyrHDdwgnTCCahO7oWVJtKEMjFgvKZbmV7ndBsOXBPRZlJvfBah9z9A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=permerror action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from CY4PR1201CA0015.namprd12.prod.outlook.com (2603:10b6:910:16::25) by BYAPR12MB2806.namprd12.prod.outlook.com (2603:10b6:a03:70::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2408.24; Tue, 5 Nov 2019 16:37:52 +0000 Received: from CO1NAM03FT018.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e48::207) by CY4PR1201CA0015.outlook.office365.com (2603:10b6:910:16::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2430.20 via Frontend Transport; Tue, 5 Nov 2019 16:37:51 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXMB01.amd.com (165.204.84.17) by CO1NAM03FT018.mail.protection.outlook.com (10.152.80.174) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2387.20 via Frontend Transport; Tue, 5 Nov 2019 16:37:51 +0000 Received: from SATLEXMB02.amd.com (10.181.40.143) by SATLEXMB01.amd.com (10.181.40.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Tue, 5 Nov 2019 10:37:49 -0600 Received: from jzuo-linux.amd.com (10.180.168.240) by SATLEXMB02.amd.com (10.181.40.143) with Microsoft SMTP Server id 15.1.1713.5 via Frontend Transport; Tue, 5 Nov 2019 10:37:48 -0600 From: "Jerry (Fangzhi) Zuo" To: , Subject: [PATCH v4] drm: Add support for DP 1.4 Compliance edid corruption test 4.2.2.6 Date: Tue, 5 Nov 2019 11:37:40 -0500 Message-ID: <20191105163740.3093-1-Jerry.Zuo@amd.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20191104211145.30553-1-Jerry.Zuo@amd.com> References: <20191104211145.30553-1-Jerry.Zuo@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(4636009)(346002)(396003)(39860400002)(136003)(376002)(428003)(199004)(189003)(8936002)(5660300002)(14444005)(50226002)(2906002)(6666004)(356004)(8676002)(81166006)(81156014)(53416004)(305945005)(50466002)(4326008)(70206006)(47776003)(86362001)(48376002)(26005)(478600001)(51416003)(316002)(11346002)(126002)(486006)(446003)(2616005)(476003)(36756003)(7696005)(426003)(336012)(1076003)(54906003)(186003)(110136005)(16586007)(76176011)(70586007); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR12MB2806; H:SATLEXMB01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 15955631-7b8a-4d48-9709-08d7620e8009 X-MS-TrafficTypeDiagnostic: BYAPR12MB2806: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2657; X-Forefront-PRVS: 0212BDE3BE X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5Ds/1anScCsmSKYAyV0EYEPqGAiKdXxr6ZggepdvkxCU3XcKFi2qBJxgaGl2MZLydpo5aOd91VnLs1cysjQo38Bm6++eRCEIIyiU7LlIhC3bHli7M5bETQZ/XK9+E7nq5a/YgBscMCSVtJUDOUV+/4Xjz5BIrgVH/HFa68fBX3ml204I/F5Rh4ZJXtLqkrEAfTcrjEQFrPg7ie8VGWIqp7bWfvSiQUlWq38x320NuFEGY2+qXSlhXmTc9/GciCNuzRtgE/9ciZ+avalaWxW231zdHjkKXO2LXYZdLPIRkOOYvI1jXETYZ53/2FVgN12dq30ZN5+mVpXp03Q0BftjPM1lgU9npcnyy8ZJNuwQiRAkoh03QNFzkqowP25LMas9pOj11+Lex0i1/kEC5nuf7J1uUknOEkMD3bUeiBCieHLb0Gl1DCsH8UKnAVtWaMKv X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2019 16:37:51.1649 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 15955631-7b8a-4d48-9709-08d7620e8009 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB2806 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VPKUiB7ndkymeOXbJvKFGu+AL/cfF3r7mPK+22VTmdI=; b=qQeQ8yMszheh8RV8gSSpFPN2TKBZzfkGD0Dr7MR6mxwC352Y+5AKnIfWl1eBncQJvE6W4W3TBwzLP69dF/R8hLjQE/yAKq3uurQJWeaMQr7ucnhFLZAsG5SxdkMiidXrg61Y4aUbrkvST8s0yAC/uI2mzYfC6veVL/uq4DqJuzE= X-Mailman-Original-Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; lists.freedesktop.org; dkim=none (message not signed) header.d=none;lists.freedesktop.org; dmarc=permerror action=none header.from=amd.com; X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: manasi.d.navare@intel.com, "Jerry \(Fangzhi\) Zuo" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" DP 1.4 edid corruption test requires source DUT to write calculated CRC, not the corrupted CRC from reference sink. Return the calculated CRC back, and initiate the required sequence. -v2: Have separate routine for returning real CRC -v3: Rewrite checksum computation routine to avoid duplicated code. Rename to avoid confusion -v4: Fix a minor typo. Signed-off-by: Jerry (Fangzhi) Zuo Signed-off-by: Jerry (Fangzhi) Zuo Reviewed-by: Harry Wentland --- drivers/gpu/drm/drm_dp_helper.c | 36 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/drm_edid.c | 18 +++++++++++++++--- include/drm/drm_connector.h | 7 +++++++ include/drm/drm_dp_helper.h | 3 +++ 4 files changed, 61 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c index ffc68d305afe..22a0e966ea9f 100644 --- a/drivers/gpu/drm/drm_dp_helper.c +++ b/drivers/gpu/drm/drm_dp_helper.c @@ -336,6 +336,42 @@ int drm_dp_dpcd_read_link_status(struct drm_dp_aux *aux, } EXPORT_SYMBOL(drm_dp_dpcd_read_link_status); +/** + * drm_dp_send_real_edid_checksum() - send back real edid checksum value + * @aux: DisplayPort AUX channel + * @real_edid_checksum: real edid checksum for the last block + * + * Returns true on success + */ +bool drm_dp_send_real_edid_checksum(struct drm_dp_aux *aux, + u8 real_edid_checksum) +{ + u8 link_edid_read = 0, auto_test_req = 0; + u8 test_resp = 0; + + drm_dp_dpcd_read(aux, DP_DEVICE_SERVICE_IRQ_VECTOR, &auto_test_req, 1); + auto_test_req &= DP_AUTOMATED_TEST_REQUEST; + + drm_dp_dpcd_read(aux, DP_TEST_REQUEST, &link_edid_read, 1); + link_edid_read &= DP_TEST_LINK_EDID_READ; + + if (!auto_test_req || !link_edid_read) { + DRM_DEBUG_KMS("Source DUT does not support TEST_EDID_READ\n"); + return false; + } + + drm_dp_dpcd_write(aux, DP_DEVICE_SERVICE_IRQ_VECTOR, &auto_test_req, 1); + + /* send back checksum for the last edid extension block data */ + drm_dp_dpcd_write(aux, DP_TEST_EDID_CHECKSUM, &real_edid_checksum, 1); + + test_resp |= DP_TEST_EDID_CHECKSUM_WRITE; + drm_dp_dpcd_write(aux, DP_TEST_RESPONSE, &test_resp, 1); + + return true; +} +EXPORT_SYMBOL(drm_dp_send_real_edid_checksum); + /** * drm_dp_link_probe() - probe a DisplayPort link for capabilities * @aux: DisplayPort AUX channel diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 82a4ceed3fcf..ff64e5f1feb6 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -1348,10 +1348,19 @@ static int drm_edid_block_checksum(const u8 *raw_edid) { int i; u8 csum = 0; - for (i = 0; i < EDID_LENGTH; i++) + + for (i = 0; i < EDID_LENGTH - 1; i++) csum += raw_edid[i]; - return csum; + return (0x100 - csum); +} + +static bool drm_edid_block_checksum_diff(const u8 *raw_edid, u8 real_checksum) +{ + if (raw_edid[EDID_LENGTH - 1] != real_checksum) + return true; + else + return false; } static bool drm_edid_is_zero(const u8 *in_edid, int length) @@ -1409,7 +1418,7 @@ bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid, } csum = drm_edid_block_checksum(raw_edid); - if (csum) { + if (drm_edid_block_checksum_diff(raw_edid, csum)) { if (edid_corrupt) *edid_corrupt = true; @@ -1572,6 +1581,9 @@ static void connector_bad_edid(struct drm_connector *connector, prefix, DUMP_PREFIX_NONE, 16, 1, block, EDID_LENGTH, false); } + + /* Calculate real checksum for the last edid extension block data */ + connector->real_edid_checksum = drm_edid_block_checksum(edid + edid[0x7e] * EDID_LENGTH); } /* Get override or firmware EDID */ diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index 681cb590f952..eb0d8c7b35fd 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -1345,6 +1345,13 @@ struct drm_connector { * rev1.1 4.2.2.6 */ bool edid_corrupt; + /** + * @real_edid_checksum: real edid checksum value for corrupted edid block. + * Required in Displayport 1.4 compliance testing + * rev1.1 4.2.2.6 + */ + uint8_t real_edid_checksum; + /** @debugfs_entry: debugfs directory for this connector */ struct dentry *debugfs_entry; diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h index 5a795075d5da..84709d7810f8 100644 --- a/include/drm/drm_dp_helper.h +++ b/include/drm/drm_dp_helper.h @@ -1383,6 +1383,9 @@ static inline ssize_t drm_dp_dpcd_writeb(struct drm_dp_aux *aux, int drm_dp_dpcd_read_link_status(struct drm_dp_aux *aux, u8 status[DP_LINK_STATUS_SIZE]); +bool drm_dp_send_real_edid_checksum(struct drm_dp_aux *aux, + u8 real_edid_checksum); + /* * DisplayPort link */