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

drm/i915/display/overlay: Make WARN* drm specific where drm_priv 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_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: 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-15-pankaj.laxminarayan.bharadiya@intel.com
parent 10d4e146
...@@ -248,7 +248,7 @@ static int intel_overlay_on(struct intel_overlay *overlay) ...@@ -248,7 +248,7 @@ static int intel_overlay_on(struct intel_overlay *overlay)
struct i915_request *rq; struct i915_request *rq;
u32 *cs; u32 *cs;
WARN_ON(overlay->active); drm_WARN_ON(&dev_priv->drm, overlay->active);
rq = alloc_request(overlay, NULL); rq = alloc_request(overlay, NULL);
if (IS_ERR(rq)) if (IS_ERR(rq))
...@@ -316,7 +316,7 @@ static int intel_overlay_continue(struct intel_overlay *overlay, ...@@ -316,7 +316,7 @@ static int intel_overlay_continue(struct intel_overlay *overlay,
u32 flip_addr = overlay->flip_addr; u32 flip_addr = overlay->flip_addr;
u32 tmp, *cs; u32 tmp, *cs;
WARN_ON(!overlay->active); drm_WARN_ON(&dev_priv->drm, !overlay->active);
if (load_polyphase_filter) if (load_polyphase_filter)
flip_addr |= OFC_UPDATE; flip_addr |= OFC_UPDATE;
...@@ -760,7 +760,8 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay, ...@@ -760,7 +760,8 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay,
struct i915_vma *vma; struct i915_vma *vma;
int ret, tmp_width; int ret, tmp_width;
WARN_ON(!drm_modeset_is_locked(&dev_priv->drm.mode_config.connection_mutex)); drm_WARN_ON(&dev_priv->drm,
!drm_modeset_is_locked(&dev_priv->drm.mode_config.connection_mutex));
ret = intel_overlay_release_old_vid(overlay); ret = intel_overlay_release_old_vid(overlay);
if (ret != 0) if (ret != 0)
...@@ -858,7 +859,8 @@ int intel_overlay_switch_off(struct intel_overlay *overlay) ...@@ -858,7 +859,8 @@ int intel_overlay_switch_off(struct intel_overlay *overlay)
struct drm_i915_private *dev_priv = overlay->i915; struct drm_i915_private *dev_priv = overlay->i915;
int ret; int ret;
WARN_ON(!drm_modeset_is_locked(&dev_priv->drm.mode_config.connection_mutex)); drm_WARN_ON(&dev_priv->drm,
!drm_modeset_is_locked(&dev_priv->drm.mode_config.connection_mutex));
ret = intel_overlay_recover_from_interrupt(overlay); ret = intel_overlay_recover_from_interrupt(overlay);
if (ret != 0) if (ret != 0)
...@@ -1390,7 +1392,7 @@ void intel_overlay_cleanup(struct drm_i915_private *dev_priv) ...@@ -1390,7 +1392,7 @@ void intel_overlay_cleanup(struct drm_i915_private *dev_priv)
* Furthermore modesetting teardown happens beforehand so the * Furthermore modesetting teardown happens beforehand so the
* hardware should be off already. * hardware should be off already.
*/ */
WARN_ON(overlay->active); drm_WARN_ON(&dev_priv->drm, overlay->active);
i915_gem_object_put(overlay->reg_bo); i915_gem_object_put(overlay->reg_bo);
i915_active_fini(&overlay->last_flip); i915_active_fini(&overlay->last_flip);
......
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