geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Video/KMSDRM] Better ATOMIC caps testing: patch by Oskan Sezer.

main
Manuel Alfayate Corchete 2020-12-19 17:35:04 +01:00
parent 436499f3ec
commit ab3a390e26
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,11 +59,14 @@
#define AMDGPU_COMPAT 1 #define AMDGPU_COMPAT 1
static int check_atomic_modesetting (int fd) static int set_client_caps (int fd)
{ {
if (KMSDRM_drmSetClientCap(fd, DRM_CLIENT_CAP_ATOMIC, 1)) { if (KMSDRM_drmSetClientCap(fd, DRM_CLIENT_CAP_ATOMIC, 1)) {
return SDL_SetError("no atomic modesetting support."); return SDL_SetError("no atomic modesetting support.");
} }
if (KMSDRM_drmSetClientCap(fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1)) {
return SDL_SetError("no universal planes support.");
}
return 0; return 0;
} }
@ -81,7 +84,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 = (check_atomic_modesetting(drm_fd) < 0) ? NULL : KMSDRM_drmModeGetResources(drm_fd); drmModeRes *resources = (set_client_caps(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,
@ -1029,28 +1032,13 @@ int KMSDRM_DisplayDataInit (_THIS, SDL_DisplayData *dispdata) {
SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, "Opened DRM FD (%d)", viddata->drm_fd); SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, "Opened DRM FD (%d)", viddata->drm_fd);
/* Try ATOMIC compatibility */
ret = check_atomic_modesetting(viddata->drm_fd);
if (ret) {
goto cleanup;
}
/********************************************/ /********************************************/
/* Block for enabling ATOMIC compatibility. */ /* Block for enabling ATOMIC compatibility. */
/********************************************/ /********************************************/
/* Set ATOMIC compatibility */ /* Set ATOMIC & UNIVERSAL PLANES compatibility */
/* TODO: We have just tried ATOMIC compatibility, haven't we? */ ret = set_client_caps(viddata->drm_fd);
ret = KMSDRM_drmSetClientCap(viddata->drm_fd, DRM_CLIENT_CAP_ATOMIC, 1);
if (ret) { if (ret) {
ret = SDL_SetError("no atomic modesetting support.");
goto cleanup;
}
/* Set UNIVERSAL PLANES compatibility */
ret = KMSDRM_drmSetClientCap(viddata->drm_fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1);
if (ret) {
ret = SDL_SetError("no universal planes support.");
goto cleanup; goto cleanup;
} }
@ -1273,8 +1261,7 @@ KMSDRM_GBMInit (_THIS, SDL_DisplayData *dispdata)
/* Reopen the FD! */ /* Reopen the FD! */
viddata->drm_fd = open(viddata->devpath, O_RDWR | O_CLOEXEC); viddata->drm_fd = open(viddata->devpath, O_RDWR | O_CLOEXEC);
KMSDRM_drmSetClientCap(viddata->drm_fd, DRM_CLIENT_CAP_ATOMIC, 1); set_client_caps(viddata->drm_fd);
KMSDRM_drmSetClientCap(viddata->drm_fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1);
/* Create aux dumb buffer. It's only useful to keep the PRIMARY PLANE occupied /* Create aux dumb buffer. It's only useful to keep the PRIMARY PLANE occupied
when we destroy the GBM surface and it's KMS buffers, so not being able to when we destroy the GBM surface and it's KMS buffers, so not being able to