From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: intel-xe@lists.freedesktop.org
Subject: [PATCH 2/3] drm/i915: Reverse the scanline_offset if ladder
Date: Fri, 7 Feb 2025 23:54:05 +0200 [thread overview]
Message-ID: <20250207215406.19348-3-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20250207215406.19348-1-ville.syrjala@linux.intel.com>
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Make intel_crtc_scanline_offset() a bit less confusing by
fully reordering the if ladder to use the new->old platform
order.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_vblank.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_vblank.c b/drivers/gpu/drm/i915/display/intel_vblank.c
index 7b240ce681a0..dd928d890e3a 100644
--- a/drivers/gpu/drm/i915/display/intel_vblank.c
+++ b/drivers/gpu/drm/i915/display/intel_vblank.c
@@ -224,12 +224,12 @@ int intel_crtc_scanline_offset(const struct intel_crtc_state *crtc_state)
*/
if (DISPLAY_VER(display) >= 20 || display->platform.battlemage)
return 1;
- else if (DISPLAY_VER(display) == 2)
- return -1;
else if (HAS_DDI(display) && intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI))
return 2;
- else
+ else if (DISPLAY_VER(display) >= 3)
return 1;
+ else
+ return -1;
}
/*
--
2.45.3
next prev parent reply other threads:[~2025-02-07 21:54 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-07 21:54 [PATCH 0/3] drm/i915: Fix scanline_offset for LNL+/BMG+ Ville Syrjala
2025-02-07 21:54 ` [PATCH 1/3] drm/i915: Fix scanline_offset for LNL+ and BMG+ Ville Syrjala
2025-02-20 9:30 ` Hogander, Jouni
2025-03-20 11:23 ` Shankar, Uma
2025-02-07 21:54 ` Ville Syrjala [this message]
2025-02-20 10:02 ` [PATCH 2/3] drm/i915: Reverse the scanline_offset if ladder Hogander, Jouni
2025-02-07 21:54 ` [PATCH 3/3] drm/i915: Replace the HAS_DDI() in intel_crtc_scanline_offset() with specific platform checks Ville Syrjala
2025-02-20 9:58 ` Hogander, Jouni
2025-02-07 22:41 ` [PATCH 0/3] drm/i915: Fix scanline_offset for LNL+/BMG+ Lucas De Marchi
2025-02-10 16:05 ` Gustavo Sousa
2025-02-10 16:16 ` Ville Syrjälä
2025-02-10 18:10 ` Lucas De Marchi
2025-02-10 20:02 ` Ville Syrjälä
2025-02-10 21:49 ` Matt Roper
2025-02-07 22:54 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2025-02-08 2:44 ` ✓ i915.CI.BAT: success " Patchwork
2025-02-08 17:47 ` ✗ i915.CI.Full: failure " 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=20250207215406.19348-3-ville.syrjala@linux.intel.com \
--to=ville.syrjala@linux.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