Commit 0383443d authored by Jani Nikula's avatar Jani Nikula

drm/i915/tc: use struct drm_device based logging

Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.

No functional changes.

Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:

@@
identifier fn, T;
@@

fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}

@@
identifier fn, T;
@@

fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}

Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: default avatarWambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200402114819.17232-3-jani.nikula@intel.com
parent 2b3c472c
...@@ -152,6 +152,7 @@ void intel_tc_port_set_fia_lane_count(struct intel_digital_port *dig_port, ...@@ -152,6 +152,7 @@ void intel_tc_port_set_fia_lane_count(struct intel_digital_port *dig_port,
static void tc_port_fixup_legacy_flag(struct intel_digital_port *dig_port, static void tc_port_fixup_legacy_flag(struct intel_digital_port *dig_port,
u32 live_status_mask) u32 live_status_mask)
{ {
struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
u32 valid_hpd_mask; u32 valid_hpd_mask;
if (dig_port->tc_legacy_port) if (dig_port->tc_legacy_port)
...@@ -164,7 +165,8 @@ static void tc_port_fixup_legacy_flag(struct intel_digital_port *dig_port, ...@@ -164,7 +165,8 @@ static void tc_port_fixup_legacy_flag(struct intel_digital_port *dig_port,
return; return;
/* If live status mismatches the VBT flag, trust the live status. */ /* If live status mismatches the VBT flag, trust the live status. */
DRM_ERROR("Port %s: live status %08x mismatches the legacy port flag, fix flag\n", drm_err(&i915->drm,
"Port %s: live status %08x mismatches the legacy port flag, fix flag\n",
dig_port->tc_port_name, live_status_mask); dig_port->tc_port_name, live_status_mask);
dig_port->tc_legacy_port = !dig_port->tc_legacy_port; dig_port->tc_legacy_port = !dig_port->tc_legacy_port;
...@@ -233,8 +235,7 @@ static bool icl_tc_phy_set_safe_mode(struct intel_digital_port *dig_port, ...@@ -233,8 +235,7 @@ static bool icl_tc_phy_set_safe_mode(struct intel_digital_port *dig_port,
if (val == 0xffffffff) { if (val == 0xffffffff) {
drm_dbg_kms(&i915->drm, drm_dbg_kms(&i915->drm,
"Port %s: PHY in TCCOLD, can't set safe-mode to %s\n", "Port %s: PHY in TCCOLD, can't set safe-mode to %s\n",
dig_port->tc_port_name, dig_port->tc_port_name, enableddisabled(enable));
enableddisabled(enable));
return false; return false;
} }
...@@ -286,10 +287,11 @@ static bool icl_tc_phy_is_in_safe_mode(struct intel_digital_port *dig_port) ...@@ -286,10 +287,11 @@ static bool icl_tc_phy_is_in_safe_mode(struct intel_digital_port *dig_port)
static void icl_tc_phy_connect(struct intel_digital_port *dig_port, static void icl_tc_phy_connect(struct intel_digital_port *dig_port,
int required_lanes) int required_lanes)
{ {
struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
int max_lanes; int max_lanes;
if (!icl_tc_phy_status_complete(dig_port)) { if (!icl_tc_phy_status_complete(dig_port)) {
DRM_DEBUG_KMS("Port %s: PHY not ready\n", drm_dbg_kms(&i915->drm, "Port %s: PHY not ready\n",
dig_port->tc_port_name); dig_port->tc_port_name);
goto out_set_tbt_alt_mode; goto out_set_tbt_alt_mode;
} }
...@@ -311,13 +313,14 @@ static void icl_tc_phy_connect(struct intel_digital_port *dig_port, ...@@ -311,13 +313,14 @@ static void icl_tc_phy_connect(struct intel_digital_port *dig_port,
* became disconnected. Not necessary for legacy mode. * became disconnected. Not necessary for legacy mode.
*/ */
if (!(tc_port_live_status_mask(dig_port) & BIT(TC_PORT_DP_ALT))) { if (!(tc_port_live_status_mask(dig_port) & BIT(TC_PORT_DP_ALT))) {
DRM_DEBUG_KMS("Port %s: PHY sudden disconnect\n", drm_dbg_kms(&i915->drm, "Port %s: PHY sudden disconnect\n",
dig_port->tc_port_name); dig_port->tc_port_name);
goto out_set_safe_mode; goto out_set_safe_mode;
} }
if (max_lanes < required_lanes) { if (max_lanes < required_lanes) {
DRM_DEBUG_KMS("Port %s: PHY max lanes %d < required lanes %d\n", drm_dbg_kms(&i915->drm,
"Port %s: PHY max lanes %d < required lanes %d\n",
dig_port->tc_port_name, dig_port->tc_port_name,
max_lanes, required_lanes); max_lanes, required_lanes);
goto out_set_safe_mode; goto out_set_safe_mode;
...@@ -357,14 +360,16 @@ static void icl_tc_phy_disconnect(struct intel_digital_port *dig_port) ...@@ -357,14 +360,16 @@ static void icl_tc_phy_disconnect(struct intel_digital_port *dig_port)
static bool icl_tc_phy_is_connected(struct intel_digital_port *dig_port) static bool icl_tc_phy_is_connected(struct intel_digital_port *dig_port)
{ {
struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
if (!icl_tc_phy_status_complete(dig_port)) { if (!icl_tc_phy_status_complete(dig_port)) {
DRM_DEBUG_KMS("Port %s: PHY status not complete\n", drm_dbg_kms(&i915->drm, "Port %s: PHY status not complete\n",
dig_port->tc_port_name); dig_port->tc_port_name);
return dig_port->tc_mode == TC_PORT_TBT_ALT; return dig_port->tc_mode == TC_PORT_TBT_ALT;
} }
if (icl_tc_phy_is_in_safe_mode(dig_port)) { if (icl_tc_phy_is_in_safe_mode(dig_port)) {
DRM_DEBUG_KMS("Port %s: PHY still in safe mode\n", drm_dbg_kms(&i915->drm, "Port %s: PHY still in safe mode\n",
dig_port->tc_port_name); dig_port->tc_port_name);
return false; return false;
...@@ -438,6 +443,7 @@ intel_tc_port_link_init_refcount(struct intel_digital_port *dig_port, ...@@ -438,6 +443,7 @@ intel_tc_port_link_init_refcount(struct intel_digital_port *dig_port,
void intel_tc_port_sanitize(struct intel_digital_port *dig_port) void intel_tc_port_sanitize(struct intel_digital_port *dig_port)
{ {
struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
struct intel_encoder *encoder = &dig_port->base; struct intel_encoder *encoder = &dig_port->base;
int active_links = 0; int active_links = 0;
...@@ -451,7 +457,8 @@ void intel_tc_port_sanitize(struct intel_digital_port *dig_port) ...@@ -451,7 +457,8 @@ void intel_tc_port_sanitize(struct intel_digital_port *dig_port)
if (active_links) { if (active_links) {
if (!icl_tc_phy_is_connected(dig_port)) if (!icl_tc_phy_is_connected(dig_port))
DRM_DEBUG_KMS("Port %s: PHY disconnected with %d active link(s)\n", drm_dbg_kms(&i915->drm,
"Port %s: PHY disconnected with %d active link(s)\n",
dig_port->tc_port_name, active_links); dig_port->tc_port_name, active_links);
intel_tc_port_link_init_refcount(dig_port, active_links); intel_tc_port_link_init_refcount(dig_port, active_links);
...@@ -462,7 +469,7 @@ void intel_tc_port_sanitize(struct intel_digital_port *dig_port) ...@@ -462,7 +469,7 @@ void intel_tc_port_sanitize(struct intel_digital_port *dig_port)
icl_tc_phy_connect(dig_port, 1); icl_tc_phy_connect(dig_port, 1);
out: out:
DRM_DEBUG_KMS("Port %s: sanitize mode (%s)\n", drm_dbg_kms(&i915->drm, "Port %s: sanitize mode (%s)\n",
dig_port->tc_port_name, dig_port->tc_port_name,
tc_port_mode_name(dig_port->tc_mode)); tc_port_mode_name(dig_port->tc_mode));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment