[PATCH 2/3] drm/i915: Reverse the scanline_offset if ladder

[Ville Syrjala]

From: Ville Syrjälä <ville.syrj...@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.syrj...@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