Commit 8afb2928 authored by Pankaj Bharadiya's avatar Pankaj Bharadiya Committed by Jani Nikula
Browse files

drm/i915/display/tc: Make WARN* drm specific where drm_priv ptr is available 



drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.

Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_i915_private struct pointer is readily
available.

The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.

@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}

@rule2@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}

Signed-off-by: default avatarPankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200128181603.27767-19-pankaj.laxminarayan.bharadiya@intel.com
parent b4329a01

drivers/gpu/drm/i915/display/intel_tc.c

+10 −8
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ u32 intel_tc_port_get_lane_mask(struct intel_digital_port *dig_port) 
	lane_mask = intel_uncore_read(uncore,

				      PORT_TX_DFLEXDPSP(dig_port->tc_phy_fia));



	WARN_ON(lane_mask == 0xffffffff);

	drm_WARN_ON(&i915->drm, lane_mask == 0xffffffff);



	lane_mask &= DP_LANE_ASSIGNMENT_MASK(dig_port->tc_phy_fia_idx);

	return lane_mask >> DP_LANE_ASSIGNMENT_SHIFT(dig_port->tc_phy_fia_idx);
@@ -76,7 +76,7 @@ u32 intel_tc_port_get_pin_assignment_mask(struct intel_digital_port *dig_port) 
	pin_mask = intel_uncore_read(uncore,

				     PORT_TX_DFLEXPA1(dig_port->tc_phy_fia));



	WARN_ON(pin_mask == 0xffffffff);

	drm_WARN_ON(&i915->drm, pin_mask == 0xffffffff);



	return (pin_mask & DP_PIN_ASSIGNMENT_MASK(dig_port->tc_phy_fia_idx)) >>

	       DP_PIN_ASSIGNMENT_SHIFT(dig_port->tc_phy_fia_idx);
@@ -120,7 +120,8 @@ void intel_tc_port_set_fia_lane_count(struct intel_digital_port *dig_port, 
	struct intel_uncore *uncore = &i915->uncore;

	u32 val;



	WARN_ON(lane_reversal && dig_port->tc_mode != TC_PORT_LEGACY);

	drm_WARN_ON(&i915->drm,

		    lane_reversal && dig_port->tc_mode != TC_PORT_LEGACY);



	val = intel_uncore_read(uncore,

				PORT_TX_DFLEXDPMLE1(dig_port->tc_phy_fia));
@@ -195,7 +196,7 @@ static u32 tc_port_live_status_mask(struct intel_digital_port *dig_port) 
		mask |= BIT(TC_PORT_LEGACY);



	/* The sink can be connected only in a single mode. */

	if (!WARN_ON(hweight32(mask) > 1))

	if (!drm_WARN_ON(&i915->drm, hweight32(mask) > 1))

		tc_port_fixup_legacy_flag(dig_port, mask);



	return mask;
@@ -409,7 +410,8 @@ static void intel_tc_port_reset_mode(struct intel_digital_port *dig_port, 
	enum tc_port_mode old_tc_mode = dig_port->tc_mode;



	intel_display_power_flush_work(i915);

	WARN_ON(intel_display_power_is_enabled(i915,

	drm_WARN_ON(&i915->drm,

		    intel_display_power_is_enabled(i915,

					intel_aux_power_domain(dig_port)));



	icl_tc_phy_disconnect(dig_port);
@@ -503,7 +505,7 @@ static void __intel_tc_port_lock(struct intel_digital_port *dig_port, 
	    intel_tc_port_needs_reset(dig_port))

		intel_tc_port_reset_mode(dig_port, required_lanes);



	WARN_ON(dig_port->tc_lock_wakeref);

	drm_WARN_ON(&i915->drm, dig_port->tc_lock_wakeref);

	dig_port->tc_lock_wakeref = wakeref;

}
@@ -550,7 +552,7 @@ void intel_tc_port_init(struct intel_digital_port *dig_port, bool is_legacy) 
	enum port port = dig_port->base.port;

	enum tc_port tc_port = intel_port_to_tc(i915, port);



	if (WARN_ON(tc_port == PORT_TC_NONE))

	if (drm_WARN_ON(&i915->drm, tc_port == PORT_TC_NONE))

		return;



	snprintf(dig_port->tc_port_name, sizeof(dig_port->tc_port_name),

CRA Git | Maintained and supported by SUSTech CRA and CCSE