encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SDL_kmsdrmvideo.c: check atomic modesetting in check_modesetting() 

.. so that KMSDRM_CreateDevice() can fail and SDL_VideoInit() would
move on to next bootstrap member which is kmsdrm_legacy.  hopefully
fixes bug #5393.
This commit is contained in:
Ozkan Sezer 2020-12-18 17:50:02 +03:00
parent 5c654d0df4
commit 6c4ab48471
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/video/kmsdrm/SDL_kmsdrmvideo.c
View File

@ -58,6 +58,14 @@
#define AMDGPU_COMPAT 1 #define AMDGPU_COMPAT 1
static int check_atomic_modesetting (int fd)
{
if (KMSDRM_drmSetClientCap(fd, DRM_CLIENT_CAP_ATOMIC, 1)) {
return SDL_SetError("no atomic modesetting support.");
}
return 0;
}
static int static int
check_modesetting(int devindex) check_modesetting(int devindex)
{ {
@ -72,7 +80,7 @@ check_modesetting(int devindex)
drm_fd = open(device, O_RDWR | O_CLOEXEC); drm_fd = open(device, O_RDWR | O_CLOEXEC);
if (drm_fd >= 0) { if (drm_fd >= 0) {
if (SDL_KMSDRM_LoadSymbols()) { if (SDL_KMSDRM_LoadSymbols()) {
drmModeRes *resources = KMSDRM_drmModeGetResources(drm_fd); drmModeRes *resources = (check_atomic_modesetting(drm_fd) < 0) ? NULL : KMSDRM_drmModeGetResources(drm_fd);
if (resources) { if (resources) {
SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, "%scard%d connector, encoder and CRTC counts are: %d %d %d", SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, "%scard%d connector, encoder and CRTC counts are: %d %d %d",
KMSDRM_DRI_PATH, devindex, KMSDRM_DRI_PATH, devindex,
@ -1189,9 +1197,8 @@ KMSDRM_VideoInit(_THIS)
/* Try ATOMIC compatibility */ /* Try ATOMIC compatibility */
ret = KMSDRM_drmSetClientCap(viddata->drm_fd, DRM_CLIENT_CAP_ATOMIC, 1); ret = check_atomic_modesetting(viddata->drm_fd);
if (ret) { if (ret) {
ret = SDL_SetError("no atomic modesetting support.");
goto cleanup; goto cleanup;
} }