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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23FF6C433EF for ; Tue, 5 Oct 2021 07:56:05 +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 E603B61350 for ; Tue, 5 Oct 2021 07:56:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E603B61350 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 833726EC8B; Tue, 5 Oct 2021 07:56:04 +0000 (UTC) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam08on2075.outbound.protection.outlook.com [40.107.102.75]) by gabe.freedesktop.org (Postfix) with ESMTPS id B02516EC8E for ; Tue, 5 Oct 2021 07:56:02 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dcz+o+4eYiogUDoXzQKLNpDGuSl6rCeA72vlGVYQSodlIGU/WpV/camR127FUj1UPtFeDlB/3pLN0KgbrtEAED/KuBKO1BgoTu1yJC37KGEnuC1vQhP5EyTNQzvs26OKbhmOoQSq5uaDkbXZRMy8lZdfH1GyOWroC2E5P6KEn5SaBHiS0B+bSSD0piIu+RJ7XfFNyfd1Y6QMx3WuWkOpP+4AMY38lQGc2Kvrd5m1bQgOjqKFrenW2CQrISAVJf/sBSnAp+auCOMsOyJc2rYgnavy3kOT5aohTfLwu5BGuwO1Aqom94Ex0DR3spUMNhqcjFrxuFNvg9Wz6btRSRNa7A== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ZUmd85WbCP+eROKQBKNi8Vl299J2P5rUJ7gPQ9DzpQU=; b=hgTE1R9DFuDpB92d4gFn5855I3mW/QWFBxHPSM5+pZl0lcPyA605NCg/cpbO+v47a+uue0ULhgY1QwQGZjwtSN3ocDyO8D/D3BqGmR8s3cHtQN6vSYDZULXiacLPo3sBA5ACM+ijSeW36q8+hsLQvfIYYcRUjzAMufDpyLmbNLGEvKnReBRqry7xXI4rh0DRzyhpzJaEkpxuBTMysHOuJQjK6ckyTt8VHZkvIrmx+xzmMXuHJadUBxyQIZPDpluboHkQ6a6EAxy1IePf94xxOELZWYKqTicbZx2PPpJl/7Z59vhurgb+8cXSxht9z3Pdu0o+541uUJuCF4ITkRw5Zg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZUmd85WbCP+eROKQBKNi8Vl299J2P5rUJ7gPQ9DzpQU=; b=Rpg46u43o7Ogo9z7SxAivOCU2+gM9MHAVzXNAmGNeU1FsS+oO0mgotwuPV94hE6wg6z+FJCX9kwuYMHXVBPVyCM7syQ4K2+9nO7A+8K94C4t8Bzy+0BqGfBs9NvZKJNdxPyP3JAxsZgLbw0yEXn77dQ7J/8/TQBb+wDwVhvFLqc= Received: from MW4P223CA0004.NAMP223.PROD.OUTLOOK.COM (2603:10b6:303:80::9) by DM4PR12MB5246.namprd12.prod.outlook.com (2603:10b6:5:399::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Tue, 5 Oct 2021 07:56:00 +0000 Received: from CO1NAM11FT041.eop-nam11.prod.protection.outlook.com (2603:10b6:303:80:cafe::71) by MW4P223CA0004.outlook.office365.com (2603:10b6:303:80::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.22 via Frontend Transport; Tue, 5 Oct 2021 07:56:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (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=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; Received: from SATLEXMB03.amd.com (165.204.84.17) by CO1NAM11FT041.mail.protection.outlook.com (10.13.174.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4566.14 via Frontend Transport; Tue, 5 Oct 2021 07:55:59 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.8; Tue, 5 Oct 2021 02:55:58 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.8; Tue, 5 Oct 2021 02:55:58 -0500 Received: from wayne-System-Product-Name.amd.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2308.8 via Frontend Transport; Tue, 5 Oct 2021 02:55:45 -0500 From: Wayne Lin To: CC: , , , , , , , , , Jimmy Kizito , Jun Lei , Wayne Lin Subject: [PATCH v2 09/23] drm/amd/display: Implement DPIA training loop Date: Tue, 5 Oct 2021 15:51:51 +0800 Message-ID: <20211005075205.3467938-10-Wayne.Lin@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211005075205.3467938-1-Wayne.Lin@amd.com> References: <20211005075205.3467938-1-Wayne.Lin@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0fe35eff-c3ab-4470-b80a-08d987d59235 X-MS-TrafficTypeDiagnostic: DM4PR12MB5246: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:152; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1PEPWKJa0rkT1yZwR79HEizbUljHYmx/icqwnU87B6qZoZda5gFa4W88kkiuYt5YsgrGkl+Og7ugVcGMdR5TWqk4ImghVCCdazWxliQmPPaUserqvbam2fOp4faFf4ZkYqsRIhkj29Nwwia0xQ7Slb8IihqDYKRCgp36LgCnSGlR3jrzd4TgaQhL/HmHhKI1Z0EJZmcrJnAn9w5ZPsvFJqKBUTfoO6+hzs8njQWbCxjjUVC2klB2ahPe6T7fuWXB/LK68Z/0N6rVMAgrUEoyXjdgbGY9Np1S5xRoWDYdlija9jP2FFsbAiqfapFai5nO6rG6Kv3fuBdnRmpAle4IesdwyG5qCQrrgrHv/IiaJ8nWcyDCRgDxg9ZxstHL43Vfj6NTH1QTfpuAPlUTvGHk7xIjjNIXZXsupHH8kIYa+bK4nDsHlesMqgAELZR/J0126L7YmTVMHEvSeCjgP0koLHNqgLZVRqgqFIg0gMFpj06M5x3BT+6TgidUiU8Dx1QxzTsJNA8UDjnZVHGXO6sRvhXO/JX/5ndV5BAmluHSfyO+QjPH+xp2Qt545osqjVn9Uos2zrpUkgDaZa/pU6F5k+Yvjdtfms4+2sdKjvzweBUmD8GWQ3oVayoWPsxXo6j6vbw3YhvO7ZRrOA91SEhHZHTY8zkC5Tb7lV/85VifsVqhOHuRK6zpWvoIkMwdgw0M9T5ypop0OCdw0wXwaBLoLYg7OZ+4vx2N08V0r+/p0YM= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB03.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(4636009)(36840700001)(46966006)(508600001)(316002)(8676002)(70206006)(5660300002)(4326008)(336012)(86362001)(70586007)(6666004)(36860700001)(47076005)(356005)(426003)(82310400003)(8936002)(54906003)(2616005)(26005)(81166007)(1076003)(186003)(36756003)(7696005)(83380400001)(6916009)(2906002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Oct 2021 07:55:59.8794 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0fe35eff-c3ab-4470-b80a-08d987d59235 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=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT041.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5246 X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" From: Jimmy Kizito [Why] Training of DPIA link differs enough from that of conventional DP link to warrant a separate implementation. [How] - Implement top-level of DPIA training loop. - Make functions shared between DP and DPIA link training "public". Reviewed-by: Jun Lei Acked-by: Wayne Lin Acked-by: Nicholas Kazlauskas Signed-off-by: Jimmy Kizito --- .../gpu/drm/amd/display/dc/core/dc_link_dp.c | 17 --- .../drm/amd/display/dc/core/dc_link_dpia.c | 109 ++++++++++++++++++ .../gpu/drm/amd/display/dc/inc/dc_link_dpia.h | 10 ++ drivers/gpu/drm/amd/display/dc/os_types.h | 1 + 4 files changed, 120 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c index d7dddc0998db..7f6fd0a3bf18 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c @@ -2320,23 +2320,6 @@ enum link_training_result dc_link_dp_perform_link_training( return status; } -/* - * Train DP tunneling link for USB4 DPIA display endpoint. - * - * DPIA equivalent of dc_link_dp_perfrorm_link_training. - */ -enum link_training_result dc_link_dpia_perform_link_training(struct dc_link *link, - const struct dc_link_settings *link_setting, - bool skip_video_pattern) -{ - enum link_training_result status; - - /** @todo Always fail until USB4 DPIA training implemented. */ - status = LINK_TRAINING_CR_FAIL_LANE0; - - return status; -} - bool perform_link_training_with_retries( const struct dc_link_settings *link_setting, bool skip_video_pattern, diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dpia.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dpia.c index 183601e300fe..4e9bbc9180d0 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dpia.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dpia.c @@ -23,12 +23,121 @@ * */ +#include "dc.h" #include "dc_link_dpia.h" #include "inc/core_status.h" #include "dc_link.h" +#include "dc_link_dp.h" enum dc_status dpcd_get_tunneling_device_data(struct dc_link *link) { /** @todo Read corresponding DPCD region and update link caps. */ return DC_OK; } + +/* Configure link as prescribed in link_setting; set LTTPR mode; and + * Initialize link training settings. + */ +static enum link_training_result dpia_configure_link(struct dc_link *link, + const struct dc_link_settings *link_setting, + struct link_training_settings *lt_settings) +{ + enum link_training_result result; + + /** @todo Fail until implemented. */ + result = LINK_TRAINING_ABORT; + + return result; +} + +/* Execute clock recovery phase of link training for specified hop in display + * path. + */ +static enum link_training_result dpia_training_cr_phase(struct dc_link *link, + struct link_training_settings *lt_settings, + uint32_t hop) +{ + enum link_training_result result; + + /** @todo Fail until implemented. */ + result = LINK_TRAINING_ABORT; + + return result; +} + +/* Execute equalization phase of link training for specified hop in display + * path. + */ +static enum link_training_result dpia_training_eq_phase(struct dc_link *link, + struct link_training_settings *lt_settings, + uint32_t hop) +{ + enum link_training_result result; + + /** @todo Fail until implemented. */ + result = LINK_TRAINING_ABORT; + + return result; +} + +/* End training of specified hop in display path. */ +static enum link_training_result dpia_training_end(struct dc_link *link, + uint32_t hop) +{ + enum link_training_result result; + + /** @todo Fail until implemented. */ + result = LINK_TRAINING_ABORT; + + return result; +} + +enum link_training_result dc_link_dpia_perform_link_training(struct dc_link *link, + const struct dc_link_settings *link_setting, + bool skip_video_pattern) +{ + enum link_training_result result; + struct link_training_settings lt_settings; + uint8_t repeater_cnt = 0; /* Number of hops/repeaters in display path. */ + uint8_t repeater_id; /* Current hop. */ + + /* Configure link as prescribed in link_setting and set LTTPR mode. */ + result = dpia_configure_link(link, link_setting, <_settings); + if (result != LINK_TRAINING_SUCCESS) + return result; + + if (link->lttpr_mode == LTTPR_MODE_NON_TRANSPARENT) + repeater_cnt = dp_convert_to_count(link->dpcd_caps.lttpr_caps.phy_repeater_cnt); + + /* Train each hop in turn starting with the one closest to DPTX. + * In transparent or non-LTTPR mode, train only the final hop (DPRX). + */ + for (repeater_id = repeater_cnt; repeater_id >= 0; repeater_id--) { + /* Clock recovery. */ + result = dpia_training_cr_phase(link, <_settings, repeater_id); + if (result != LINK_TRAINING_SUCCESS) + break; + + /* Equalization. */ + result = dpia_training_eq_phase(link, <_settings, repeater_id); + if (result != LINK_TRAINING_SUCCESS) + break; + + /* Stop training hop. */ + result = dpia_training_end(link, repeater_id); + if (result != LINK_TRAINING_SUCCESS) + break; + } + + /* Double-check link status if training successful; gracefully stop + * training of current hop if training failed for any reason other than + * sink unplug. + */ + if (result == LINK_TRAINING_SUCCESS) { + msleep(5); + result = dp_check_link_loss_status(link, <_settings); + } else if (result != LINK_TRAINING_ABORT) { + dpia_training_end(link, repeater_id); + } + return result; +} diff --git a/drivers/gpu/drm/amd/display/dc/inc/dc_link_dpia.h b/drivers/gpu/drm/amd/display/dc/inc/dc_link_dpia.h index 8ed0c9f6414b..1392eb689d1e 100644 --- a/drivers/gpu/drm/amd/display/dc/inc/dc_link_dpia.h +++ b/drivers/gpu/drm/amd/display/dc/inc/dc_link_dpia.h @@ -29,10 +29,20 @@ /* This module implements functionality for training DPIA links. */ struct dc_link; +struct dc_link_settings; /* Read tunneling device capability from DPCD and update link capability * accordingly. */ enum dc_status dpcd_get_tunneling_device_data(struct dc_link *link); +/* Train DP tunneling link for USB4 DPIA display endpoint. + * DPIA equivalent of dc_link_dp_perfrorm_link_training. + * Aborts link training upon detection of sink unplug. + */ +enum link_training_result +dc_link_dpia_perform_link_training(struct dc_link *link, + const struct dc_link_settings *link_setting, + bool skip_video_pattern); + #endif /* __DC_LINK_DPIA_H__ */ diff --git a/drivers/gpu/drm/amd/display/dc/os_types.h b/drivers/gpu/drm/amd/display/dc/os_types.h index f50cae252de4..415b56223bcf 100644 --- a/drivers/gpu/drm/amd/display/dc/os_types.h +++ b/drivers/gpu/drm/amd/display/dc/os_types.h @@ -31,6 +31,7 @@ #include #include #include +#include #include -- 2.25.1