Skip to content

Refine input driver selection: enable fallback to linuxraw in more cases #18196

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

Merged
LibretroAdmin merged 1 commit into from
Aug 23, 2025
Merged

Refine input driver selection: enable fallback to linuxraw in more cases #18196

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 5 additions & 6 deletions gfx/drivers_context/drm_ctx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -938,15 +938,15 @@ static void gfx_ctx_drm_input_driver(void *data,
const char *joypad_name,
input_driver_t **input, void **input_data)
{
#ifdef HAVE_X11
settings_t *settings = config_get_ptr();

/* We cannot use the X11 input driver for DRM/KMS */
if (string_is_equal(settings->arrays.input_driver, "x"))
/* We cannot use the X11 input driver for DRM/KMS, and udev may be restricted */
if ( string_is_equal(settings->arrays.input_driver, "x")
|| string_is_equal(settings->arrays.input_driver, "udev"))
{
#ifdef HAVE_UDEV
{
/* Try to set it to udev instead */
/* Try to set it to udev */
void *udev = input_driver_init_wrap(&input_udev, joypad_name);
if (udev)
{
Expand All @@ -958,7 +958,7 @@ static void gfx_ctx_drm_input_driver(void *data,
#endif
#if defined(__linux__) && !defined(ANDROID)
{
/* Try to set it to linuxraw instead */
/* Try to set it to linuxraw if not available or failed to initialize */
void *linuxraw = input_driver_init_wrap(&input_linuxraw, joypad_name);
if (linuxraw)
{
Expand All @@ -969,7 +969,6 @@ static void gfx_ctx_drm_input_driver(void *data,
}
#endif
}
#endif

*input = NULL;
*input_data = NULL;
Expand Down
Loading