From: Jani Nikula <jani.nikula@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: jani.nikula@intel.com
Subject: [Intel-gfx] [PATCH 2/4] drm/i915/crtc: replace I915_STATE_WARN_ON() with I915_STATE_WARN()
Date: Fri, 12 May 2023 14:04:42 +0300 [thread overview]
Message-ID: <20230512110444.1448231-2-jani.nikula@intel.com> (raw)
In-Reply-To: <20230512110444.1448231-1-jani.nikula@intel.com>
Describe the assertion better.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_crtc.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i915/display/intel_crtc.c
index df7d05f1e14b..1e3f88d00609 100644
--- a/drivers/gpu/drm/i915/display/intel_crtc.c
+++ b/drivers/gpu/drm/i915/display/intel_crtc.c
@@ -35,7 +35,9 @@
static void assert_vblank_disabled(struct drm_crtc *crtc)
{
- if (I915_STATE_WARN_ON(drm_crtc_vblank_get(crtc) == 0))
+ if (I915_STATE_WARN(drm_crtc_vblank_get(crtc) == 0,
+ "[CRTC:%d:%s] vblank assertion failure (expected off, current on)\n",
+ crtc->base.id, crtc->name))
drm_crtc_vblank_put(crtc);
}
--
2.39.2
next prev parent reply other threads:[~2023-05-12 11:05 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-12 11:04 [Intel-gfx] [PATCH 1/4] drm/i915/dpll: drop a useless I915_STATE_WARN_ON() Jani Nikula
2023-05-12 11:04 ` Jani Nikula [this message]
2023-05-12 14:13 ` [Intel-gfx] [PATCH 2/4] drm/i915/crtc: replace I915_STATE_WARN_ON() with I915_STATE_WARN() Rodrigo Vivi
2023-05-12 11:04 ` [Intel-gfx] [PATCH 3/4] drm/i915/display: remove I915_STATE_WARN_ON() Jani Nikula
2023-05-12 14:06 ` Rodrigo Vivi
2023-05-12 11:04 ` [Intel-gfx] [PATCH 4/4] drm/i915/display: add i915 parameter to I915_STATE_WARN() Jani Nikula
2023-05-12 14:10 ` Rodrigo Vivi
2023-05-12 18:19 ` Jani Nikula
2023-05-12 18:16 ` [Intel-gfx] [PATCH v2] " Jani Nikula
2023-05-12 12:58 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/4] drm/i915/dpll: drop a useless I915_STATE_WARN_ON() Patchwork
2023-05-12 13:17 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2023-05-12 14:05 ` [Intel-gfx] [PATCH 1/4] " Rodrigo Vivi
2023-05-15 9:23 ` Jani Nikula
2023-05-12 20:44 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/4] drm/i915/dpll: drop a useless I915_STATE_WARN_ON() (rev2) Patchwork
2023-05-12 20:58 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-05-12 23:58 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
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=20230512110444.1448231-2-jani.nikula@intel.com \
--to=jani.nikula@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox