From: Imre Deak <imre.deak@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: "José Roberto de Souza" <jose.souza@intel.com>
Subject: [Intel-gfx] [PATCH 06/13] drm/i915/tc: Don't keep legacy TypeC ports in connected state w/o a sink
Date: Tue, 21 Sep 2021 03:23:06 +0300 [thread overview]
Message-ID: <20210921002313.1132357-7-imre.deak@intel.com> (raw)
In-Reply-To: <20210921002313.1132357-1-imre.deak@intel.com>
A follow-up patch will disconnect/reconnect PHYs around AUX transfers
and modeset enable/disables. To prepare for that and make things
consistent for all TypeC modes stop connecting the PHY in legacy mode
without a sink being connected. This was done before since in legacy
mode the PHY is dedicated to display usage, so there was no point in
disconnecting it. However after the follow-up changes the TC-cold
blocking power domains will be held as long as the PHY is in the
connected state, so we'll need to disconnect/re-connect the PHY in all
TypeC modes to allow for power saving.
Cc: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
---
drivers/gpu/drm/i915/display/intel_tc.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c
index 511c46e36e237..aa4c1e5e0c002 100644
--- a/drivers/gpu/drm/i915/display/intel_tc.c
+++ b/drivers/gpu/drm/i915/display/intel_tc.c
@@ -511,8 +511,6 @@ static void icl_tc_phy_disconnect(struct intel_digital_port *dig_port)
{
switch (dig_port->tc_mode) {
case TC_PORT_LEGACY:
- /* Nothing to do, we never disconnect from legacy mode */
- break;
case TC_PORT_DP_ALT:
tc_phy_take_ownership(dig_port, false);
dig_port->tc_mode = TC_PORT_TBT_ALT;
@@ -580,9 +578,7 @@ intel_tc_port_get_target_mode(struct intel_digital_port *dig_port)
if (live_status_mask)
return fls(live_status_mask) - 1;
- return tc_phy_status_complete(dig_port) &&
- dig_port->tc_legacy_port ? TC_PORT_LEGACY :
- TC_PORT_TBT_ALT;
+ return TC_PORT_TBT_ALT;
}
static void intel_tc_port_reset_mode(struct intel_digital_port *dig_port,
@@ -643,14 +639,8 @@ void intel_tc_port_sanitize(struct intel_digital_port *dig_port)
"Port %s: PHY disconnected with %d active link(s)\n",
dig_port->tc_port_name, active_links);
intel_tc_port_link_init_refcount(dig_port, active_links);
-
- goto out;
}
- if (dig_port->tc_legacy_port)
- icl_tc_phy_connect(dig_port, 1);
-
-out:
drm_dbg_kms(&i915->drm, "Port %s: sanitize mode (%s)\n",
dig_port->tc_port_name,
tc_port_mode_name(dig_port->tc_mode));
--
2.27.0
next prev parent reply other threads:[~2021-09-21 0:23 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-21 0:23 [Intel-gfx] [PATCH 00/13] drm/i915/tc: Fix TypeC connect/disconnect sequences Imre Deak
2021-09-21 0:23 ` [Intel-gfx] [PATCH 01/13] drm/i915/tc: Fix TypeC port init/resume time sanitization Imre Deak
2021-09-23 23:10 ` Souza, Jose
2021-09-24 10:59 ` Jani Nikula
2021-09-24 11:06 ` Imre Deak
2021-09-29 13:28 ` [Intel-gfx] [PATCH v2 " Imre Deak
2021-09-29 19:19 ` Souza, Jose
2021-09-21 0:23 ` [Intel-gfx] [PATCH 02/13] drm/i915/adlp/tc: Fix PHY connected check for Thunderbolt mode Imre Deak
2021-09-23 23:18 ` Souza, Jose
2021-09-24 15:24 ` Imre Deak
2021-09-21 0:23 ` [Intel-gfx] [PATCH 03/13] drm/i915/tc: Remove waiting for PHY complete during releasing ownership Imre Deak
2021-09-24 0:17 ` Souza, Jose
2021-09-21 0:23 ` [Intel-gfx] [PATCH 04/13] drm/i915/tc: Check for DP-alt, legacy sinks before taking PHY ownership Imre Deak
2021-09-24 0:30 ` Souza, Jose
2021-09-24 15:31 ` Imre Deak
2021-09-29 13:28 ` [Intel-gfx] [PATCH v2 " Imre Deak
2021-09-21 0:23 ` [Intel-gfx] [PATCH 05/13] drm/i915/tc: Add/use helpers to retrieve TypeC port properties Imre Deak
2021-09-24 19:54 ` Souza, Jose
2021-09-21 0:23 ` Imre Deak [this message]
2021-09-24 19:57 ` [Intel-gfx] [PATCH 06/13] drm/i915/tc: Don't keep legacy TypeC ports in connected state w/o a sink Souza, Jose
2021-09-21 0:23 ` [Intel-gfx] [PATCH 07/13] drm/i915/tc: Add a mode for the TypeC PHY's disconnected state Imre Deak
2021-09-27 21:16 ` Souza, Jose
2021-09-27 21:46 ` Imre Deak
2021-09-28 19:18 ` Souza, Jose
2021-09-28 19:34 ` Imre Deak
2021-09-28 19:45 ` Souza, Jose
2021-09-28 19:55 ` Imre Deak
2021-09-28 20:02 ` Souza, Jose
2021-09-28 20:08 ` Imre Deak
2021-09-28 20:29 ` Souza, Jose
2021-09-28 20:38 ` Imre Deak
2021-09-28 20:56 ` Souza, Jose
2021-09-29 13:28 ` [Intel-gfx] [PATCH v2 " Imre Deak
2021-09-21 0:23 ` [Intel-gfx] [PATCH 08/13] drm/i915/tc: Refactor TC-cold block/unblock helpers Imre Deak
2021-09-27 21:56 ` Souza, Jose
2021-09-27 22:13 ` Imre Deak
2021-09-27 22:21 ` Souza, Jose
2021-09-27 22:28 ` Imre Deak
2021-09-27 23:33 ` Souza, Jose
2021-09-27 23:51 ` Imre Deak
2021-09-28 0:14 ` Souza, Jose
2021-09-28 0:45 ` Imre Deak
2021-09-28 1:03 ` Souza, Jose
2021-09-29 13:28 ` [Intel-gfx] [PATCH v2 " Imre Deak
2021-09-21 0:23 ` [Intel-gfx] [PATCH 09/13] drm/i915/tc: Avoid using legacy AUX PW in TBT mode Imre Deak
2021-09-28 20:31 ` Souza, Jose
2021-09-29 13:28 ` [Intel-gfx] [PATCH v2 " Imre Deak
2021-09-21 0:23 ` [Intel-gfx] [PATCH 10/13] drm/i915/icl/tc: Remove the ICL special casing during TC-cold blocking Imre Deak
2021-09-27 22:02 ` Souza, Jose
2021-09-28 10:52 ` Imre Deak
2021-09-28 20:50 ` Souza, Jose
2021-09-21 0:23 ` [Intel-gfx] [PATCH 11/13] drm/i915/tc: Fix TypeC PHY connect/disconnect logic on ADL-P Imre Deak
2021-09-28 20:51 ` Souza, Jose
2021-09-29 13:28 ` [Intel-gfx] [PATCH v2 " Imre Deak
2021-09-21 0:23 ` [Intel-gfx] [PATCH 12/13] drm/i915/tc: Drop extra TC cold blocking from intel_tc_port_connected() Imre Deak
2021-09-28 20:51 ` Souza, Jose
2021-09-21 0:23 ` [Intel-gfx] [PATCH 13/13] drm/i915/tc: Fix system hang on ADL-P during TypeC PHY disconnect Imre Deak
2021-09-28 20:55 ` Souza, Jose
2021-09-29 13:28 ` [Intel-gfx] [PATCH v2 " Imre Deak
2021-09-21 0:30 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/tc: Fix TypeC connect/disconnect sequences Patchwork
2021-09-21 0:32 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-09-21 1:01 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-09-21 3:01 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2021-09-29 13:42 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/tc: Fix TypeC connect/disconnect sequences (rev8) Patchwork
2021-09-29 13:43 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-09-29 14:11 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-09-29 16:58 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2021-09-29 21:16 ` Imre Deak
2021-09-29 22:23 ` Vudum, Lakshminarayana
2021-09-29 21:47 ` Patchwork
2021-09-29 21:54 ` Patchwork
2021-09-29 22:21 ` [Intel-gfx] ✓ Fi.CI.IGT: success " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210921002313.1132357-7-imre.deak@intel.com \
--to=imre.deak@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jose.souza@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).