]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/i915/display/display: Make WARN* drm specific where drm_device ptr is available
authorPankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Thu, 20 Feb 2020 16:55:02 +0000 (22:25 +0530)
committerJani Nikula <jani.nikula@intel.com>
Sun, 23 Feb 2020 15:47:05 +0000 (17:47 +0200)
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: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-4-pankaj.laxminarayan.bharadiya@intel.com
drivers/gpu/drm/i915/display/intel_display.c

index 005c4fe030b1359ca8303e9c46933ca97752dc1e..ff1ca9ca29f494d1382e640035b04efdb5097c37 100644 (file)
@@ -203,9 +203,9 @@ int vlv_get_cck_clock(struct drm_i915_private *dev_priv,
        val = vlv_cck_read(dev_priv, reg);
        divider = val & CCK_FREQUENCY_VALUES;
 
-       WARN((val & CCK_FREQUENCY_STATUS) !=
-            (divider << CCK_FREQUENCY_STATUS_SHIFT),
-            "%s change in progress\n", name);
+       drm_WARN(&dev_priv->drm, (val & CCK_FREQUENCY_STATUS) !=
+                (divider << CCK_FREQUENCY_STATUS_SHIFT),
+                "%s change in progress\n", name);
 
        return DIV_ROUND_CLOSEST(ref_freq << 1, divider + 1);
 }
@@ -882,7 +882,7 @@ static bool vlv_PLL_is_optimal(struct drm_device *dev, int target_freq,
                return calculated_clock->p > best_clock->p;
        }
 
-       if (WARN_ON_ONCE(!target_freq))
+       if (drm_WARN_ON_ONCE(dev, !target_freq))
                return false;
 
        *error_ppm = div_u64(1000000ULL *
@@ -1090,7 +1090,8 @@ intel_wait_for_pipe_off(const struct intel_crtc_state *old_crtc_state)
                /* Wait for the Pipe State to go off */
                if (intel_de_wait_for_clear(dev_priv, reg,
                                            I965_PIPECONF_ACTIVE, 100))
-                       WARN(1, "pipe_off wait timed out\n");
+                       drm_WARN(&dev_priv->drm, 1,
+                                "pipe_off wait timed out\n");
        } else {
                intel_wait_for_pipe_scanline_stopped(crtc);
        }
@@ -1205,7 +1206,7 @@ void assert_panel_unlocked(struct drm_i915_private *dev_priv, enum pipe pipe)
        enum pipe panel_pipe = INVALID_PIPE;
        bool locked = true;
 
-       if (WARN_ON(HAS_DDI(dev_priv)))
+       if (drm_WARN_ON(&dev_priv->drm, HAS_DDI(dev_priv)))
                return;
 
        if (HAS_PCH_SPLIT(dev_priv)) {
@@ -1241,7 +1242,8 @@ void assert_panel_unlocked(struct drm_i915_private *dev_priv, enum pipe pipe)
                pp_reg = PP_CONTROL(0);
                port_sel = intel_de_read(dev_priv, PP_ON_DELAYS(0)) & PANEL_PORT_SELECT_MASK;
 
-               WARN_ON(port_sel != PANEL_PORT_SELECT_LVDS);
+               drm_WARN_ON(&dev_priv->drm,
+                           port_sel != PANEL_PORT_SELECT_LVDS);
                intel_lvds_port_enabled(dev_priv, LVDS, &panel_pipe);
        }
 
@@ -1482,7 +1484,9 @@ static void chv_enable_pll(struct intel_crtc *crtc,
                 * DPLLB VGA mode also seems to cause problems.
                 * We should always have it disabled.
                 */
-               WARN_ON((intel_de_read(dev_priv, DPLL(PIPE_B)) & DPLL_VGA_MODE_DIS) == 0);
+               drm_WARN_ON(&dev_priv->drm,
+                           (intel_de_read(dev_priv, DPLL(PIPE_B)) &
+                            DPLL_VGA_MODE_DIS) == 0);
        } else {
                intel_de_write(dev_priv, DPLL_MD(pipe),
                               pipe_config->dpll_hw_state.dpll_md);
@@ -1630,10 +1634,11 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv,
 
        if (intel_de_wait_for_register(dev_priv, dpll_reg,
                                       port_mask, expected_mask, 1000))
-               WARN(1, "timed out waiting for [ENCODER:%d:%s] port ready: got 0x%x, expected 0x%x\n",
-                    dport->base.base.base.id, dport->base.base.name,
-                    intel_de_read(dev_priv, dpll_reg) & port_mask,
-                    expected_mask);
+               drm_WARN(&dev_priv->drm, 1,
+                        "timed out waiting for [ENCODER:%d:%s] port ready: got 0x%x, expected 0x%x\n",
+                        dport->base.base.base.id, dport->base.base.name,
+                        intel_de_read(dev_priv, dpll_reg) & port_mask,
+                        expected_mask);
 }
 
 static void ilk_enable_pch_transcoder(const struct intel_crtc_state *crtc_state)
