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 8410646a1f9537c71c7665bbdca6921987fbb07b..a10b2425b94d20228908ebfccedd49a69f2e450b 100644 (file)
--- 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) {