Commit f4224a4c authored by Pankaj Bharadiya's avatar Pankaj Bharadiya Committed by Jani Nikula

drm/i915/display: Make WARN* drm specific where drm_device 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_device or 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_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}

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

@rule3@
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,
...)
)
...+>
}

@rule4@
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-20-pankaj.laxminarayan.bharadiya@intel.com
parent 8afb2928
...@@ -318,7 +318,8 @@ static void intel_atomic_setup_scaler(struct intel_crtc_scaler_state *scaler_sta ...@@ -318,7 +318,8 @@ static void intel_atomic_setup_scaler(struct intel_crtc_scaler_state *scaler_sta
} }
} }
if (WARN(*scaler_id < 0, "Cannot find scaler for %s:%d\n", name, idx)) if (drm_WARN(&dev_priv->drm, *scaler_id < 0,
"Cannot find scaler for %s:%d\n", name, idx))
return; return;
/* set scaler mode */ /* set scaler mode */
...@@ -469,7 +470,8 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv, ...@@ -469,7 +470,8 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,
idx = plane->base.id; idx = plane->base.id;
/* plane on different crtc cannot be a scaler user of this crtc */ /* plane on different crtc cannot be a scaler user of this crtc */
if (WARN_ON(intel_plane->pipe != intel_crtc->pipe)) if (drm_WARN_ON(&dev_priv->drm,
intel_plane->pipe != intel_crtc->pipe))
continue; continue;
plane_state = intel_atomic_get_new_plane_state(intel_state, plane_state = intel_atomic_get_new_plane_state(intel_state,
......
...@@ -228,7 +228,7 @@ parse_panel_options(struct drm_i915_private *dev_priv, ...@@ -228,7 +228,7 @@ parse_panel_options(struct drm_i915_private *dev_priv,
ret = intel_opregion_get_panel_type(dev_priv); ret = intel_opregion_get_panel_type(dev_priv);
if (ret >= 0) { if (ret >= 0) {
WARN_ON(ret > 0xf); drm_WARN_ON(&dev_priv->drm, ret > 0xf);
panel_type = ret; panel_type = ret;
drm_dbg_kms(&dev_priv->drm, "Panel type: %d (OpRegion)\n", drm_dbg_kms(&dev_priv->drm, "Panel type: %d (OpRegion)\n",
panel_type); panel_type);
...@@ -1248,7 +1248,8 @@ static int get_init_otp_deassert_fragment_len(struct drm_i915_private *dev_priv) ...@@ -1248,7 +1248,8 @@ static int get_init_otp_deassert_fragment_len(struct drm_i915_private *dev_priv)
const u8 *data = dev_priv->vbt.dsi.sequence[MIPI_SEQ_INIT_OTP]; const u8 *data = dev_priv->vbt.dsi.sequence[MIPI_SEQ_INIT_OTP];
int index, len; int index, len;
if (WARN_ON(!data || dev_priv->vbt.dsi.seq_version != 1)) if (drm_WARN_ON(&dev_priv->drm,
!data || dev_priv->vbt.dsi.seq_version != 1))
return 0; return 0;
/* index = 1 to skip sequence byte */ /* index = 1 to skip sequence byte */
...@@ -2305,7 +2306,8 @@ bool intel_bios_is_port_present(struct drm_i915_private *dev_priv, enum port por ...@@ -2305,7 +2306,8 @@ bool intel_bios_is_port_present(struct drm_i915_private *dev_priv, enum port por
} }
/* FIXME maybe deal with port A as well? */ /* FIXME maybe deal with port A as well? */
if (WARN_ON(port == PORT_A) || port >= ARRAY_SIZE(port_mapping)) if (drm_WARN_ON(&dev_priv->drm,
port == PORT_A) || port >= ARRAY_SIZE(port_mapping))
return false; return false;
list_for_each_entry(devdata, &dev_priv->vbt.display_devices, node) { list_for_each_entry(devdata, &dev_priv->vbt.display_devices, node) {
...@@ -2555,7 +2557,7 @@ intel_bios_is_port_hpd_inverted(const struct drm_i915_private *i915, ...@@ -2555,7 +2557,7 @@ intel_bios_is_port_hpd_inverted(const struct drm_i915_private *i915,
const struct child_device_config *child = const struct child_device_config *child =
i915->vbt.ddi_port_info[port].child; i915->vbt.ddi_port_info[port].child;
if (WARN_ON_ONCE(!IS_GEN9_LP(i915))) if (drm_WARN_ON_ONCE(&i915->drm, !IS_GEN9_LP(i915)))
return false; return false;
return child && child->hpd_invert; return child && child->hpd_invert;
......
...@@ -122,7 +122,8 @@ static int icl_get_qgv_points(struct drm_i915_private *dev_priv, ...@@ -122,7 +122,8 @@ static int icl_get_qgv_points(struct drm_i915_private *dev_priv,
if (ret) if (ret)
return ret; return ret;
if (WARN_ON(qi->num_points > ARRAY_SIZE(qi->points))) if (drm_WARN_ON(&dev_priv->drm,
qi->num_points > ARRAY_SIZE(qi->points)))
qi->num_points = ARRAY_SIZE(qi->points); qi->num_points = ARRAY_SIZE(qi->points);
for (i = 0; i < qi->num_points; i++) { for (i = 0; i < qi->num_points; i++) {
......
...@@ -309,7 +309,8 @@ static void ilk_load_csc_matrix(const struct intel_crtc_state *crtc_state) ...@@ -309,7 +309,8 @@ static void ilk_load_csc_matrix(const struct intel_crtc_state *crtc_state)
* LUT is needed but CSC is not we need to load an * LUT is needed but CSC is not we need to load an
* identity matrix. * identity matrix.
*/ */
WARN_ON(!IS_CANNONLAKE(dev_priv) && !IS_GEMINILAKE(dev_priv)); drm_WARN_ON(&dev_priv->drm, !IS_CANNONLAKE(dev_priv) &&
!IS_GEMINILAKE(dev_priv));
ilk_update_pipe_csc(crtc, ilk_csc_off_zero, ilk_update_pipe_csc(crtc, ilk_csc_off_zero,
ilk_csc_coeff_identity, ilk_csc_coeff_identity,
......
...@@ -256,7 +256,7 @@ void intel_combo_phy_power_up_lanes(struct drm_i915_private *dev_priv, ...@@ -256,7 +256,7 @@ void intel_combo_phy_power_up_lanes(struct drm_i915_private *dev_priv,
u32 val; u32 val;
if (is_dsi) { if (is_dsi) {
WARN_ON(lane_reversal); drm_WARN_ON(&dev_priv->drm, lane_reversal);
switch (lane_count) { switch (lane_count) {
case 1: case 1:
......
...@@ -162,7 +162,8 @@ enum pipe intel_connector_get_pipe(struct intel_connector *connector) ...@@ -162,7 +162,8 @@ enum pipe intel_connector_get_pipe(struct intel_connector *connector)
{ {
struct drm_device *dev = connector->base.dev; struct drm_device *dev = connector->base.dev;
WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex)); drm_WARN_ON(dev,
!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
if (!connector->base.state->crtc) if (!connector->base.state->crtc)
return INVALID_PIPE; return INVALID_PIPE;
......
...@@ -351,8 +351,9 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder, ...@@ -351,8 +351,9 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder,
intel_dp->active_mst_links--; intel_dp->active_mst_links--;
last_mst_stream = intel_dp->active_mst_links == 0; last_mst_stream = intel_dp->active_mst_links == 0;
WARN_ON(INTEL_GEN(dev_priv) >= 12 && last_mst_stream && drm_WARN_ON(&dev_priv->drm,
!intel_dp_mst_is_master_trans(old_crtc_state)); INTEL_GEN(dev_priv) >= 12 && last_mst_stream &&
!intel_dp_mst_is_master_trans(old_crtc_state));
intel_crtc_vblank_off(old_crtc_state); intel_crtc_vblank_off(old_crtc_state);
...@@ -439,8 +440,9 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder, ...@@ -439,8 +440,9 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder,
connector->encoder = encoder; connector->encoder = encoder;
intel_mst->connector = connector; intel_mst->connector = connector;
first_mst_stream = intel_dp->active_mst_links == 0; first_mst_stream = intel_dp->active_mst_links == 0;
WARN_ON(INTEL_GEN(dev_priv) >= 12 && first_mst_stream && drm_WARN_ON(&dev_priv->drm,
!intel_dp_mst_is_master_trans(pipe_config)); INTEL_GEN(dev_priv) >= 12 && first_mst_stream &&
!intel_dp_mst_is_master_trans(pipe_config));
DRM_DEBUG_KMS("active links %d\n", intel_dp->active_mst_links); DRM_DEBUG_KMS("active links %d\n", intel_dp->active_mst_links);
......
...@@ -259,7 +259,8 @@ void bxt_port_to_phy_channel(struct drm_i915_private *dev_priv, enum port port, ...@@ -259,7 +259,8 @@ void bxt_port_to_phy_channel(struct drm_i915_private *dev_priv, enum port port,
} }
} }
WARN(1, "PHY not found for PORT %c", port_name(port)); drm_WARN(&dev_priv->drm, 1, "PHY not found for PORT %c",
port_name(port));
*phy = DPIO_PHY0; *phy = DPIO_PHY0;
*ch = DPIO_CH0; *ch = DPIO_CH0;
} }
......
...@@ -165,7 +165,7 @@ void intel_dsb_put(struct intel_dsb *dsb) ...@@ -165,7 +165,7 @@ void intel_dsb_put(struct intel_dsb *dsb)
if (!HAS_DSB(i915)) if (!HAS_DSB(i915))
return; return;
if (WARN_ON(dsb->refcount == 0)) if (drm_WARN_ON(&i915->drm, dsb->refcount == 0))
return; return;
if (--dsb->refcount == 0) { if (--dsb->refcount == 0) {
...@@ -202,7 +202,7 @@ void intel_dsb_indexed_reg_write(struct intel_dsb *dsb, i915_reg_t reg, ...@@ -202,7 +202,7 @@ void intel_dsb_indexed_reg_write(struct intel_dsb *dsb, i915_reg_t reg,
return; return;
} }
if (WARN_ON(dsb->free_pos >= DSB_BUF_SIZE)) { if (drm_WARN_ON(&dev_priv->drm, dsb->free_pos >= DSB_BUF_SIZE)) {
DRM_DEBUG_KMS("DSB buffer overflow\n"); DRM_DEBUG_KMS("DSB buffer overflow\n");
return; return;
} }
...@@ -276,7 +276,7 @@ void intel_dsb_reg_write(struct intel_dsb *dsb, i915_reg_t reg, u32 val) ...@@ -276,7 +276,7 @@ void intel_dsb_reg_write(struct intel_dsb *dsb, i915_reg_t reg, u32 val)
return; return;
} }
if (WARN_ON(dsb->free_pos >= DSB_BUF_SIZE)) { if (drm_WARN_ON(&dev_priv->drm, dsb->free_pos >= DSB_BUF_SIZE)) {
DRM_DEBUG_KMS("DSB buffer overflow\n"); DRM_DEBUG_KMS("DSB buffer overflow\n");
return; return;
} }
......
...@@ -166,7 +166,7 @@ int intel_dsi_dcs_init_backlight_funcs(struct intel_connector *intel_connector) ...@@ -166,7 +166,7 @@ int intel_dsi_dcs_init_backlight_funcs(struct intel_connector *intel_connector)
if (dev_priv->vbt.backlight.type != INTEL_BACKLIGHT_DSI_DCS) if (dev_priv->vbt.backlight.type != INTEL_BACKLIGHT_DSI_DCS)
return -ENODEV; return -ENODEV;
if (WARN_ON(encoder->type != INTEL_OUTPUT_DSI)) if (drm_WARN_ON(dev, encoder->type != INTEL_OUTPUT_DSI))
return -EINVAL; return -EINVAL;
panel->backlight.setup = dcs_setup_backlight; panel->backlight.setup = dcs_setup_backlight;
......
...@@ -570,14 +570,15 @@ static void intel_dsi_vbt_exec(struct intel_dsi *intel_dsi, ...@@ -570,14 +570,15 @@ static void intel_dsi_vbt_exec(struct intel_dsi *intel_dsi,
const u8 *data; const u8 *data;
fn_mipi_elem_exec mipi_elem_exec; fn_mipi_elem_exec mipi_elem_exec;
if (WARN_ON(seq_id >= ARRAY_SIZE(dev_priv->vbt.dsi.sequence))) if (drm_WARN_ON(&dev_priv->drm,
seq_id >= ARRAY_SIZE(dev_priv->vbt.dsi.sequence)))
return; return;
data = dev_priv->vbt.dsi.sequence[seq_id]; data = dev_priv->vbt.dsi.sequence[seq_id];
if (!data) if (!data)
return; return;
WARN_ON(*data != seq_id); drm_WARN_ON(&dev_priv->drm, *data != seq_id);
DRM_DEBUG_KMS("Starting MIPI sequence %d - %s\n", DRM_DEBUG_KMS("Starting MIPI sequence %d - %s\n",
seq_id, sequence_name(seq_id)); seq_id, sequence_name(seq_id));
......
...@@ -904,7 +904,8 @@ int intel_gmbus_setup(struct drm_i915_private *dev_priv) ...@@ -904,7 +904,8 @@ int intel_gmbus_setup(struct drm_i915_private *dev_priv)
struct i2c_adapter *intel_gmbus_get_adapter(struct drm_i915_private *dev_priv, struct i2c_adapter *intel_gmbus_get_adapter(struct drm_i915_private *dev_priv,
unsigned int pin) unsigned int pin)
{ {
if (WARN_ON(!intel_gmbus_is_valid_pin(dev_priv, pin))) if (drm_WARN_ON(&dev_priv->drm,
!intel_gmbus_is_valid_pin(dev_priv, pin)))
return NULL; return NULL;
return &dev_priv->gmbus[pin].adapter; return &dev_priv->gmbus[pin].adapter;
......
...@@ -278,7 +278,7 @@ intel_encoder_hotplug(struct intel_encoder *encoder, ...@@ -278,7 +278,7 @@ intel_encoder_hotplug(struct intel_encoder *encoder,
struct drm_device *dev = connector->base.dev; struct drm_device *dev = connector->base.dev;
enum drm_connector_status old_status; enum drm_connector_status old_status;
WARN_ON(!mutex_is_locked(&dev->mode_config.mutex)); drm_WARN_ON(dev, !mutex_is_locked(&dev->mode_config.mutex));
old_status = connector->base.status; old_status = connector->base.status;
connector->base.status = connector->base.status =
...@@ -504,8 +504,9 @@ void intel_hpd_irq_handler(struct drm_i915_private *dev_priv, ...@@ -504,8 +504,9 @@ void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,
* hotplug bits itself. So only WARN about unexpected * hotplug bits itself. So only WARN about unexpected
* interrupts on saner platforms. * interrupts on saner platforms.
*/ */
WARN_ONCE(!HAS_GMCH(dev_priv), drm_WARN_ONCE(&dev_priv->drm, !HAS_GMCH(dev_priv),
"Received HPD interrupt on pin %d although disabled\n", pin); "Received HPD interrupt on pin %d although disabled\n",
pin);
continue; continue;
} }
......
...@@ -167,7 +167,7 @@ static int lpe_audio_irq_init(struct drm_i915_private *dev_priv) ...@@ -167,7 +167,7 @@ static int lpe_audio_irq_init(struct drm_i915_private *dev_priv)
{ {
int irq = dev_priv->lpe_audio.irq; int irq = dev_priv->lpe_audio.irq;
WARN_ON(!intel_irqs_enabled(dev_priv)); drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv));
irq_set_chip_and_handler_name(irq, irq_set_chip_and_handler_name(irq,
&lpe_audio_irqchip, &lpe_audio_irqchip,
handle_simple_irq, handle_simple_irq,
......
...@@ -204,7 +204,8 @@ static void intel_lvds_pps_init_hw(struct drm_i915_private *dev_priv, ...@@ -204,7 +204,8 @@ static void intel_lvds_pps_init_hw(struct drm_i915_private *dev_priv,
u32 val; u32 val;
val = intel_de_read(dev_priv, PP_CONTROL(0)); val = intel_de_read(dev_priv, PP_CONTROL(0));
WARN_ON((val & PANEL_UNLOCK_MASK) != PANEL_UNLOCK_REGS); drm_WARN_ON(&dev_priv->drm,
(val & PANEL_UNLOCK_MASK) != PANEL_UNLOCK_REGS);
if (pps->powerdown_on_reset) if (pps->powerdown_on_reset)
val |= PANEL_POWER_RESET; val |= PANEL_POWER_RESET;
intel_de_write(dev_priv, PP_CONTROL(0), val); intel_de_write(dev_priv, PP_CONTROL(0), val);
...@@ -826,8 +827,8 @@ void intel_lvds_init(struct drm_i915_private *dev_priv) ...@@ -826,8 +827,8 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
/* Skip init on machines we know falsely report LVDS */ /* Skip init on machines we know falsely report LVDS */
if (dmi_check_system(intel_no_lvds)) { if (dmi_check_system(intel_no_lvds)) {
WARN(!dev_priv->vbt.int_lvds_support, drm_WARN(dev, !dev_priv->vbt.int_lvds_support,
"Useless DMI match. Internal LVDS support disabled by VBT\n"); "Useless DMI match. Internal LVDS support disabled by VBT\n");
return; return;
} }
......
...@@ -381,8 +381,9 @@ int intel_opregion_notify_encoder(struct intel_encoder *intel_encoder, ...@@ -381,8 +381,9 @@ int intel_opregion_notify_encoder(struct intel_encoder *intel_encoder,
type = DISPLAY_TYPE_INTERNAL_FLAT_PANEL; type = DISPLAY_TYPE_INTERNAL_FLAT_PANEL;
break; break;
default: default:
WARN_ONCE(1, "unsupported intel_encoder type %d\n", drm_WARN_ONCE(&dev_priv->drm, 1,
intel_encoder->type); "unsupported intel_encoder type %d\n",
intel_encoder->type);
return -EINVAL; return -EINVAL;
} }
...@@ -931,7 +932,7 @@ int intel_opregion_setup(struct drm_i915_private *dev_priv) ...@@ -931,7 +932,7 @@ int intel_opregion_setup(struct drm_i915_private *dev_priv)
*/ */
if (opregion->header->over.major > 2 || if (opregion->header->over.major > 2 ||
opregion->header->over.minor >= 1) { opregion->header->over.minor >= 1) {
WARN_ON(rvda < OPREGION_SIZE); drm_WARN_ON(&dev_priv->drm, rvda < OPREGION_SIZE);
rvda += asls; rvda += asls;
} }
......
...@@ -110,8 +110,8 @@ static int i9xx_pipe_crc_auto_source(struct drm_i915_private *dev_priv, ...@@ -110,8 +110,8 @@ static int i9xx_pipe_crc_auto_source(struct drm_i915_private *dev_priv,
*source = INTEL_PIPE_CRC_SOURCE_DP_D; *source = INTEL_PIPE_CRC_SOURCE_DP_D;
break; break;
default: default:
WARN(1, "nonexisting DP port %c\n", drm_WARN(dev, 1, "nonexisting DP port %c\n",
port_name(dig_port->base.port)); port_name(dig_port->base.port));
break; break;
} }
break; break;
...@@ -328,7 +328,8 @@ intel_crtc_crc_setup_workarounds(struct intel_crtc *crtc, bool enable) ...@@ -328,7 +328,8 @@ intel_crtc_crc_setup_workarounds(struct intel_crtc *crtc, bool enable)
drm_atomic_state_put(state); drm_atomic_state_put(state);
unlock: unlock:
WARN(ret, "Toggling workaround to %i returns %i\n", enable, ret); drm_WARN(&dev_priv->drm, ret,
"Toggling workaround to %i returns %i\n", enable, ret);
drm_modeset_drop_locks(&ctx); drm_modeset_drop_locks(&ctx);
drm_modeset_acquire_fini(&ctx); drm_modeset_acquire_fini(&ctx);
} }
......
...@@ -104,7 +104,7 @@ void intel_pipe_update_start(const struct intel_crtc_state *new_crtc_state) ...@@ -104,7 +104,7 @@ void intel_pipe_update_start(const struct intel_crtc_state *new_crtc_state)
if (min <= 0 || max <= 0) if (min <= 0 || max <= 0)
goto irq_disable; goto irq_disable;
if (WARN_ON(drm_crtc_vblank_get(&crtc->base))) if (drm_WARN_ON(&dev_priv->drm, drm_crtc_vblank_get(&crtc->base)))
goto irq_disable; goto irq_disable;
/* /*
...@@ -204,7 +204,8 @@ void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state) ...@@ -204,7 +204,8 @@ void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state)
* event outside of the critical section - the spinlock might spin for a * event outside of the critical section - the spinlock might spin for a
* while ... */ * while ... */
if (new_crtc_state->uapi.event) { if (new_crtc_state->uapi.event) {
WARN_ON(drm_crtc_vblank_get(&crtc->base) != 0); drm_WARN_ON(&dev_priv->drm,
drm_crtc_vblank_get(&crtc->base) != 0);
spin_lock(&crtc->base.dev->event_lock); spin_lock(&crtc->base.dev->event_lock);
drm_crtc_arm_vblank_event(&crtc->base, drm_crtc_arm_vblank_event(&crtc->base,
......
...@@ -374,7 +374,7 @@ static bool is_pipe_dsc(const struct intel_crtc_state *crtc_state) ...@@ -374,7 +374,7 @@ static bool is_pipe_dsc(const struct intel_crtc_state *crtc_state)
return false; return false;
/* There's no pipe A DSC engine on ICL */ /* There's no pipe A DSC engine on ICL */
WARN_ON(crtc->pipe == PIPE_A); drm_WARN_ON(&i915->drm, crtc->pipe == PIPE_A);
return true; return true;
} }
......
...@@ -1030,7 +1030,7 @@ static bool intel_dsi_get_hw_state(struct intel_encoder *encoder, ...@@ -1030,7 +1030,7 @@ static bool intel_dsi_get_hw_state(struct intel_encoder *encoder,
tmp &= BXT_PIPE_SELECT_MASK; tmp &= BXT_PIPE_SELECT_MASK;
tmp >>= BXT_PIPE_SELECT_SHIFT; tmp >>= BXT_PIPE_SELECT_SHIFT;
if (WARN_ON(tmp > PIPE_C)) if (drm_WARN_ON(&dev_priv->drm, tmp > PIPE_C))
continue; continue;
*pipe = tmp; *pipe = tmp;
......
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