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

drm/i915/display/dp: Prefer drm_WARN* over WARN* 



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* over WARN* at places where struct intel_dp or struct
drm_i915_private pointer is available.

Conversion is done with below sementic patch:

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

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

@rule3@
identifier func, T;
@@
func(struct intel_dp *T,...) {
+ struct drm_i915_private *i915 = dp_to_i915(T);
<+...
(
-WARN_ON(
+drm_WARN_ON(&i915->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&i915->drm,
...)
)
...+>

}

@rule4@
identifier func, T;
@@
func(...) {
...
struct intel_dp *T = ...;
+ struct drm_i915_private *i915 = dp_to_i915(T);
<+...
(
-WARN_ON(
+drm_WARN_ON(&i915->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&i915->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/20200504181600.18503-3-pankaj.laxminarayan.bharadiya@intel.com
parent 4c1ccdf7

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

+15 −9
Original line number Diff line number Diff line
@@ -409,7 +409,10 @@ static int intel_dp_rate_index(const int *rates, int len, int rate) 


static void intel_dp_set_common_rates(struct intel_dp *intel_dp)

{

	WARN_ON(!intel_dp->num_source_rates || !intel_dp->num_sink_rates);

	struct drm_i915_private *i915 = dp_to_i915(intel_dp);



	drm_WARN_ON(&i915->drm,

		    !intel_dp->num_source_rates || !intel_dp->num_sink_rates);



	intel_dp->num_common_rates = intersect_rates(intel_dp->source_rates,

						     intel_dp->num_source_rates,
@@ -418,7 +421,7 @@ static void intel_dp_set_common_rates(struct intel_dp *intel_dp) 
						     intel_dp->common_rates);



	/* Paranoia, there should always be something in common. */

	if (WARN_ON(intel_dp->num_common_rates == 0)) {

	if (drm_WARN_ON(&i915->drm, intel_dp->num_common_rates == 0)) {

		intel_dp->common_rates[0] = 162000;

		intel_dp->num_common_rates = 1;

	}
@@ -1555,6 +1558,7 @@ static ssize_t 
intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg)

{

	struct intel_dp *intel_dp = container_of(aux, struct intel_dp, aux);

	struct drm_i915_private *i915 = dp_to_i915(intel_dp);

	u8 txbuf[20], rxbuf[20];

	size_t txsize, rxsize;

	int ret;
@@ -1568,10 +1572,10 @@ intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg) 
		txsize = msg->size ? HEADER_SIZE + msg->size : BARE_ADDRESS_SIZE;

		rxsize = 2; /* 0 or 1 data bytes */



		if (WARN_ON(txsize > 20))

		if (drm_WARN_ON(&i915->drm, txsize > 20))

			return -E2BIG;



		WARN_ON(!msg->buffer != !msg->size);

		drm_WARN_ON(&i915->drm, !msg->buffer != !msg->size);



		if (msg->buffer)

			memcpy(txbuf + HEADER_SIZE, msg->buffer, msg->size);
@@ -1596,7 +1600,7 @@ intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg) 
		txsize = msg->size ? HEADER_SIZE : BARE_ADDRESS_SIZE;

		rxsize = msg->size + 1;



		if (WARN_ON(rxsize > 20))

		if (drm_WARN_ON(&i915->drm, rxsize > 20))

			return -E2BIG;



		ret = intel_dp_aux_xfer(intel_dp, txbuf, txsize,
@@ -1871,10 +1875,11 @@ static void intel_dp_print_rates(struct intel_dp *intel_dp) 
int

intel_dp_max_link_rate(struct intel_dp *intel_dp)

{

	struct drm_i915_private *i915 = dp_to_i915(intel_dp);

	int len;



	len = intel_dp_common_len_rate_limit(intel_dp, intel_dp->max_link_rate);

	if (WARN_ON(len <= 0))

	if (drm_WARN_ON(&i915->drm, len <= 0))

		return 162000;



	return intel_dp->common_rates[len - 1];
@@ -1882,10 +1887,11 @@ intel_dp_max_link_rate(struct intel_dp *intel_dp) 


int intel_dp_rate_select(struct intel_dp *intel_dp, int rate)

{

	struct drm_i915_private *i915 = dp_to_i915(intel_dp);

	int i = intel_dp_rate_index(intel_dp->sink_rates,

				    intel_dp->num_sink_rates, rate);



	if (WARN_ON(i < 0))

	if (drm_WARN_ON(&i915->drm, i < 0))

		i = 0;



	return i;
@@ -5601,7 +5607,7 @@ intel_dp_check_mst_status(struct intel_dp *intel_dp) 
	if (!intel_dp->is_mst)

		return -EINVAL;



	WARN_ON_ONCE(intel_dp->active_mst_links < 0);

	drm_WARN_ON_ONCE(&i915->drm, intel_dp->active_mst_links < 0);



	for (;;) {

		u8 esi[DP_DPRX_ESI_LEN] = {};
@@ -5963,7 +5969,7 @@ intel_dp_detect_dpcd(struct intel_dp *intel_dp) 
	u8 *dpcd = intel_dp->dpcd;

	u8 type;



	if (WARN_ON(intel_dp_is_edp(intel_dp)))

	if (drm_WARN_ON(&i915->drm, intel_dp_is_edp(intel_dp)))

		return connector_status_connected;



	if (lspcon->active)

CRA Git | Maintained and supported by SUSTech CRA and CCSE