From: Ville Syrjälä Date: Fri, 7 Feb 2025 21:54:05 +0000 (+0200) Subject: drm/i915: Reverse the scanline_offset if ladder X-Git-Tag: v6.16-rc1~144^2~20^2~82 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9db49526b708a131c866e91238d99f18d25cef94;p=thirdparty%2Flinux.git drm/i915: Reverse the scanline_offset if ladder 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ä Link: https://patchwork.freedesktop.org/patch/msgid/20250207215406.19348-3-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 7b240ce681a01..dd928d890e3aa 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; } /*