From: Jani Nikula <jani.nikula@intel.com>
To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org
Cc: jani.nikula@intel.com
Subject: [PATCH 2/6] drm/i915/display: switch from drm_for_each_crtc() to for_each_intel_crtc()
Date: Mon, 27 Apr 2026 14:04:28 +0300 [thread overview]
Message-ID: <3f5e2c2bfc68d8e970bf4779fe2d88b68ea9a485.1777287836.git.jani.nikula@intel.com> (raw)
In-Reply-To: <cover.1777287836.git.jani.nikula@intel.com>
intel_has_pending_fb_unpin() has the last direct user of
drm_for_each_crtc() in i915. Switch to for_each_intel_crtc() to ensure
pipe order iteration in all cases.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_display.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 311565dcc3b1..88642fd4b22a 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -714,22 +714,22 @@ static void icl_set_pipe_chicken(const struct intel_crtc_state *crtc_state)
bool intel_has_pending_fb_unpin(struct intel_display *display)
{
- struct drm_crtc *crtc;
+ struct intel_crtc *crtc;
bool cleanup_done;
- drm_for_each_crtc(crtc, display->drm) {
+ for_each_intel_crtc(display->drm, crtc) {
struct drm_crtc_commit *commit;
- spin_lock(&crtc->commit_lock);
- commit = list_first_entry_or_null(&crtc->commit_list,
+ spin_lock(&crtc->base.commit_lock);
+ commit = list_first_entry_or_null(&crtc->base.commit_list,
struct drm_crtc_commit, commit_entry);
cleanup_done = commit ?
try_wait_for_completion(&commit->cleanup_done) : true;
- spin_unlock(&crtc->commit_lock);
+ spin_unlock(&crtc->base.commit_lock);
if (cleanup_done)
continue;
- intel_crtc_wait_for_next_vblank(to_intel_crtc(crtc));
+ intel_crtc_wait_for_next_vblank(crtc);
return true;
}
--
2.47.3
next prev parent reply other threads:[~2026-04-27 11:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-27 11:04 [PATCH 0/6] drm/i915: crtc iteration cleanups Jani Nikula
2026-04-27 11:04 ` [PATCH 1/6] drm/{i915, xe}: move xe_display_flush_cleanup_work() to i915 display Jani Nikula
2026-04-27 11:04 ` Jani Nikula [this message]
2026-04-27 11:04 ` [PATCH 3/6] drm/i915/display: always pass display->drm to for_each_intel_crtc*() Jani Nikula
2026-04-27 11:04 ` [PATCH 4/6] drm/i915/display: pass struct intel_display to all for_each_intel_crtc*() macros Jani Nikula
2026-04-27 11:04 ` [PATCH 5/6] drm/i915/display: stop passing i to for_each_*_intel_crtc_in_state() macros Jani Nikula
2026-04-27 11:04 ` [PATCH 6/6] drm/i915/display: stop passing i to for_each_pipe_crtc_modeset_{enable, disable}() 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=3f5e2c2bfc68d8e970bf4779fe2d88b68ea9a485.1777287836.git.jani.nikula@intel.com \
--to=jani.nikula@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@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