[PATCH xserver 1/2] xfree86/modes: Assign xf86_config->cursor in xf86_load_cursor_image

[Keith Packard]

Michel Dänzer <michel at daenzer.net> writes:

> From: Michel Dänzer <michel.daenzer at amd.com>
>
> Fixes a crash on startup in the radeon driver's drmmode_show_cursor()
> due to xf86_config->cursor == NULL, because no CRTC was enabled yet, so
> xf86_crtc_load_cursor_image was never called.

Good catch!

> @@ -507,6 +506,9 @@ xf86_load_cursor_image(ScrnInfoPtr scrn, unsigned char *src)
>                  return FALSE;
>          }
>      }
> +
> +    xf86_config->cursor = xf86CurrentCursor(scrn->pScreen);
> +

This should probably be at the top of xf86_load_cursor_image instead of
the bottom. Otherwise, this patch is

Reviewed-by: Keith Packard <keithp at keithp.com>

-- 
-keith
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 810 bytes
Desc: not available
URL: <https://lists.x.org/archives/xorg-devel/attachments/20160527/0fde6351/attachment.sig>