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

drm/i915/display/tc: Prefer drm_WARN_ON over WARN_ON 



struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.

Prefer drm_WARN_ON over WARN_ON.

Conversion is done with below sementic patch:

@@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
...+>
}

@@
identifier func, T;
@@
func(struct intel_digital_port *T,...) {
+struct drm_i915_private *i915 = to_i915(T->base.base.dev);
<+...
-WARN_ON(
+drm_WARN_ON(&i915->drm,
...)
...+>

}

changes since v1:
- Add i915 local variable and use it in drm_WARN_ON (Jani)

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/20200504181600.18503-5-pankaj.laxminarayan.bharadiya@intel.com
parent cb7cbb4b

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

+9 −5
Original line number Diff line number Diff line
@@ -360,12 +360,12 @@ static void icl_tc_phy_connect(struct intel_digital_port *dig_port, 
	}



	if (!icl_tc_phy_set_safe_mode(dig_port, false) &&

	    !WARN_ON(dig_port->tc_legacy_port))

	    !drm_WARN_ON(&i915->drm, dig_port->tc_legacy_port))

		goto out_set_tbt_alt_mode;



	max_lanes = intel_tc_port_fia_max_lane_count(dig_port);

	if (dig_port->tc_legacy_port) {

		WARN_ON(max_lanes != 4);

		drm_WARN_ON(&i915->drm, max_lanes != 4);

		dig_port->tc_mode = TC_PORT_LEGACY;



		return;
@@ -445,18 +445,20 @@ 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)

{

	struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);

	u32 live_status_mask = 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;



	if (in_safe_mode || WARN_ON(!icl_tc_phy_status_complete(dig_port)))

	if (in_safe_mode ||

	    drm_WARN_ON(&i915->drm, !icl_tc_phy_status_complete(dig_port)))

		return TC_PORT_TBT_ALT;



	mode = dig_port->tc_legacy_port ? TC_PORT_LEGACY : TC_PORT_DP_ALT;

	if (live_status_mask) {

		enum tc_port_mode live_mode = fls(live_status_mask) - 1;



		if (!WARN_ON(live_mode == TC_PORT_TBT_ALT))

		if (!drm_WARN_ON(&i915->drm, live_mode == TC_PORT_TBT_ALT))

			mode = live_mode;

	}
@@ -505,7 +507,9 @@ static void 
intel_tc_port_link_init_refcount(struct intel_digital_port *dig_port,

				 int refcount)

{

	WARN_ON(dig_port->tc_link_refcount);

	struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);



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

	dig_port->tc_link_refcount = refcount;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE