drm/i915: Replace the HAS_DDI() in intel_crtc_scanline_offset() with specific platfor...

The HDMI vs. not scanline offset stuff no longer applies to the
latest platforms, so using HAS_DDI() is a bit confusing. Replace
with a more specific set of conditions.

Also let's just deal with the platform types in the if ladder
itself, and handle the HDMI vs. not within the specific branch
for those platforms.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250207215406.19348-4-ville.syrjala@linux.intel.com
Reviewed-by: Jouni Högander <jouni.hogander@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_vblank.c b/drivers/gpu/drm/i915/display/intel_vblank.c
index dd928d890e3aa2cf2bcac82b2ddc57ec7710c289..139fa5deba805bb92cd105858bb779093b5b2a86 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_vblank.c
+++ b/drivers/gpu/drm/i915/display/intel_vblank.c
@@ -224,8 +224,9 @@ int intel_crtc_scanline_offset(const struct intel_crtc_state *crtc_state)
         */
        if (DISPLAY_VER(display) >= 20 || display->platform.battlemage)
                return 1;
-       else if (HAS_DDI(display) && intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI))
-               return 2;
+       else if (DISPLAY_VER(display) >= 9 ||
+                display->platform.broadwell || display->platform.haswell)
+               return intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI) ? 2 : 1;
        else if (DISPLAY_VER(display) >= 3)
                return 1;
        else