ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2025-03-24 01:25:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

restore vrr state on exit

Browse source
This commit is contained in:
antonino 2022-08-23 00:37:43 +02:00 committed by Sam Lantinga
parent 450e9857cc
commit e3ea9b5b7c
2 changed files with 46 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/video/kmsdrm/SDL_kmsdrmvideo.c
View file

@ -625,6 +625,40 @@ KMSDRM_CrtcSetVrr(uint32_t drm_fd, uint32_t crtc_id, SDL_bool enabled)
vrr_prop_id, vrr_prop_id,
enabled); enabled);
} }
static SDL_bool
KMSDRM_CrtcGetVrr(uint32_t drm_fd, uint32_t crtc_id)
{
uint32_t vrr_prop_id;
drmModeObjectPropertiesPtr props;
int i;
if (!KMSDRM_VrrPropId(drm_fd, crtc_id, &vrr_prop_id))
return SDL_FALSE;
props = KMSDRM_drmModeObjectGetProperties(drm_fd,
crtc_id,
DRM_MODE_OBJECT_CRTC);
if(!props)
return SDL_FALSE;
for (i = 0; i < props->count_props; ++i) {
drmModePropertyPtr drm_prop = KMSDRM_drmModeGetProperty(drm_fd, props->props[i]);
if (!drm_prop)
continue;
if(drm_prop->prop_id == vrr_prop_id) {
return props->prop_values[i] ? SDL_TRUE: SDL_FALSE;
}
KMSDRM_drmModeFreeProperty(drm_prop);
}
return SDL_FALSE;
}
/* Gets a DRM connector, builds an SDL_Display with it, and adds it to the /* Gets a DRM connector, builds an SDL_Display with it, and adds it to the
list of SDL Displays in _this->displays[] */ list of SDL Displays in _this->displays[] */
static void static void
@ -766,6 +800,14 @@ KMSDRM_AddDisplay (_THIS, drmModeConnector *connector, drmModeRes *resources) {
dispdata->connector = connector; dispdata->connector = connector;
dispdata->crtc = crtc; dispdata->crtc = crtc;
/* save previous vrr state */
dispdata->saved_vrr = KMSDRM_CrtcGetVrr(viddata->drm_fd, crtc->crtc_id);
/* try to enable vrr */
if(KMSDRM_ConnectorCheckVrrCapable(viddata->drm_fd, connector->connector_id, "VRR_CAPABLE")) {
SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, "Enabling VRR");
KMSDRM_CrtcSetVrr(viddata->drm_fd, crtc->crtc_id, SDL_TRUE);
}
/*****************************************/ /*****************************************/
/* Part 2: setup the SDL_Display itself. */ /* Part 2: setup the SDL_Display itself. */
/*****************************************/ /*****************************************/
@ -792,12 +834,6 @@ KMSDRM_AddDisplay (_THIS, drmModeConnector *connector, drmModeRes *resources) {
/* Add the display to the list of SDL displays. */ /* Add the display to the list of SDL displays. */
SDL_AddVideoDisplay(&display, SDL_FALSE); SDL_AddVideoDisplay(&display, SDL_FALSE);
/* try to enable vrr */
if(KMSDRM_ConnectorCheckVrrCapable(viddata->drm_fd, connector->connector_id, "VRR_CAPABLE")) {
SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, "Enabling VRR");
KMSDRM_CrtcSetVrr(viddata->drm_fd, crtc->crtc_id, SDL_TRUE);
}
cleanup: cleanup:
if (encoder) if (encoder)
KMSDRM_drmModeFreeEncoder(encoder); KMSDRM_drmModeFreeEncoder(encoder);
@ -1275,6 +1311,9 @@ KMSDRM_DestroyWindow(_THIS, SDL_Window *window)
return; return;
} }
/* restore vrr state */
KMSDRM_CrtcSetVrr(windata->viddata->drm_fd, dispdata->crtc->crtc_id, dispdata->saved_vrr);
viddata = windata->viddata; viddata = windata->viddata;
if ( !is_vulkan && viddata->gbm_init) { if ( !is_vulkan && viddata->gbm_init) {

1
src/video/kmsdrm/SDL_kmsdrmvideo.h
View file

@ -71,6 +71,7 @@ typedef struct SDL_DisplayData
drmModeModeInfo fullscreen_mode; drmModeModeInfo fullscreen_mode;
drmModeCrtc *saved_crtc; /* CRTC to restore on quit */ drmModeCrtc *saved_crtc; /* CRTC to restore on quit */
SDL_bool saved_vrr;
/* DRM & GBM cursor stuff lives here, not in an SDL_Cursor's driverdata struct, /* DRM & GBM cursor stuff lives here, not in an SDL_Cursor's driverdata struct,
because setting/unsetting up these is done on window creation/destruction, because setting/unsetting up these is done on window creation/destruction,