Skip to content

Commit aa4cd70

Browse files
committed
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>
1 parent 3107fc6 commit aa4cd70

3 files changed

Lines changed: 21 additions & 11 deletions

File tree

drivers/gpu/drm/i915/display/intel_cursor.c

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1092,3 +1092,20 @@ intel_cursor_plane_create(struct intel_display *display,
10921092

10931093
return ERR_PTR(ret);
10941094
}
1095+
1096+
void intel_cursor_mode_config_init(struct intel_display *display)
1097+
{
1098+
struct drm_mode_config *mode_config = &display->drm->mode_config;
1099+
1100+
if (display->platform.i845g || display->platform.i865g) {
1101+
mode_config->cursor_width = display->platform.i845g ? 64 : 512;
1102+
mode_config->cursor_height = 1023;
1103+
} else if (display->platform.i830 || display->platform.i85x ||
1104+
display->platform.i915g || display->platform.i915gm) {
1105+
mode_config->cursor_width = 64;
1106+
mode_config->cursor_height = 64;
1107+
} else {
1108+
mode_config->cursor_width = 256;
1109+
mode_config->cursor_height = 256;
1110+
}
1111+
}

drivers/gpu/drm/i915/display/intel_cursor.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,6 @@ intel_cursor_plane_create(struct intel_display *display,
1717

1818
void intel_cursor_unpin_work(struct kthread_work *base);
1919

20+
void intel_cursor_mode_config_init(struct intel_display *display);
21+
2022
#endif

drivers/gpu/drm/i915/display/intel_display_driver.c

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include "intel_cdclk.h"
3030
#include "intel_color.h"
3131
#include "intel_crtc.h"
32+
#include "intel_cursor.h"
3233
#include "intel_dbuf_bw.h"
3334
#include "intel_display_core.h"
3435
#include "intel_display_debugfs.h"
@@ -148,17 +149,7 @@ static void intel_mode_config_init(struct intel_display *display)
148149
mode_config->max_height = 2048;
149150
}
150151

151-
if (display->platform.i845g || display->platform.i865g) {
152-
mode_config->cursor_width = display->platform.i845g ? 64 : 512;
153-
mode_config->cursor_height = 1023;
154-
} else if (display->platform.i830 || display->platform.i85x ||
155-
display->platform.i915g || display->platform.i915gm) {
156-
mode_config->cursor_width = 64;
157-
mode_config->cursor_height = 64;
158-
} else {
159-
mode_config->cursor_width = 256;
160-
mode_config->cursor_height = 256;
161-
}
152+
intel_cursor_mode_config_init(display);
162153
}
163154

164155
static void intel_mode_config_cleanup(struct intel_display *display)

0 commit comments

Comments
 (0)