[2/6] drm/i915/tc: Export tc_port_live_status_mask()
diff mbox series

Message ID 20200401004120.408586-2-jose.souza@intel.com
State New
Headers show
Series
  • [1/6] drm/i915/display: Move out code to return the digital_port of the aux ch
Related show

Commit Message

José Roberto de Souza April 1, 2020, 12:41 a.m. UTC
It will be used by ICL TC cold exit sequence outside of intel_tc.
No functional change here.

Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
---
 drivers/gpu/drm/i915/display/intel_tc.c | 10 +++++-----
 drivers/gpu/drm/i915/display/intel_tc.h |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

Patch
diff mbox series

diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c
index 9b850c11aa78..d944be935423 100644
--- a/drivers/gpu/drm/i915/display/intel_tc.c
+++ b/drivers/gpu/drm/i915/display/intel_tc.c
@@ -170,7 +170,7 @@  static void tc_port_fixup_legacy_flag(struct intel_digital_port *dig_port,
 	dig_port->tc_legacy_port = !dig_port->tc_legacy_port;
 }
 
-static u32 tc_port_live_status_mask(struct intel_digital_port *dig_port)
+u32 intel_tc_port_live_status_mask(struct intel_digital_port *dig_port)
 {
 	struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
 	enum tc_port tc_port = intel_port_to_tc(i915, dig_port->base.port);
@@ -310,7 +310,7 @@  static void icl_tc_phy_connect(struct intel_digital_port *dig_port,
 	 * Now we have to re-check the live state, in case the port recently
 	 * became disconnected. Not necessary for legacy mode.
 	 */
-	if (!(tc_port_live_status_mask(dig_port) & BIT(TC_PORT_DP_ALT))) {
+	if (!(intel_tc_port_live_status_mask(dig_port) & BIT(TC_PORT_DP_ALT))) {
 		DRM_DEBUG_KMS("Port %s: PHY sudden disconnect\n",
 			      dig_port->tc_port_name);
 		goto out_set_safe_mode;
@@ -377,7 +377,7 @@  static bool icl_tc_phy_is_connected(struct intel_digital_port *dig_port)
 static enum tc_port_mode
 intel_tc_port_get_current_mode(struct intel_digital_port *dig_port)
 {
-	u32 live_status_mask = tc_port_live_status_mask(dig_port);
+	u32 live_status_mask = intel_tc_port_live_status_mask(dig_port);
 	bool in_safe_mode = icl_tc_phy_is_in_safe_mode(dig_port);
 	enum tc_port_mode mode;
 
@@ -398,7 +398,7 @@  intel_tc_port_get_current_mode(struct intel_digital_port *dig_port)
 static enum tc_port_mode
 intel_tc_port_get_target_mode(struct intel_digital_port *dig_port)
 {
-	u32 live_status_mask = tc_port_live_status_mask(dig_port);
+	u32 live_status_mask = intel_tc_port_live_status_mask(dig_port);
 
 	if (live_status_mask)
 		return fls(live_status_mask) - 1;
@@ -489,7 +489,7 @@  bool intel_tc_port_connected(struct intel_digital_port *dig_port)
 	bool is_connected;
 
 	intel_tc_port_lock(dig_port);
-	is_connected = tc_port_live_status_mask(dig_port) &
+	is_connected = intel_tc_port_live_status_mask(dig_port) &
 		       BIT(dig_port->tc_mode);
 	intel_tc_port_unlock(dig_port);
 
diff --git a/drivers/gpu/drm/i915/display/intel_tc.h b/drivers/gpu/drm/i915/display/intel_tc.h
index 463f1b3c836f..a1afcee48818 100644
--- a/drivers/gpu/drm/i915/display/intel_tc.h
+++ b/drivers/gpu/drm/i915/display/intel_tc.h
@@ -28,4 +28,6 @@  bool intel_tc_port_ref_held(struct intel_digital_port *dig_port);
 
 void intel_tc_port_init(struct intel_digital_port *dig_port, bool is_legacy);
 
+u32 intel_tc_port_live_status_mask(struct intel_digital_port *dig_port);
+
 #endif /* __INTEL_TC_H__ */