@@ -1872,7 +1877,7 @@ void intel_enable_pipe(const struct intel_crtc_state *new_crtc_state)
        val = intel_de_read(dev_priv, reg);
        if (val & PIPECONF_ENABLE) {
                /* we keep both pipes enabled on 830 */
-               WARN_ON(!IS_I830(dev_priv));
+               drm_WARN_ON(&dev_priv->drm, !IS_I830(dev_priv));
                return;
        }
 
@@ -2218,11 +2223,11 @@ intel_pin_and_fence_fb_obj(struct drm_framebuffer *fb,
        unsigned int pinctl;
        u32 alignment;
 
-       if (WARN_ON(!i915_gem_object_is_framebuffer(obj)))
+       if (drm_WARN_ON(dev, !i915_gem_object_is_framebuffer(obj)))
                return ERR_PTR(-EINVAL);
 
        alignment = intel_surf_alignment(fb, 0);
-       if (WARN_ON(alignment && !is_power_of_2(alignment)))
+       if (drm_WARN_ON(dev, alignment && !is_power_of_2(alignment)))
                return ERR_PTR(-EINVAL);
 
        /* Note that the w/a also requires 64 PTE of padding following the
@@ -2393,7 +2398,7 @@ static u32 intel_adjust_aligned_offset(int *x, int *y,
        struct drm_i915_private *dev_priv = to_i915(fb->dev);
        unsigned int cpp = fb->format->cpp[color_plane];
 
-       WARN_ON(new_offset > old_offset);
+       drm_WARN_ON(&dev_priv->drm, new_offset > old_offset);
 
        if (!is_surface_linear(fb, color_plane)) {
                unsigned int tile_size, tile_width, tile_height;
@@ -3155,7 +3160,7 @@ intel_plane_remap_gtt(struct intel_plane_state *plane_state)
        src_w = drm_rect_width(&plane_state->uapi.src) >> 16;
        src_h = drm_rect_height(&plane_state->uapi.src) >> 16;
 
-       WARN_ON(is_ccs_modifier(fb->modifier));
+       drm_WARN_ON(&dev_priv->drm, is_ccs_modifier(fb->modifier));
 
        /* Make src coordinates relative to the viewport */
        drm_rect_translate(&plane_state->uapi.src,
@@ -3196,7 +3201,7 @@ intel_plane_remap_gtt(struct intel_plane_state *plane_state)
                                                      DRM_MODE_ROTATE_0, tile_size);
                offset /= tile_size;
 
-               WARN_ON(i >= ARRAY_SIZE(info->plane));
+               drm_WARN_ON(&dev_priv->drm, i >= ARRAY_SIZE(info->plane));
                info->plane[i].offset = offset;
                info->plane[i].stride = DIV_ROUND_UP(fb->pitches[i],
                                                     tile_width * cpp);
@@ -3847,7 +3852,7 @@ static int skl_check_main_surface(struct intel_plane_state *plane_state)
        intel_add_fb_offsets(&x, &y, plane_state, 0);
        offset = intel_plane_compute_aligned_offset(&x, &y, plane_state, 0);
        alignment = intel_surf_alignment(fb, 0);
-       if (WARN_ON(alignment && !is_power_of_2(alignment)))
+       if (drm_WARN_ON(&dev_priv->drm, alignment && !is_power_of_2(alignment)))
                return -EINVAL;
 
        /*
@@ -4846,7 +4851,7 @@ __intel_display_resume(struct drm_device *dev,
 
        ret = drm_atomic_helper_commit_duplicated_state(state, ctx);
 
-       WARN_ON(ret == -EDEADLK);
+       drm_WARN_ON(dev, ret == -EDEADLK);
        return ret;
 }
 
@@ -5626,10 +5631,10 @@ static void lpt_program_iclkip(const struct intel_crtc_state *crtc_state)
        }
 
        /* This should not happen with any sane values */
-       WARN_ON(SBI_SSCDIVINTPHASE_DIVSEL(divsel) &
-               ~SBI_SSCDIVINTPHASE_DIVSEL_MASK);
-       WARN_ON(SBI_SSCDIVINTPHASE_DIR(phasedir) &
-               ~SBI_SSCDIVINTPHASE_INCVAL_MASK);
+       drm_WARN_ON(&dev_priv->drm, SBI_SSCDIVINTPHASE_DIVSEL(divsel) &
+                   ~SBI_SSCDIVINTPHASE_DIVSEL_MASK);
+       drm_WARN_ON(&dev_priv->drm, SBI_SSCDIVINTPHASE_DIR(phasedir) &
+                   ~SBI_SSCDIVINTPHASE_INCVAL_MASK);
 
        drm_dbg_kms(&dev_priv->drm,
                    "iCLKIP clock: found settings for %dKHz refresh rate: auxdiv=%x, divsel=%x, phasedir=%x, phaseinc=%x\n",
@@ -5735,8 +5740,12 @@ static void cpt_set_fdi_bc_bifurcation(struct drm_i915_private *dev_priv, bool e
        if (!!(temp & FDI_BC_BIFURCATION_SELECT) == enable)
                return;
 
-       WARN_ON(intel_de_read(dev_priv, FDI_RX_CTL(PIPE_B)) & FDI_RX_ENABLE);
-       WARN_ON(intel_de_read(dev_priv, FDI_RX_CTL(PIPE_C)) & FDI_RX_ENABLE);
+       drm_WARN_ON(&dev_priv->drm,
+                   intel_de_read(dev_priv, FDI_RX_CTL(PIPE_B)) &
+                   FDI_RX_ENABLE);
+       drm_WARN_ON(&dev_priv->drm,
+                   intel_de_read(dev_priv, FDI_RX_CTL(PIPE_C)) &
+                   FDI_RX_ENABLE);
 
        temp &= ~FDI_BC_BIFURCATION_SELECT;
        if (enable)
@@ -5885,7 +5894,7 @@ static void ilk_pch_enable(const struct intel_atomic_state *state,
                        temp |= TRANS_DP_VSYNC_ACTIVE_HIGH;
 
                port = intel_get_crtc_new_encoder(state, crtc_state)->port;
-               WARN_ON(port < PORT_B || port > PORT_D);
+               drm_WARN_ON(dev, port < PORT_B || port > PORT_D);
                temp |= TRANS_DP_PORT_SEL(port);
 
                intel_de_write(dev_priv, reg, temp);
@@ -6242,7 +6251,8 @@ static void skl_pfit_enable(const struct intel_crtc_state *crtc_state)
                unsigned long irqflags;
                int id;
 
-               if (WARN_ON(crtc_state->scaler_state.scaler_id < 0))
+               if (drm_WARN_ON(&dev_priv->drm,
+                               crtc_state->scaler_state.scaler_id < 0))
                        return;
 
                pfit_w = (crtc_state->pch_pfit.size >> 16) & 0xFFFF;
@@ -6311,11 +6321,11 @@ void hsw_enable_ips(const struct intel_crtc_state *crtc_state)
         * This function is called from post_plane_update, which is run after
         * a vblank wait.
         */
-       WARN_ON(!(crtc_state->active_planes & ~BIT(PLANE_CURSOR)));
+       drm_WARN_ON(dev, !(crtc_state->active_planes & ~BIT(PLANE_CURSOR)));
 
        if (IS_BROADWELL(dev_priv)) {
-               WARN_ON(sandybridge_pcode_write(dev_priv, DISPLAY_IPS_CONTROL,
-                                               IPS_ENABLE | IPS_PCODE_CONTROL));
+               drm_WARN_ON(dev, sandybridge_pcode_write(dev_priv, DISPLAY_IPS_CONTROL,
+                                                        IPS_ENABLE | IPS_PCODE_CONTROL));
                /* Quoting Art Runyan: "its not safe to expect any particular
                 * value in IPS_CTL bit 31 after enabling IPS through the
                 * mailbox." Moreover, the mailbox may return a bogus state,
@@ -6344,7 +6354,8 @@ void hsw_disable_ips(const struct intel_crtc_state *crtc_state)
                return;
 
        if (IS_BROADWELL(dev_priv)) {
-               WARN_ON(sandybridge_pcode_write(dev_priv, DISPLAY_IPS_CONTROL, 0));
+               drm_WARN_ON(dev,
+                           sandybridge_pcode_write(dev_priv, DISPLAY_IPS_CONTROL, 0));
                /*
                 * Wait for PCODE to finish disabling IPS. The BSpec specified
                 * 42ms timeout value leads to occasional timeouts so use 100ms
@@ -6857,7 +6868,7 @@ static void ilk_crtc_enable(struct intel_atomic_state *state,
        struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
        enum pipe pipe = crtc->pipe;
 
-       if (WARN_ON(crtc->active))
+       if (drm_WARN_ON(&dev_priv->drm, crtc->active))
                return;
 
        /*
@@ -7013,7 +7024,7 @@ static void hsw_crtc_enable(struct intel_atomic_state *state,
        enum transcoder cpu_transcoder = new_crtc_state->cpu_transcoder;
        bool psl_clkgate_wa;
 
-       if (WARN_ON(crtc->active))
+       if (drm_WARN_ON(&dev_priv->drm, crtc->active))
                return;
 
        intel_encoders_pre_pll_enable(state, crtc);
@@ -7196,7 +7207,8 @@ static void i9xx_pfit_enable(const struct intel_crtc_state *crtc_state)
         * The panel fitter should only be adjusted whilst the pipe is disabled,
         * according to register description and PRM.
         */
-       WARN_ON(intel_de_read(dev_priv, PFIT_CONTROL) & PFIT_ENABLE);
+       drm_WARN_ON(&dev_priv->drm,
+                   intel_de_read(dev_priv, PFIT_CONTROL) & PFIT_ENABLE);
        assert_pipe_disabled(dev_priv, crtc_state->cpu_transcoder);
 
        intel_de_write(dev_priv, PFIT_PGM_RATIOS,
@@ -7392,7 +7404,7 @@ static void valleyview_crtc_enable(struct intel_atomic_state *state,
        struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
        enum pipe pipe = crtc->pipe;
 
-       if (WARN_ON(crtc->active))
+       if (drm_WARN_ON(&dev_priv->drm, crtc->active))
                return;
 
        if (intel_crtc_has_dp_encoder(new_crtc_state))
@@ -7458,7 +7470,7 @@ static void i9xx_crtc_enable(struct intel_atomic_state *state,
        struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
        enum pipe pipe = crtc->pipe;
 
-       if (WARN_ON(crtc->active))
+       if (drm_WARN_ON(&dev_priv->drm, crtc->active))
                return;
 
        i9xx_set_pll_dividers(new_crtc_state);
@@ -7604,7 +7616,7 @@ static void intel_crtc_disable_noatomic(struct intel_crtc *crtc,
        temp_crtc_state = intel_atomic_get_crtc_state(state, crtc);
        ret = drm_atomic_add_affected_connectors(state, &crtc->base);
 
-       WARN_ON(IS_ERR(temp_crtc_state) || ret);
+       drm_WARN_ON(&dev_priv->drm, IS_ERR(temp_crtc_state) || ret);
 
        dev_priv->display.crtc_disable(to_intel_atomic_state(state), crtc);
 
@@ -7617,7 +7629,8 @@ static void intel_crtc_disable_noatomic(struct intel_crtc *crtc,
        crtc->active = false;
        crtc->base.enabled = false;
 
-       WARN_ON(drm_atomic_set_mode_for_crtc(&crtc_state->uapi, NULL) < 0);
+       drm_WARN_ON(&dev_priv->drm,
+                   drm_atomic_set_mode_for_crtc(&crtc_state->uapi, NULL) < 0);
        crtc_state->uapi.active = false;
        crtc_state->uapi.connector_mask = 0;
        crtc_state->uapi.encoder_mask = 0;
@@ -9227,7 +9240,7 @@ i9xx_get_initial_plane_config(struct intel_crtc *crtc,
        if (!plane->get_hw_state(plane, &pipe))
                return;
 
-       WARN_ON(pipe != crtc->pipe);
+       drm_WARN_ON(dev, pipe != crtc->pipe);
 
        intel_fb = kzalloc(sizeof(*intel_fb), GFP_KERNEL);
        if (!intel_fb) {
@@ -9339,7 +9352,8 @@ bdw_get_pipemisc_output_format(struct intel_crtc *crtc)
 
        if (tmp & PIPEMISC_YUV420_ENABLE) {
                /* We support 4:2:0 in full blend mode only */
-               WARN_ON((tmp & PIPEMISC_YUV420_MODE_FULL_BLEND) == 0);
+               drm_WARN_ON(&dev_priv->drm,
+                           (tmp & PIPEMISC_YUV420_MODE_FULL_BLEND) == 0);
 
                return INTEL_OUTPUT_FORMAT_YCBCR420;
        } else if (tmp & PIPEMISC_OUTPUT_COLORSPACE_YUV) {
@@ -9766,10 +9780,11 @@ static void lpt_enable_clkout_dp(struct drm_i915_private *dev_priv,
 {
        u32 reg, tmp;
 
-       if (WARN(with_fdi && !with_spread, "FDI requires downspread\n"))
+       if (drm_WARN(&dev_priv->drm, with_fdi && !with_spread,
+                    "FDI requires downspread\n"))
                with_spread = true;
-       if (WARN(HAS_PCH_LPT_LP(dev_priv) &&
-           with_fdi, "LP PCH doesn't have FDI\n"))
+       if (drm_WARN(&dev_priv->drm, HAS_PCH_LPT_LP(dev_priv) &&
+                    with_fdi, "LP PCH doesn't have FDI\n"))
                with_fdi = false;
 
        mutex_lock(&dev_priv->sb_lock);
@@ -9863,10 +9878,10 @@ static void lpt_bend_clkout_dp(struct drm_i915_private *dev_priv, int steps)
        u32 tmp;
        int idx = BEND_IDX(steps);
 
-       if (WARN_ON(steps % 5 != 0))
+       if (drm_WARN_ON(&dev_priv->drm, steps % 5 != 0))
                return;
 
-       if (WARN_ON(idx >= ARRAY_SIZE(sscdivintphase)))
+       if (drm_WARN_ON(&dev_priv->drm, idx >= ARRAY_SIZE(sscdivintphase)))
                return;
 
        mutex_lock(&dev_priv->sb_lock);
@@ -10034,8 +10049,8 @@ static void ilk_set_pipeconf(const struct intel_crtc_state *crtc_state)
         * This would end up with an odd purple hue over
         * the entire display. Make sure we don't do it.
         */
-       WARN_ON(crtc_state->limited_color_range &&
-               crtc_state->output_format != INTEL_OUTPUT_FORMAT_RGB);
+       drm_WARN_ON(&dev_priv->drm, crtc_state->limited_color_range &&
+                   crtc_state->output_format != INTEL_OUTPUT_FORMAT_RGB);
 
        if (crtc_state->limited_color_range)
                val |= PIPECONF_COLOR_RANGE_SELECT;
@@ -10446,7 +10461,7 @@ skl_get_initial_plane_config(struct intel_crtc *crtc,
        if (!plane->get_hw_state(plane, &pipe))
                return;
 
-       WARN_ON(pipe != crtc->pipe);
+       drm_WARN_ON(dev, pipe != crtc->pipe);
 
        intel_fb = kzalloc(sizeof(*intel_fb), GFP_KERNEL);
        if (!intel_fb) {
@@ -10581,8 +10596,8 @@ static void ilk_get_pfit_config(struct intel_crtc *crtc,
                 * ivb/hsw (since we don't use the higher upscaling modes which
                 * differentiates them) so just WARN about this case for now. */
                if (IS_GEN(dev_priv, 7)) {
-                       WARN_ON((tmp & PF_PIPE_SEL_MASK_IVB) !=
-                               PF_PIPE_SEL_IVB(crtc->pipe));
+                       drm_WARN_ON(dev, (tmp & PF_PIPE_SEL_MASK_IVB) !=
+                                   PF_PIPE_SEL_IVB(crtc->pipe));
                }
        }
 }
@@ -10680,8 +10695,8 @@ static bool ilk_get_pipe_config(struct intel_crtc *crtc,
                        intel_get_shared_dpll_by_id(dev_priv, pll_id);
                pll = pipe_config->shared_dpll;
 
-               WARN_ON(!pll->info->funcs->get_hw_state(dev_priv, pll,
-                                               &pipe_config->dpll_hw_state));
+               drm_WARN_ON(dev, !pll->info->funcs->get_hw_state(dev_priv, pll,
+                                                &pipe_config->dpll_hw_state));
 
                tmp = pipe_config->dpll_hw_state.dpll;
                pipe_config->pixel_multiplier =
@@ -10738,7 +10753,7 @@ static void cnl_get_ddi_pll(struct drm_i915_private *dev_priv, enum port port,
        temp = intel_de_read(dev_priv, DPCLKA_CFGCR0) & DPCLKA_CFGCR0_DDI_CLK_SEL_MASK(port);
        id = temp >> DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT(port);
 
-       if (WARN_ON(id < SKL_DPLL0 || id > SKL_DPLL2))
+       if (drm_WARN_ON(&dev_priv->drm, id < SKL_DPLL0 || id > SKL_DPLL2))
                return;
 
        pipe_config->shared_dpll = intel_get_shared_dpll_by_id(dev_priv, id);
@@ -10765,12 +10780,13 @@ static void icl_get_ddi_pll(struct drm_i915_private *dev_priv, enum port port,
                                                                    port));
                        port_dpll_id = ICL_PORT_DPLL_MG_PHY;
                } else {
-                       WARN_ON(clk_sel < DDI_CLK_SEL_TBT_162);
+                       drm_WARN_ON(&dev_priv->drm,
+                                   clk_sel < DDI_CLK_SEL_TBT_162);
                        id = DPLL_ID_ICL_TBTPLL;
                        port_dpll_id = ICL_PORT_DPLL_DEFAULT;
                }
        } else {
-               WARN(1, "Invalid port %x\n", port);
+               drm_WARN(&dev_priv->drm, 1, "Invalid port %x\n", port);
                return;
        }
 
@@ -10813,7 +10829,7 @@ static void skl_get_ddi_pll(struct drm_i915_private *dev_priv, enum port port,
        temp = intel_de_read(dev_priv, DPLL_CTRL2) & DPLL_CTRL2_DDI_CLK_SEL_MASK(port);
        id = temp >> (port * 3 + 1);
 
-       if (WARN_ON(id < SKL_DPLL0 || id > SKL_DPLL3))
+       if (drm_WARN_ON(&dev_priv->drm, id < SKL_DPLL0 || id > SKL_DPLL3))
                return;
 
        pipe_config->shared_dpll = intel_get_shared_dpll_by_id(dev_priv, id);
@@ -10907,8 +10923,9 @@ static bool hsw_get_transcoder_state(struct intel_crtc *crtc,
 
                switch (tmp & TRANS_DDI_EDP_INPUT_MASK) {
                default:
-                       WARN(1, "unknown pipe linked to transcoder %s\n",
-                            transcoder_name(panel_transcoder));
+                       drm_WARN(dev, 1,
+                                "unknown pipe linked to transcoder %s\n",
+                                transcoder_name(panel_transcoder));
                        /* fall through */
                case TRANS_DDI_EDP_INPUT_A_ONOFF:
                        force_thru = true;
@@ -10936,11 +10953,11 @@ static bool hsw_get_transcoder_state(struct intel_crtc *crtc,
        /*
         * Valid combos: none, eDP, DSI0, DSI1, DSI0+DSI1
         */
-       WARN_ON((enabled_panel_transcoders & BIT(TRANSCODER_EDP)) &&
-               enabled_panel_transcoders != BIT(TRANSCODER_EDP));
+       drm_WARN_ON(dev, (enabled_panel_transcoders & BIT(TRANSCODER_EDP)) &&
+                   enabled_panel_transcoders != BIT(TRANSCODER_EDP));
 
        power_domain = POWER_DOMAIN_TRANSCODER(pipe_config->cpu_transcoder);
-       WARN_ON(*power_domain_mask & BIT_ULL(power_domain));
+       drm_WARN_ON(dev, *power_domain_mask & BIT_ULL(power_domain));
 
        wf = intel_display_power_get_if_enabled(dev_priv, power_domain);
        if (!wf)
@@ -10974,7 +10991,7 @@ static bool bxt_get_dsi_transcoder_state(struct intel_crtc *crtc,
                        cpu_transcoder = TRANSCODER_DSI_C;
 
                power_domain = POWER_DOMAIN_TRANSCODER(cpu_transcoder);
-               WARN_ON(*power_domain_mask & BIT_ULL(power_domain));
+               drm_WARN_ON(dev, *power_domain_mask & BIT_ULL(power_domain));
 
                wf = intel_display_power_get_if_enabled(dev_priv, power_domain);
                if (!wf)
@@ -11043,7 +11060,8 @@ static void hsw_get_ddi_port_state(struct intel_crtc *crtc,
 
        pll = pipe_config->shared_dpll;
        if (pll) {
-               WARN_ON(!pll->info->funcs->get_hw_state(dev_priv, pll,
+               drm_WARN_ON(&dev_priv->drm,
+                           !pll->info->funcs->get_hw_state(dev_priv, pll,
                                                &pipe_config->dpll_hw_state));
        }
 
@@ -11114,8 +11132,9 @@ static void icl_get_trans_port_sync_config(struct intel_crtc_state *crtc_state)
                intel_display_power_put(dev_priv, power_domain, trans_wakeref);
        }
 
-       WARN_ON(crtc_state->master_transcoder != INVALID_TRANSCODER &&
-               crtc_state->sync_mode_slaves_mask);
+       drm_WARN_ON(&dev_priv->drm,
+                   crtc_state->master_transcoder != INVALID_TRANSCODER &&
+                   crtc_state->sync_mode_slaves_mask);
 }
 
 static bool hsw_get_pipe_config(struct intel_crtc *crtc,
@@ -11146,7 +11165,7 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc,
        if (IS_GEN9_LP(dev_priv) &&
            bxt_get_dsi_transcoder_state(crtc, pipe_config,
                                         &power_domain_mask, wakerefs)) {
-               WARN_ON(active);
+               drm_WARN_ON(&dev_priv->drm, active);
                active = true;
        }
 
@@ -11213,7 +11232,7 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc,
                        REG_FIELD_GET(HSW_IPS_LINETIME_MASK, tmp);
 
        power_domain = POWER_DOMAIN_PIPE_PANEL_FITTER(crtc->pipe);
-       WARN_ON(power_domain_mask & BIT_ULL(power_domain));
+       drm_WARN_ON(&dev_priv->drm, power_domain_mask & BIT_ULL(power_domain));
 
        wf = intel_display_power_get_if_enabled(dev_priv, power_domain);
        if (wf) {
@@ -11460,8 +11479,8 @@ static int i845_check_cursor(struct intel_crtc_state *crtc_state,
                return -EINVAL;
        }
 
-       WARN_ON(plane_state->uapi.visible &&
-               plane_state->color_plane[0].stride != fb->pitches[0]);
+       drm_WARN_ON(&i915->drm, plane_state->uapi.visible &&
+                   plane_state->color_plane[0].stride != fb->pitches[0]);
 
        switch (fb->pitches[0]) {
        case 256:
@@ -11677,8 +11696,8 @@ static int i9xx_check_cursor(struct intel_crtc_state *crtc_state,
                return -EINVAL;
        }
 
-       WARN_ON(plane_state->uapi.visible &&
-               plane_state->color_plane[0].stride != fb->pitches[0]);
+       drm_WARN_ON(&dev_priv->drm, plane_state->uapi.visible &&
+                   plane_state->color_plane[0].stride != fb->pitches[0]);
 
        if (fb->pitches[0] !=
            drm_rect_width(&plane_state->uapi.dst) * fb->format->cpp[0]) {
@@ -11897,7 +11916,7 @@ int intel_get_load_detect_pipe(struct drm_connector *connector,
 
        old->restore_state = NULL;
 
-       WARN_ON(!drm_modeset_is_locked(&config->connection_mutex));
+       drm_WARN_ON(dev, !drm_modeset_is_locked(&config->connection_mutex));
 
        /*
         * Algorithm gets a little messy:
@@ -12341,7 +12360,7 @@ int intel_plane_atomic_calc_changes(const struct intel_crtc_state *old_crtc_stat
        was_visible = old_plane_state->uapi.visible;
        visible = plane_state->uapi.visible;
 
-       if (!was_crtc_enabled && WARN_ON(was_visible))
+       if (!was_crtc_enabled && drm_WARN_ON(&dev_priv->drm, was_visible))
                was_visible = false;
 
        /*
@@ -12687,7 +12706,7 @@ static int intel_crtc_atomic_check(struct intel_atomic_state *state,
 
        if (mode_changed && crtc_state->hw.enable &&
            dev_priv->display.crtc_compute_clock &&
-           !WARN_ON(crtc_state->shared_dpll)) {
+           !drm_WARN_ON(&dev_priv->drm, crtc_state->shared_dpll)) {
                ret = dev_priv->display.crtc_compute_clock(crtc, crtc_state);
                if (ret)
                        return ret;
@@ -12717,7 +12736,8 @@ static int intel_crtc_atomic_check(struct intel_atomic_state *state,
        }
 
        if (dev_priv->display.compute_intermediate_wm) {
-               if (WARN_ON(!dev_priv->display.compute_pipe_wm))
+               if (drm_WARN_ON(&dev_priv->drm,
+                               !dev_priv->display.compute_pipe_wm))
                        return 0;
 
                /*
@@ -13152,11 +13172,11 @@ static bool check_digital_port_conflicts(struct intel_atomic_state *state)
 
                encoder = to_intel_encoder(connector_state->best_encoder);
 
-               WARN_ON(!connector_state->crtc);
+               drm_WARN_ON(dev, !connector_state->crtc);
 
                switch (encoder->type) {
                case INTEL_OUTPUT_DDI:
-                       if (WARN_ON(!HAS_DDI(to_i915(dev))))
+                       if (drm_WARN_ON(dev, !HAS_DDI(to_i915(dev))))
                                break;
                        /* else, fall through */
                case INTEL_OUTPUT_DP:
@@ -13373,7 +13393,8 @@ encoder_retry:
        }
 
        if (ret == RETRY) {
-               if (WARN(!retry, "loop in pipe configuration computation\n"))
+               if (drm_WARN(&i915->drm, !retry,
+                            "loop in pipe configuration computation\n"))
                        return -EINVAL;
 
                drm_dbg_kms(&i915->drm, "CRTC bw constrained, retrying\n");
@@ -13933,9 +13954,10 @@ static void intel_pipe_config_sanity_check(struct drm_i915_private *dev_priv,
                 * FDI already provided one idea for the dotclock.
                 * Yell if the encoder disagrees.
                 */
-               WARN(!intel_fuzzy_clock_check(fdi_dotclock, dotclock),
-                    "FDI dotclock and encoder dotclock mismatch, fdi: %i, encoder: %i\n",
-                    fdi_dotclock, dotclock);
+               drm_WARN(&dev_priv->drm,
+                        !intel_fuzzy_clock_check(fdi_dotclock, dotclock),
+                        "FDI dotclock and encoder dotclock mismatch, fdi: %i, encoder: %i\n",
+                        fdi_dotclock, dotclock);
        }
 }
 
@@ -15062,7 +15084,8 @@ static struct intel_crtc *intel_get_slave_crtc(const struct intel_crtc_state *ne
        struct drm_i915_private *dev_priv = to_i915(new_crtc_state->uapi.crtc->dev);
        enum transcoder slave_transcoder;
 
-       WARN_ON(!is_power_of_2(new_crtc_state->sync_mode_slaves_mask));
+       drm_WARN_ON(&dev_priv->drm,
+                   !is_power_of_2(new_crtc_state->sync_mode_slaves_mask));
 
        slave_transcoder = ffs(new_crtc_state->sync_mode_slaves_mask) - 1;
        return intel_get_crtc_for_pipe(dev_priv,
@@ -15230,8 +15253,8 @@ static void intel_update_trans_port_sync_crtcs(struct intel_crtc *crtc,
        struct intel_crtc_state *old_slave_crtc_state =
                intel_atomic_get_old_crtc_state(state, slave_crtc);
 
-       WARN_ON(!slave_crtc || !new_slave_crtc_state ||
-               !old_slave_crtc_state);
+       drm_WARN_ON(&i915->drm, !slave_crtc || !new_slave_crtc_state ||
+                   !old_slave_crtc_state);
 
        drm_dbg_kms(&i915->drm,
                    "Updating Transcoder Port Sync Master CRTC = %d %s and Slave CRTC %d %s\n",
@@ -15369,8 +15392,8 @@ static void skl_commit_modeset_enables(struct intel_atomic_state *state)
                    is_trans_port_sync_slave(new_crtc_state))
                        continue;
 
-               WARN_ON(skl_ddb_allocation_overlaps(&new_crtc_state->wm.skl.ddb,
-                                                   entries, num_pipes, pipe));
+               drm_WARN_ON(&dev_priv->drm, skl_ddb_allocation_overlaps(&new_crtc_state->wm.skl.ddb,
+                                                                       entries, num_pipes, pipe));
 
                entries[pipe] = new_crtc_state->wm.skl.ddb;
                modeset_pipes &= ~BIT(pipe);
@@ -15404,8 +15427,8 @@ static void skl_commit_modeset_enables(struct intel_atomic_state *state)
                if ((modeset_pipes & BIT(pipe)) == 0)
                        continue;
 
-               WARN_ON(skl_ddb_allocation_overlaps(&new_crtc_state->wm.skl.ddb,
-                                                   entries, num_pipes, pipe));
+               drm_WARN_ON(&dev_priv->drm, skl_ddb_allocation_overlaps(&new_crtc_state->wm.skl.ddb,
+                                                                       entries, num_pipes, pipe));
 
                entries[pipe] = new_crtc_state->wm.skl.ddb;
                modeset_pipes &= ~BIT(pipe);
@@ -15413,7 +15436,7 @@ static void skl_commit_modeset_enables(struct intel_atomic_state *state)
                intel_update_crtc(crtc, state, old_crtc_state, new_crtc_state);
        }
 
-       WARN_ON(modeset_pipes);
+       drm_WARN_ON(&dev_priv->drm, modeset_pipes);
 
 }
 
@@ -16667,7 +16690,7 @@ static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe)
 
        intel_color_init(crtc);
 
-       WARN_ON(drm_crtc_index(&crtc->base) != crtc->pipe);
+       drm_WARN_ON(&dev_priv->drm, drm_crtc_index(&crtc->base) != crtc->pipe);
 
        return 0;
 
@@ -17534,7 +17557,7 @@ static void sanitize_watermarks(struct drm_i915_private *dev_priv)
                return;
 
        state = drm_atomic_state_alloc(&dev_priv->drm);
-       if (WARN_ON(!state))
+       if (drm_WARN_ON(&dev_priv->drm, !state))
                return;
 
        intel_state = to_intel_atomic_state(state);
@@ -17586,7 +17609,8 @@ fail:
         * If this actually happens, we'll have to just leave the
         * BIOS-programmed watermarks untouched and hope for the best.
         */
-       WARN(ret, "Could not determine valid watermarks for inherited state\n");
+       drm_WARN(&dev_priv->drm, ret,
+                "Could not determine valid watermarks for inherited state\n");
 
        drm_atomic_state_put(state);
 
@@ -17881,7 +17905,8 @@ void i830_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe)
        u32 dpll, fp;
        int i;
 
-       WARN_ON(i9xx_calc_dpll_params(48000, &clock) != 25154);
+       drm_WARN_ON(&dev_priv->drm,
+                   i9xx_calc_dpll_params(48000, &clock) != 25154);
 
        drm_dbg_kms(&dev_priv->drm,
                    "enabling pipe %c due to force quirk (vco=%d dot=%d)\n",
@@ -17946,11 +17971,19 @@ void i830_disable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe)
        drm_dbg_kms(&dev_priv->drm, "disabling pipe %c due to force quirk\n",
                    pipe_name(pipe));
 
-       WARN_ON(intel_de_read(dev_priv, DSPCNTR(PLANE_A)) & DISPLAY_PLANE_ENABLE);
-       WARN_ON(intel_de_read(dev_priv, DSPCNTR(PLANE_B)) & DISPLAY_PLANE_ENABLE);
-       WARN_ON(intel_de_read(dev_priv, DSPCNTR(PLANE_C)) & DISPLAY_PLANE_ENABLE);
-       WARN_ON(intel_de_read(dev_priv, CURCNTR(PIPE_A)) & MCURSOR_MODE);
-       WARN_ON(intel_de_read(dev_priv, CURCNTR(PIPE_B)) & MCURSOR_MODE);
+       drm_WARN_ON(&dev_priv->drm,
+                   intel_de_read(dev_priv, DSPCNTR(PLANE_A)) &
+                   DISPLAY_PLANE_ENABLE);
+       drm_WARN_ON(&dev_priv->drm,
+                   intel_de_read(dev_priv, DSPCNTR(PLANE_B)) &
+                   DISPLAY_PLANE_ENABLE);
+       drm_WARN_ON(&dev_priv->drm,
+                   intel_de_read(dev_priv, DSPCNTR(PLANE_C)) &
+                   DISPLAY_PLANE_ENABLE);
+       drm_WARN_ON(&dev_priv->drm,
+                   intel_de_read(dev_priv, CURCNTR(PIPE_A)) & MCURSOR_MODE);
+       drm_WARN_ON(&dev_priv->drm,
+                   intel_de_read(dev_priv, CURCNTR(PIPE_B)) & MCURSOR_MODE);
 
        intel_de_write(dev_priv, PIPECONF(pipe), 0);
        intel_de_posting_read(dev_priv, PIPECONF(pipe));
@@ -18454,7 +18487,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
 
                if (crtc_state->hw.active) {
                        min_cdclk = intel_crtc_compute_min_cdclk(crtc_state);
-                       if (WARN_ON(min_cdclk < 0))
+                       if (drm_WARN_ON(dev, min_cdclk < 0))
                                min_cdclk = 0;
                }
 
@@ -18668,7 +18701,7 @@ intel_modeset_setup_hw_state(struct drm_device *dev,
                u64 put_domains;
 
                put_domains = modeset_get_crtc_power_domains(crtc_state);
-               if (WARN_ON(put_domains))
+               if (drm_WARN_ON(dev, put_domains))
                        modeset_put_power_domains(dev_priv, put_domains);
        }
 
@@ -18735,7 +18768,7 @@ void intel_modeset_driver_remove(struct drm_i915_private *i915)
        flush_workqueue(i915->modeset_wq);
 
        flush_work(&i915->atomic_helper.free_work);
-       WARN_ON(!llist_empty(&i915->atomic_helper.free_list));
+       drm_WARN_ON(&i915->drm, !llist_empty(&i915->atomic_helper.free_list));
 }
 
 /* part #2: call after irq uninstall */