diff options
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_fdi.c')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_fdi.c | 9 | 
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_fdi.c b/drivers/gpu/drm/i915/display/intel_fdi.c index 55283677c45a..e12b46a84fa1 100644 --- a/drivers/gpu/drm/i915/display/intel_fdi.c +++ b/drivers/gpu/drm/i915/display/intel_fdi.c @@ -36,7 +36,7 @@ static void assert_fdi_tx(struct drm_i915_private *dev_priv,  	} else {  		cur_state = intel_de_read(dev_priv, FDI_TX_CTL(pipe)) & FDI_TX_ENABLE;  	} -	I915_STATE_WARN(cur_state != state, +	I915_STATE_WARN(dev_priv, cur_state != state,  			"FDI TX state assertion failure (expected %s, current %s)\n",  			str_on_off(state), str_on_off(cur_state));  } @@ -57,7 +57,7 @@ static void assert_fdi_rx(struct drm_i915_private *dev_priv,  	bool cur_state;  	cur_state = intel_de_read(dev_priv, FDI_RX_CTL(pipe)) & FDI_RX_ENABLE; -	I915_STATE_WARN(cur_state != state, +	I915_STATE_WARN(dev_priv, cur_state != state,  			"FDI RX state assertion failure (expected %s, current %s)\n",  			str_on_off(state), str_on_off(cur_state));  } @@ -86,7 +86,8 @@ void assert_fdi_tx_pll_enabled(struct drm_i915_private *i915,  		return;  	cur_state = intel_de_read(i915, FDI_TX_CTL(pipe)) & FDI_TX_PLL_ENABLE; -	I915_STATE_WARN(!cur_state, "FDI TX PLL assertion failure, should be active but is disabled\n"); +	I915_STATE_WARN(i915, !cur_state, +			"FDI TX PLL assertion failure, should be active but is disabled\n");  }  static void assert_fdi_rx_pll(struct drm_i915_private *i915, @@ -95,7 +96,7 @@ static void assert_fdi_rx_pll(struct drm_i915_private *i915,  	bool cur_state;  	cur_state = intel_de_read(i915, FDI_RX_CTL(pipe)) & FDI_RX_PLL_ENABLE; -	I915_STATE_WARN(cur_state != state, +	I915_STATE_WARN(i915, cur_state != state,  			"FDI RX PLL assertion failure (expected %s, current %s)\n",  			str_on_off(state), str_on_off(cur_state));  }  |