From: Ville Syrjälä Date: Fri, 7 Feb 2025 21:54:06 +0000 (+0200) Subject: drm/i915: Replace the HAS_DDI() in intel_crtc_scanline_offset() with specific platfor... X-Git-Tag: v6.16-rc1~144^2~20^2~81 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=79ec15a1e952f30fd8980f106d99d8fd42377676;p=thirdparty%2Flinux.git drm/i915: Replace the HAS_DDI() in intel_crtc_scanline_offset() with specific platform checks 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ä Link: https://patchwork.freedesktop.org/patch/msgid/20250207215406.19348-4-ville.syrjala@linux.intel.com Reviewed-by: Jouni Högander --- diff --git a/drivers/gpu/drm/i915/display/intel_vblank.c b/drivers/gpu/drm/i915/display/intel_vblank.c index dd928d890e3aa..139fa5deba805 100644 --- 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