frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modesetting: Fix hang when all probed cursor sizes fail to find a minimum one 

This fixes a hang on simpledrm where min_cursor_height and min_cursor_width is
never established, and drmmode_load_cursor_argb_check would infinitely when
the minimum values where 0 or less.
This commit is contained in:
nerdopolis 2024-05-28 06:31:21 -04:00
parent 8e8bc0a1ef
commit 05c63d2a02
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/xfree86/drivers/modesetting/drmmode_display.c
View File

@ -4377,6 +4377,9 @@ static void drmmode_probe_cursor_size(xf86CrtcPtr crtc)
drmmode_ptr drmmode = drmmode_crtc->drmmode;
int width, height, size;
ms->min_cursor_width = ms->max_cursor_width;
ms->min_cursor_height = ms->max_cursor_height;
/* probe square min first */
for (size = 1; size <= ms->max_cursor_width &&
size <= ms->max_cursor_height; size *= 2) {