From 98bda39186a2c12998236bf76dd71196ac7140a8 Mon Sep 17 00:00:00 2001
From: Anthony Pesch <[EMAIL REDACTED]>
Date: Wed, 23 Jun 2021 00:21:31 -0400
Subject: [PATCH] kmsdrm: sync the display's current mode with what's set in
KMSDRM_CreateSurfaces
---
src/video/kmsdrm/SDL_kmsdrmvideo.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/video/kmsdrm/SDL_kmsdrmvideo.c b/src/video/kmsdrm/SDL_kmsdrmvideo.c
index f44a9b407..b9947eabf 100644
--- a/src/video/kmsdrm/SDL_kmsdrmvideo.c
+++ b/src/video/kmsdrm/SDL_kmsdrmvideo.c
@@ -943,7 +943,8 @@ KMSDRM_CreateSurfaces(_THIS, SDL_Window * window)
{
SDL_VideoData *viddata = ((SDL_VideoData *)_this->driverdata);
SDL_WindowData *windata = (SDL_WindowData *)window->driverdata;
- SDL_DisplayData *dispdata = (SDL_DisplayData *)SDL_GetDisplayForWindow(window)->driverdata;
+ SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
+ SDL_DisplayData *dispdata = (SDL_DisplayData *)display->driverdata;
uint32_t surface_fmt = GBM_FORMAT_ARGB8888;
uint32_t surface_flags = GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING;
@@ -963,8 +964,16 @@ KMSDRM_CreateSurfaces(_THIS, SDL_Window * window)
"GBM surface format not supported. Trying anyway.");
}
+ /* The KMSDRM backend doesn't always set the mode the higher-level code in
+ SDL_video.c expects. Hulk-smash the display's current_mode to keep the
+ mode that's set in sync with what SDL_video.c thinks is set */
KMSDRM_GetModeToSet(window, &dispdata->mode);
+ display->current_mode.w = dispdata->mode.hdisplay;
+ display->current_mode.h = dispdata->mode.vdisplay;
+ display->current_mode.refresh_rate = dispdata->mode.vrefresh;
+ display->current_mode.format = SDL_PIXELFORMAT_ARGB8888;
+
windata->gs = KMSDRM_gbm_surface_create(viddata->gbm_dev,
dispdata->mode.hdisplay, dispdata->mode.vdisplay,
surface_fmt, surface_flags);