diff mbox series

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

Message ID 20250207215406.19348-3-ville.syrjala@linux.intel.com (mailing list archive)
State New, archived
Headers show
Series drm/i915: Fix scanline_offset for LNL+/BMG+ | expand

Commit Message

Ville Syrjala Feb. 7, 2025, 9:54 p.m. UTC 
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(-)

Comments

Hogander, Jouni Feb. 20, 2025, 10:02 a.m. UTC | #1 
On Fri, 2025-02-07 at 23:54 +0200, Ville Syrjala wrote:
> 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>

Reviewed-by: Jouni Högander <jouni.hogander@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;
>  }
>  
>  /*
diff mbox series

Patch

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;
 }
 
 /*