From: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> To: jani.nikula@linux.intel.com, daniel@ffwll.ch, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, "Joonas Lahtinen" <joonas.lahtinen@linux.intel.com>, "Rodrigo Vivi" <rodrigo.vivi@intel.com>, "David Airlie" <airlied@linux.ie>, "Ville Syrjälä" <ville.syrjala@linux.intel.com>, "Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>, "Chris Wilson" <chris@chris-wilson.co.uk>, "Daniel Drake" <drake@endlessm.com>, "Daniele Ceraolo Spurio" <daniele.ceraolospurio@intel.com> Cc: pankaj.laxminarayan.bharadiya@intel.com Subject: [Intel-gfx] [PATCH v5 10/21] drm/i915/display/fbc: Make WARN* drm specific where drm_priv ptr is available Date: Tue, 28 Jan 2020 23:45:52 +0530 [thread overview] Message-ID: <20200128181603.27767-11-pankaj.laxminarayan.bharadiya@intel.com> (raw) In-Reply-To: <20200128181603.27767-1-pankaj.laxminarayan.bharadiya@intel.com> 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> --- drivers/gpu/drm/i915/display/intel_fbc.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c index 2a3f1333c8ff..c27e007d5e04 100644 --- a/drivers/gpu/drm/i915/display/intel_fbc.c +++ b/drivers/gpu/drm/i915/display/intel_fbc.c @@ -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); @@ -562,7 +563,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. */ @@ -670,8 +671,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) @@ -937,9 +938,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)); @@ -953,7 +954,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; @@ -1146,7 +1147,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); @@ -1213,7 +1214,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); -- 2.23.0 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> To: jani.nikula@linux.intel.com, daniel@ffwll.ch, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, "Joonas Lahtinen" <joonas.lahtinen@linux.intel.com>, "Rodrigo Vivi" <rodrigo.vivi@intel.com>, "David Airlie" <airlied@linux.ie>, "Ville Syrjälä" <ville.syrjala@linux.intel.com>, "Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>, "Chris Wilson" <chris@chris-wilson.co.uk>, "Daniel Drake" <drake@endlessm.com>, "Daniele Ceraolo Spurio" <daniele.ceraolospurio@intel.com> Subject: [Intel-gfx] [PATCH v5 10/21] drm/i915/display/fbc: Make WARN* drm specific where drm_priv ptr is available Date: Tue, 28 Jan 2020 23:45:52 +0530 [thread overview] Message-ID: <20200128181603.27767-11-pankaj.laxminarayan.bharadiya@intel.com> (raw) In-Reply-To: <20200128181603.27767-1-pankaj.laxminarayan.bharadiya@intel.com> 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> --- drivers/gpu/drm/i915/display/intel_fbc.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c index 2a3f1333c8ff..c27e007d5e04 100644 --- a/drivers/gpu/drm/i915/display/intel_fbc.c +++ b/drivers/gpu/drm/i915/display/intel_fbc.c @@ -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); @@ -562,7 +563,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. */ @@ -670,8 +671,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) @@ -937,9 +938,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)); @@ -953,7 +954,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; @@ -1146,7 +1147,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); @@ -1213,7 +1214,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); -- 2.23.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-01-28 18:28 UTC|newest] Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-01-28 18:15 [Intel-gfx] [PATCH v5 00/21] drm: Introduce struct drm_device based WARN* and use them in i915 Pankaj Bharadiya 2020-01-28 18:15 ` Pankaj Bharadiya 2020-01-28 18:15 ` [Intel-gfx] [PATCH v5 01/21] drm/i915/display/icl_dsi: Make WARN* drm specific where drm_priv ptr is available Pankaj Bharadiya 2020-01-28 18:15 ` Pankaj Bharadiya 2020-01-28 18:15 ` [Intel-gfx] [PATCH v5 02/21] drm/i915/display/audio: " Pankaj Bharadiya 2020-01-28 18:15 ` Pankaj Bharadiya 2020-01-28 18:15 ` [Intel-gfx] [PATCH v5 03/21] drm/i915/display/cdclk: " Pankaj Bharadiya 2020-01-28 18:15 ` Pankaj Bharadiya 2020-01-28 18:15 ` [Intel-gfx] [PATCH v5 04/21] drm/i915/display/crt: " Pankaj Bharadiya 2020-01-28 18:15 ` Pankaj Bharadiya 2020-01-28 18:15 ` [Intel-gfx] [PATCH v5 05/21] drm/i915/display/ddi: Make WARN* drm specific where drm_device " Pankaj Bharadiya 2020-01-28 18:15 ` Pankaj Bharadiya 2020-01-28 18:15 ` [Intel-gfx] [PATCH v5 06/21] drm/i915/display/display: " Pankaj Bharadiya 2020-01-28 18:15 ` Pankaj Bharadiya 2020-01-28 18:15 ` [Intel-gfx] [PATCH v5 07/21] drm/i915/display/power: Make WARN* drm specific where drm_priv " Pankaj Bharadiya 2020-01-28 18:15 ` Pankaj Bharadiya 2020-01-28 18:15 ` [Intel-gfx] [PATCH v5 08/21] drm/i915/display/dp: Make WARN* drm specific where drm_device " Pankaj Bharadiya 2020-01-28 18:15 ` Pankaj Bharadiya 2020-01-28 18:15 ` [Intel-gfx] [PATCH v5 09/21] drm/i915/display/dpll_mgr: " Pankaj Bharadiya 2020-01-28 18:15 ` Pankaj Bharadiya 2020-01-28 18:15 ` Pankaj Bharadiya [this message] 2020-01-28 18:15 ` [Intel-gfx] [PATCH v5 10/21] drm/i915/display/fbc: Make WARN* drm specific where drm_priv " Pankaj Bharadiya 2020-01-28 18:15 ` [Intel-gfx] [PATCH v5 11/21] drm/i915/fbdev: Make WARN* drm specific where drm_device " Pankaj Bharadiya 2020-01-28 18:15 ` Pankaj Bharadiya 2020-01-28 18:15 ` [Intel-gfx] [PATCH v5 12/21] drm/i915/display/hdcp: Make WARN* drm specific where drm_priv " Pankaj Bharadiya 2020-01-28 18:15 ` Pankaj Bharadiya 2020-01-28 18:15 ` [Intel-gfx] [PATCH v5 13/21] drm/i915/display/hdmi: Make WARN* drm specific where drm_device " Pankaj Bharadiya 2020-01-28 18:15 ` Pankaj Bharadiya 2020-01-28 18:15 ` [Intel-gfx] [PATCH v5 14/21] drm/i915/display/overlay: Make WARN* drm specific where drm_priv " Pankaj Bharadiya 2020-01-28 18:15 ` Pankaj Bharadiya 2020-01-28 18:15 ` [Intel-gfx] [PATCH v5 15/21] drm/i915/display/panel: " Pankaj Bharadiya 2020-01-28 18:15 ` Pankaj Bharadiya 2020-01-28 18:15 ` [Intel-gfx] [PATCH v5 16/21] drm/i915/display/psr: " Pankaj Bharadiya 2020-01-28 18:15 ` Pankaj Bharadiya 2020-01-28 18:15 ` [Intel-gfx] [PATCH v5 17/21] drm/i915/display/sdvo: " Pankaj Bharadiya 2020-01-28 18:15 ` Pankaj Bharadiya 2020-01-28 18:16 ` [Intel-gfx] [PATCH v5 18/21] drm/i915/display/tc: " Pankaj Bharadiya 2020-01-28 18:16 ` Pankaj Bharadiya 2020-01-28 18:16 ` [Intel-gfx] [PATCH v5 19/21] drm/i915/display: Make WARN* drm specific where drm_device " Pankaj Bharadiya 2020-01-28 18:16 ` Pankaj Bharadiya 2020-01-28 18:16 ` [Intel-gfx] [PATCH v5 20/21] drm/i915/gvt: Make WARN* drm specific where drm_priv " Pankaj Bharadiya 2020-01-28 18:16 ` Pankaj Bharadiya 2020-01-28 18:16 ` [Intel-gfx] [PATCH v5 21/21] drm/i915/gvt: Make WARN* drm specific where vgpu " Pankaj Bharadiya 2020-01-28 18:16 ` Pankaj Bharadiya 2020-01-29 1:16 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm: Introduce struct drm_device based WARN* and use them in i915 (rev5) Patchwork 2020-01-29 1:39 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2020-01-31 0:52 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork 2020-02-04 9:11 ` [Intel-gfx] [PATCH v5 00/21] drm: Introduce struct drm_device based WARN* and use them in i915 Jani Nikula 2020-02-04 9:11 ` Jani Nikula
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200128181603.27767-11-pankaj.laxminarayan.bharadiya@intel.com \ --to=pankaj.laxminarayan.bharadiya@intel.com \ --cc=airlied@linux.ie \ --cc=chris@chris-wilson.co.uk \ --cc=daniel@ffwll.ch \ --cc=daniele.ceraolospurio@intel.com \ --cc=drake@endlessm.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=jani.nikula@linux.intel.com \ --cc=joonas.lahtinen@linux.intel.com \ --cc=maarten.lankhorst@linux.intel.com \ --cc=rodrigo.vivi@intel.com \ --cc=ville.syrjala@linux.intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.