[KMS/DRM] Fix for bug #5518: only do async pageflips when hardware supports them.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55
diff --git a/src/video/kmsdrm/SDL_kmsdrmopengles.c b/src/video/kmsdrm/SDL_kmsdrmopengles.c
index 529eeea..0053e52 100644
--- a/src/video/kmsdrm/SDL_kmsdrmopengles.c
+++ b/src/video/kmsdrm/SDL_kmsdrmopengles.c
@@ -168,7 +168,7 @@ KMSDRM_GLES_SwapWindow(_THIS, SDL_Window * window) {
to do so, so even if we don't block on EGL, the flip will have completed
when we get here again. */
- if (_this->egl_data->egl_swapinterval == 0) {
+ if (_this->egl_data->egl_swapinterval == 0 && viddata->async_pageflip_support) {
flip_flags |= DRM_MODE_PAGE_FLIP_ASYNC;
}
diff --git a/src/video/kmsdrm/SDL_kmsdrmvideo.c b/src/video/kmsdrm/SDL_kmsdrmvideo.c
index 78ed3b2..b5fc16c 100644
--- a/src/video/kmsdrm/SDL_kmsdrmvideo.c
+++ b/src/video/kmsdrm/SDL_kmsdrmvideo.c
@@ -653,6 +653,7 @@ int KMSDRM_InitDisplays (_THIS) {
SDL_VideoData *viddata = ((SDL_VideoData *)_this->driverdata);
drmModeRes *resources = NULL;
+ uint64_t async_pageflip = 0;
int ret = 0;
int i;
@@ -705,6 +706,13 @@ int KMSDRM_InitDisplays (_THIS) {
goto cleanup;
}
+ /* Determine if video hardware supports async pageflips. */
+ ret = KMSDRM_drmGetCap(viddata->drm_fd, DRM_CAP_ASYNC_PAGE_FLIP, &async_pageflip);
+ if (ret) {
+ SDL_LogError(SDL_LOG_CATEGORY_VIDEO, "Could not determine async page flip capability.");
+ }
+ viddata->async_pageflip_support = async_pageflip ? SDL_TRUE : SDL_FALSE;
+
/***********************************/
/* Block for Vulkan compatibility. */
/***********************************/
diff --git a/src/video/kmsdrm/SDL_kmsdrmvideo.h b/src/video/kmsdrm/SDL_kmsdrmvideo.h
index 29cfc18..31df3b9 100644
--- a/src/video/kmsdrm/SDL_kmsdrmvideo.h
+++ b/src/video/kmsdrm/SDL_kmsdrmvideo.h
@@ -41,8 +41,9 @@ typedef struct SDL_VideoData
struct gbm_device *gbm_dev;
- SDL_bool video_init; /* Has VideoInit succeeded? */
- SDL_bool vulkan_mode; /* Are we in Vulkan mode? One VK window is enough to be. */
+ SDL_bool video_init; /* Has VideoInit succeeded? */
+ SDL_bool vulkan_mode; /* Are we in Vulkan mode? One VK window is enough to be. */
+ SDL_bool async_pageflip_support; /* Does the hardware support async. pageflips? */
SDL_Window **windows;
int max_windows;