Skip to content

modesetting: Fix hw cursor v2 #734

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
+297 −110
Open

modesetting: Fix hw cursor v2 #734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1213690
modesetting: Initialize the cursor image with the smallest size suppo…
stefan11111 Aug 19, 2025
88a4ffa
modesetting: add "FallbackCursor" option
stefan11111 Aug 21, 2025
71ae1a4
modesetting: probe using the old method is SIZE_HINTS isn't available
stefan11111 Aug 21, 2025
8301647
modesetting: rename OPTION_FALLBACK_CURSOR to OPTION_CURSOR_SIZE
stefan11111 Aug 21, 2025
6f0f4e1
modesetting: add support for gbm cursor buffers
stefan11111 Aug 22, 2025
ba22b40
modesetting: always try to map gbm bo's when requested
stefan11111 Aug 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions hw/xfree86/drivers/video/modesetting/driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ static SymTabRec Chipsets[] = {

static const OptionInfoRec Options[] = {
{OPTION_SW_CURSOR, "SWcursor", OPTV_BOOLEAN, {0}, FALSE},
{OPTION_CURSOR_SIZE, "CursorSize", OPTV_STRING, {0}, FALSE},
{OPTION_DEVICE_PATH, "kmsdev", OPTV_STRING, {0}, FALSE},
{OPTION_SHADOW_FB, "ShadowFB", OPTV_BOOLEAN, {0}, FALSE},
{OPTION_ACCEL_METHOD, "AccelMethod", OPTV_STRING, {0}, FALSE},
Expand Down Expand Up @@ -1959,14 +1960,9 @@ ScreenInit(ScreenPtr pScreen, int argc, char **argv)
PointPriv->spriteFuncs = &drmmode_sprite_funcs;
}

/* Get the maximum cursor size. */
drmmode_cursor_dim_rec cursor_dim = { 0 };
if (!drmmode_get_largest_cursor(pScrn, &cursor_dim))
return FALSE;

/* Need to extend HWcursor support to handle mask interleave */
if (!ms->drmmode.sw_cursor)
xf86_cursors_init(pScreen, cursor_dim.width, cursor_dim.height,
xf86_cursors_init(pScreen, ms->cursor_image_width, ms->cursor_image_height,
HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64 |
HARDWARE_CURSOR_UPDATE_UNHIDDEN |
HARDWARE_CURSOR_ARGB);
Expand Down
4 changes: 4 additions & 0 deletions hw/xfree86/drivers/video/modesetting/driver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ struct ms_vrr_priv {

typedef enum {
OPTION_SW_CURSOR,
OPTION_CURSOR_SIZE,
OPTION_DEVICE_PATH,
OPTION_SHADOW_FB,
OPTION_ACCEL_METHOD,
Expand Down Expand Up @@ -131,6 +132,9 @@ typedef struct _modesettingRec {
DamagePtr damage;
Bool dirty_enabled;

uint32_t cursor_image_width;
uint32_t cursor_image_height;

Bool has_queue_sequence;
Bool tried_queue_sequence;

Expand Down
Loading