drm/i915/display/fbc: 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: 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-11-pankaj.laxminarayan.bharadiya@intel.com
This commit is contained in:
parent
99bc73ec8d
commit
6a0e032fb5
|
@ -412,7 +412,7 @@ static void intel_fbc_deactivate(struct drm_i915_private *dev_priv,
|
|||
{
|
||||
struct intel_fbc *fbc = &dev_priv->fbc;
|
||||
|
||||
WARN_ON(!mutex_is_locked(&fbc->lock));
|
||||
drm_WARN_ON(&dev_priv->drm, !mutex_is_locked(&fbc->lock));
|
||||
|
||||
if (fbc->active)
|
||||
intel_fbc_hw_deactivate(dev_priv);
|
||||
|
@ -476,7 +476,8 @@ static int intel_fbc_alloc_cfb(struct drm_i915_private *dev_priv,
|
|||
struct drm_mm_node *uninitialized_var(compressed_llb);
|
||||
int ret;
|
||||
|
||||
WARN_ON(drm_mm_node_allocated(&fbc->compressed_fb));
|
||||
drm_WARN_ON(&dev_priv->drm,
|
||||
drm_mm_node_allocated(&fbc->compressed_fb));
|
||||
|
||||
ret = find_compression_threshold(dev_priv, &fbc->compressed_fb,
|
||||
size, fb_cpp);
|
||||
|
@ -564,7 +565,7 @@ static bool stride_is_valid(struct drm_i915_private *dev_priv,
|
|||
unsigned int stride)
|
||||
{
|
||||
/* This should have been caught earlier. */
|
||||
if (WARN_ON_ONCE((stride & (64 - 1)) != 0))
|
||||
if (drm_WARN_ON_ONCE(&dev_priv->drm, (stride & (64 - 1)) != 0))
|
||||
return false;
|
||||
|
||||
/* Below are the additional FBC restrictions. */
|
||||
|
@ -672,8 +673,8 @@ static void intel_fbc_update_state_cache(struct intel_crtc *crtc,
|
|||
cache->fb.format = fb->format;
|
||||
cache->fb.stride = fb->pitches[0];
|
||||
|
||||
WARN_ON(plane_state->flags & PLANE_HAS_FENCE &&
|
||||
!plane_state->vma->fence);
|
||||
drm_WARN_ON(&dev_priv->drm, plane_state->flags & PLANE_HAS_FENCE &&
|
||||
!plane_state->vma->fence);
|
||||
|
||||
if (plane_state->flags & PLANE_HAS_FENCE &&
|
||||
plane_state->vma->fence)
|
||||
|
@ -939,9 +940,9 @@ static void __intel_fbc_disable(struct drm_i915_private *dev_priv)
|
|||
struct intel_fbc *fbc = &dev_priv->fbc;
|
||||
struct intel_crtc *crtc = fbc->crtc;
|
||||
|
||||
WARN_ON(!mutex_is_locked(&fbc->lock));
|
||||
WARN_ON(!fbc->crtc);
|
||||
WARN_ON(fbc->active);
|
||||
drm_WARN_ON(&dev_priv->drm, !mutex_is_locked(&fbc->lock));
|
||||
drm_WARN_ON(&dev_priv->drm, !fbc->crtc);
|
||||
drm_WARN_ON(&dev_priv->drm, fbc->active);
|
||||
|
||||
DRM_DEBUG_KMS("Disabling FBC on pipe %c\n", pipe_name(crtc->pipe));
|
||||
|
||||
|
@ -955,7 +956,7 @@ static void __intel_fbc_post_update(struct intel_crtc *crtc)
|
|||
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
|
||||
struct intel_fbc *fbc = &dev_priv->fbc;
|
||||
|
||||
WARN_ON(!mutex_is_locked(&fbc->lock));
|
||||
drm_WARN_ON(&dev_priv->drm, !mutex_is_locked(&fbc->lock));
|
||||
|
||||
if (fbc->crtc != crtc)
|
||||
return;
|
||||
|
@ -1148,7 +1149,7 @@ void intel_fbc_enable(struct intel_atomic_state *state,
|
|||
__intel_fbc_disable(dev_priv);
|
||||
}
|
||||
|
||||
WARN_ON(fbc->active);
|
||||
drm_WARN_ON(&dev_priv->drm, fbc->active);
|
||||
|
||||
intel_fbc_update_state_cache(crtc, crtc_state, plane_state);
|
||||
|
||||
|
@ -1215,7 +1216,7 @@ void intel_fbc_global_disable(struct drm_i915_private *dev_priv)
|
|||
|
||||
mutex_lock(&fbc->lock);
|
||||
if (fbc->crtc) {
|
||||
WARN_ON(fbc->crtc->active);
|
||||
drm_WARN_ON(&dev_priv->drm, fbc->crtc->active);
|
||||
__intel_fbc_disable(dev_priv);
|
||||
}
|
||||
mutex_unlock(&fbc->lock);
|
||||
|
|
Loading…
Reference in New Issue