From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date: Fri, 7 Nov 2025 18:11:26 +0000 (+0200)
Subject: drm/i915/cursor: Initialize 845 vs 865 cursor size separately
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7f3719bf144d574a4490ef135cb540c6748760b8;p=thirdparty%2Fkernel%2Flinux.git

drm/i915/cursor: Initialize 845 vs 865 cursor size separately

The if+ternary combo used for the max cursor width initialization
on 845/865 is rather cumbersome. Just split this into a straight
up if ladder.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/20251107181126.5743-10-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
---

diff --git a/drivers/gpu/drm/i915/display/intel_cursor.c b/drivers/gpu/drm/i915/display/intel_cursor.c
index 8410646a1f953..a10b2425b94d2 100644
--- a/drivers/gpu/drm/i915/display/intel_cursor.c
+++ b/drivers/gpu/drm/i915/display/intel_cursor.c
@@ -1097,8 +1097,11 @@ void intel_cursor_mode_config_init(struct intel_display *display)
 {
 	struct drm_mode_config *mode_config = &display->drm->mode_config;
 
-	if (display->platform.i845g || display->platform.i865g) {
-		mode_config->cursor_width = display->platform.i845g ? 64 : 512;
+	if (display->platform.i845g) {
+		mode_config->cursor_width = 64;
+		mode_config->cursor_height = 1023;
+	} else if (display->platform.i865g) {
+		mode_config->cursor_width = 512;
 		mode_config->cursor_height = 1023;
 	} else if (display->platform.i830 || display->platform.i85x ||
 		   display->platform.i915g || display->platform.i915gm) {