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

kmsdrm: fix KMSDRM_SetDisplayMode being called for the default desktop mode doing nothing

This commit is contained in:
Anthony Pesch 2021-06-22 00:03:18 -04:00 committed by Sam Lantinga
parent 98bda39186
commit c262569cd8
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -538,8 +538,10 @@ void KMSDRM_AddDisplay (_THIS, drmModeConnector *connector, drmModeRes *resource
SDL_VideoData *viddata = ((SDL_VideoData *)_this->driverdata); SDL_VideoData *viddata = ((SDL_VideoData *)_this->driverdata);
SDL_DisplayData *dispdata = NULL; SDL_DisplayData *dispdata = NULL;
SDL_VideoDisplay display = {0}; SDL_VideoDisplay display = {0};
SDL_DisplayModeData *modedata = NULL;
drmModeEncoder *encoder = NULL; drmModeEncoder *encoder = NULL;
drmModeCrtc *crtc = NULL; drmModeCrtc *crtc = NULL;
int mode_index;
int i, j; int i, j;
int ret = 0; int ret = 0;
@ -627,6 +629,23 @@ void KMSDRM_AddDisplay (_THIS, drmModeConnector *connector, drmModeRes *resource
goto cleanup; goto cleanup;
} }
/* Find the index of the mode attached to this CRTC */
mode_index = -1;
for (i = 0; i < connector->count_modes; i++) {
drmModeModeInfo *mode = &connector->modes[i];
if (!memcmp(mode, &crtc->mode, sizeof(crtc->mode))) {
mode_index = i;
break;
}
}
if (mode_index == -1) {
ret = SDL_SetError("Failed to find index of mode attached to the CRTC.");
goto cleanup;
}
/*********************************************/ /*********************************************/
/* Create an SDL Display for this connector. */ /* Create an SDL Display for this connector. */
/*********************************************/ /*********************************************/
@ -657,11 +676,21 @@ void KMSDRM_AddDisplay (_THIS, drmModeConnector *connector, drmModeRes *resource
/* Setup the display. /* Setup the display.
There's no problem with it being still incomplete. */ There's no problem with it being still incomplete. */
modedata = SDL_calloc(1, sizeof(SDL_DisplayModeData));
if (!modedata) {
ret = SDL_OutOfMemory();
goto cleanup;
}
modedata->mode_index = mode_index;
display.driverdata = dispdata; display.driverdata = dispdata;
display.desktop_mode.w = dispdata->mode.hdisplay; display.desktop_mode.w = dispdata->mode.hdisplay;
display.desktop_mode.h = dispdata->mode.vdisplay; display.desktop_mode.h = dispdata->mode.vdisplay;
display.desktop_mode.refresh_rate = dispdata->mode.vrefresh; display.desktop_mode.refresh_rate = dispdata->mode.vrefresh;
display.desktop_mode.format = SDL_PIXELFORMAT_ARGB8888; display.desktop_mode.format = SDL_PIXELFORMAT_ARGB8888;
display.desktop_mode.driverdata = modedata;
display.current_mode = display.desktop_mode; display.current_mode = display.desktop_mode;
/* Add the display to the list of SDL displays. */ /* Add the display to the list of SDL displays. */