From patchwork Mon Nov 22 18:33:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Aaltonen X-Patchwork-Id: 1558198 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HybXT2K69z9sRN for ; Tue, 23 Nov 2021 05:34:33 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mpE8z-0007O5-9r; Mon, 22 Nov 2021 18:34:21 +0000 Received: from smtp-relay-canonical-0.internal ([10.131.114.83] helo=smtp-relay-canonical-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mpE8x-0007NU-LY for kernel-team@lists.ubuntu.com; Mon, 22 Nov 2021 18:34:19 +0000 Received: from leon.. (mobile-user-c1d2e5-215.dhcp.inet.fi [193.210.229.215]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPSA id 447E640079 for ; Mon, 22 Nov 2021 18:34:19 +0000 (UTC) From: Timo Aaltonen To: kernel-team@lists.ubuntu.com Subject: [J v2][PATCH 00/30] drm/amdgpu: Add USB4 support for DP tunneling Date: Mon, 22 Nov 2021 20:33:48 +0200 Message-Id: <20211122183418.73674-1-tjaalton@ubuntu.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1951868 This is needed in OEM-5.14, but in order to verify that the upgrade path has it too, we'd need to first know that it is accepted in jammy. Most patches were straight cherry-picks, some needed minor conflict fixes, and patch 11 adds an enum from a huge, otherwise unrelated commit which we don't want to backport. Jimmy Kizito (18): drm/amd/display: Update link encoder object creation. drm/amd/display: Set DPIA link endpoint type drm/amd/display: Stub out DPIA link training call drm/amd/display: Add stub to get DPIA tunneling device data drm/amd/display: Skip DPCD read for DPTX-to-DPIA hop drm/amd/display: Train DPIA links with fallback drm/amd/display: Implement DPIA training loop drm/amd/display: Implement DPIA link configuration drm/amd/display: Implement DPIA clock recovery phase drm/amd/display: Implement DPIA equalisation phase drm/amd/display: Implement end of training for hop in DPIA display path drm/amd/display: Read USB4 DP tunneling data from DPCD. drm/amd/display: Fix DIG_HPD_SELECT for USB4 display endpoints. drm/amd/display: Fix link training fallback logic drm/amd/display: Add debug flags for USB4 DP link training. drm/amd/display: Fix dynamic link encoder access. drm/amd/display: Fix concurrent dynamic encoder assignment drm/amd/display: Fix dynamic encoder reassignment Jude Shih (4): drm/amd/display: Support for DMUB HPD interrupt handling drm/amd/display: Support for SET_CONFIG processing with DMUB drm/amd/display: Deadlock/HPD Status/Crash Bug Fix drm/amd/display: Fix USB4 Aux via DMUB terminate unexpectedly Leo (Hanghong) Ma (2): drm/amd/display: Add DPCD writes at key points drm/amd/display: Add helper for blanking all dp displays Meenakshikumar Somasundaram (5): drm/amd/display: USB4 DPIA enumeration and AUX Tunneling drm/amd/display: Support for DMUB HPD and HPD RX interrupt handling drm/amd/display: Support for SET_CONFIG processing with DMUB drm/amd/display: Add dpia debug options drm/amd/display: Fix for access for ddc pin and aux engine. Wenjing Liu (1): drm/amd/display: isolate link training setting override to its own function .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 291 +++++- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 52 +- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 15 +- drivers/gpu/drm/amd/display/dc/Makefile | 2 +- .../display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 179 +++- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 178 +++- .../gpu/drm/amd/display/dc/core/dc_link_ddc.c | 9 +- .../gpu/drm/amd/display/dc/core/dc_link_dp.c | 113 ++- .../drm/amd/display/dc/core/dc_link_dpia.c | 953 ++++++++++++++++++ .../drm/amd/display/dc/core/dc_link_enc_cfg.c | 476 +++++++-- .../drm/amd/display/dc/core/dc_link_hwss.c | 26 +- .../gpu/drm/amd/display/dc/core/dc_resource.c | 20 +- drivers/gpu/drm/amd/display/dc/core/dc_stat.c | 8 + drivers/gpu/drm/amd/display/dc/dc.h | 23 + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 31 + drivers/gpu/drm/amd/display/dc/dc_link.h | 1 + drivers/gpu/drm/amd/display/dc/dc_types.h | 1 + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 6 +- .../amd/display/dc/dce/dce_stream_encoder.c | 2 + .../display/dc/dce110/dce110_hw_sequencer.c | 49 +- .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 43 +- .../drm/amd/display/dc/dcn10/dcn10_resource.c | 2 +- .../display/dc/dcn10/dcn10_stream_encoder.c | 10 + .../display/dc/dcn10/dcn10_stream_encoder.h | 2 + .../drm/amd/display/dc/dcn20/dcn20_hwseq.c | 19 +- .../drm/amd/display/dc/dcn20/dcn20_resource.c | 19 +- .../display/dc/dcn20/dcn20_stream_encoder.c | 5 + .../display/dc/dcn20/dcn20_stream_encoder.h | 1 + .../drm/amd/display/dc/dcn30/dcn30_hwseq.c | 39 +- .../display/dc/dcn31/dcn31_dio_link_encoder.c | 132 ++- .../drm/amd/display/dc/dcn31/dcn31_hwseq.c | 53 +- .../drm/amd/display/dc/dcn31/dcn31_resource.c | 7 + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 5 + .../gpu/drm/amd/display/dc/inc/core_types.h | 21 +- .../gpu/drm/amd/display/dc/inc/dc_link_ddc.h | 1 + .../gpu/drm/amd/display/dc/inc/dc_link_dp.h | 4 + .../gpu/drm/amd/display/dc/inc/dc_link_dpia.h | 99 ++ .../drm/amd/display/dc/inc/hw/link_encoder.h | 6 + .../amd/display/dc/inc/hw/stream_encoder.h | 2 + .../gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 26 +- .../gpu/drm/amd/display/dc/inc/link_hwss.h | 1 + drivers/gpu/drm/amd/display/dc/inc/resource.h | 1 + drivers/gpu/drm/amd/display/dc/os_types.h | 1 + .../dc/virtual/virtual_stream_encoder.c | 2 + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 3 + .../gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 113 ++- .../gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 1 + .../drm/amd/display/dmub/src/dmub_srv_stat.c | 16 + .../gpu/drm/amd/display/include/dpcd_defs.h | 1 + .../amd/display/include/link_service_types.h | 16 + 51 files changed, 2748 insertions(+), 340 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_link_dpia.c create mode 100644 drivers/gpu/drm/amd/display/dc/inc/dc_link_dpia.h