]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/i915/display/panel: Make WARN* drm specific where drm_priv ptr is available
authorPankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Tue, 28 Jan 2020 18:15:57 +0000 (23:45 +0530)
committerJani Nikula <jani.nikula@intel.com>
Tue, 4 Feb 2020 08:53:09 +0000 (10:53 +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_i915_private struct pointer is readily
available.

The conversion was done automatically with below coccinelle semantic
patch.

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

@rule2@
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/20200128181603.27767-16-pankaj.laxminarayan.bharadiya@intel.com
drivers/gpu/drm/i915/display/intel_panel.c

index c03afcef85ae9ffff9e1527d004995331b3b1879..7b035f44fce783b105eabd032098e2716fc977a2 100644 (file)
@@ -423,7 +423,8 @@ void intel_gmch_panel_fitting(struct intel_crtc *intel_crtc,
                }
                break;
        default:
-               WARN(1, "bad panel fit mode: %d\n", fitting_mode);
+               drm_WARN(&dev_priv->drm, 1, "bad panel fit mode: %d\n",
+                        fitting_mode);
                return;
        }
 
@@ -520,7 +521,7 @@ static u32 intel_panel_compute_brightness(struct intel_connector *connector,
        struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
        struct intel_panel *panel = &connector->panel;
 
-       WARN_ON(panel->backlight.max == 0);
+       drm_WARN_ON(&dev_priv->drm, panel->backlight.max == 0);
 
        if (i915_modparams.invert_brightness < 0)
                return val;
@@ -569,7 +570,7 @@ static u32 i9xx_get_backlight(struct intel_connector *connector)
 
 static u32 _vlv_get_backlight(struct drm_i915_private *dev_priv, enum pipe pipe)
 {
-       if (WARN_ON(pipe != PIPE_A && pipe != PIPE_B))
+       if (drm_WARN_ON(&dev_priv->drm, pipe != PIPE_A && pipe != PIPE_B))
                return 0;
 
        return intel_de_read(dev_priv, VLV_BLC_PWM_CTL(pipe)) & BACKLIGHT_DUTY_CYCLE_MASK;
@@ -627,7 +628,7 @@ static void i9xx_set_backlight(const struct drm_connector_state *conn_state, u32
        struct intel_panel *panel = &connector->panel;
        u32 tmp, mask;
 
-       WARN_ON(panel->backlight.max == 0);
+       drm_WARN_ON(&dev_priv->drm, panel->backlight.max == 0);
 
        if (panel->backlight.combination_mode) {
                u8 lbpc;
@@ -711,7 +712,7 @@ void intel_panel_set_backlight_acpi(const struct drm_connector_state *conn_state
 
        mutex_lock(&dev_priv->backlight_lock);
 
-       WARN_ON(panel->backlight.max == 0);
+       drm_WARN_ON(&dev_priv->drm, panel->backlight.max == 0);
 
        hw_level = clamp_user_to_hw(connector, user_level, user_max);
        panel->backlight.level = hw_level;
@@ -1256,7 +1257,7 @@ static void intel_panel_set_backlight(const struct drm_connector_state *conn_sta
 
        mutex_lock(&dev_priv->backlight_lock);
 
-       WARN_ON(panel->backlight.max == 0);
+       drm_WARN_ON(&dev_priv->drm, panel->backlight.max == 0);
 
        hw_level = scale_user_to_hw(connector, user_level, user_max);
        panel->backlight.level = hw_level;
@@ -1565,7 +1566,7 @@ static u32 get_backlight_min_vbt(struct intel_connector *connector)
        struct intel_panel *panel = &connector->panel;
        int min;
 
-       WARN_ON(panel->backlight.max == 0);
+       drm_WARN_ON(&dev_priv->drm, panel->backlight.max == 0);
 
        /*
         * XXX: If the vbt value is 255, it makes min equal to max, which leads
@@ -1752,7 +1753,7 @@ static int vlv_setup_backlight(struct intel_connector *connector, enum pipe pipe
        struct intel_panel *panel = &connector->panel;
        u32 ctl, ctl2, val;
 
-       if (WARN_ON(pipe != PIPE_A && pipe != PIPE_B))
+       if (drm_WARN_ON(&dev_priv->drm, pipe != PIPE_A && pipe != PIPE_B))
                return -ENODEV;
 
        ctl2 = intel_de_read(dev_priv, VLV_BLC_PWM_CTL2(pipe));
@@ -1946,7 +1947,7 @@ int intel_panel_setup_backlight(struct drm_connector *connector, enum pipe pipe)
        }
 
        /* ensure intel_panel has been initialized first */
-       if (WARN_ON(!panel->backlight.setup))
+       if (drm_WARN_ON(&dev_priv->drm, !panel->backlight.setup))
                return -ENODEV;
 
        /* set level and max in panel struct */