drm/i915/cursor: Extract intel_cursor_mode_config_init()

Move the max cursor size initialization into intel_cursor.c
so that all the platform specific details about cursors are
concentrated in one file.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/20251107181126.5743-9-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 0367e6fc8de7700c1124f5b3fe984de748f63809..8410646a1f9537c71c7665bbdca6921987fbb07b 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_cursor.c
+++ b/drivers/gpu/drm/i915/display/intel_cursor.c
@@ -1092,3 +1092,20 @@ intel_cursor_plane_create(struct intel_display *display,
 
        return ERR_PTR(ret);
 }
+
+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;
+               mode_config->cursor_height = 1023;
+       } else if (display->platform.i830 || display->platform.i85x ||
+                  display->platform.i915g || display->platform.i915gm) {
+               mode_config->cursor_width = 64;
+               mode_config->cursor_height = 64;
+       } else {
+               mode_config->cursor_width = 256;
+               mode_config->cursor_height = 256;
+       }
+}

diff --git a/drivers/gpu/drm/i915/display/intel_cursor.h b/drivers/gpu/drm/i915/display/intel_cursor.h
index 65a9e7eb88c2b4583f2eb1b82f3064bb9794b690..7c269d7381ad1bf318a83b80ad1f309ab713d228 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_cursor.h
+++ b/drivers/gpu/drm/i915/display/intel_cursor.h
@@ -17,4 +17,6 @@ intel_cursor_plane_create(struct intel_display *display,
 
 void intel_cursor_unpin_work(struct kthread_work *base);
 
+void intel_cursor_mode_config_init(struct intel_display *display);
+
 #endif

diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
index 63942ebf46fbf3599078c76c2e7df637b6a77b9c..7e000ba3e08bfd3d6b4470465a3cc9c60172fd6e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_driver.c
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
@@ -29,6 +29,7 @@
 #include "intel_cdclk.h"
 #include "intel_color.h"
 #include "intel_crtc.h"
+#include "intel_cursor.h"
 #include "intel_dbuf_bw.h"
 #include "intel_display_core.h"
 #include "intel_display_debugfs.h"
@@ -148,17 +149,7 @@ static void intel_mode_config_init(struct intel_display *display)
                mode_config->max_height = 2048;
        }
 
-       if (display->platform.i845g || display->platform.i865g) {
-               mode_config->cursor_width = display->platform.i845g ? 64 : 512;
-               mode_config->cursor_height = 1023;
-       } else if (display->platform.i830 || display->platform.i85x ||
-                  display->platform.i915g || display->platform.i915gm) {
-               mode_config->cursor_width = 64;
-               mode_config->cursor_height = 64;
-       } else {
-               mode_config->cursor_width = 256;
-               mode_config->cursor_height = 256;
-       }
+       intel_cursor_mode_config_init(display);
 }
 
 static void intel_mode_config_cleanup(struct intel_display *display)