Skip to content

Commit

Permalink
kmsdrm: move videomode restoration on VideoQuit() to using the atomic…
Browse files Browse the repository at this point in the history 
… interface instead of the legacy drmModeSetCrtc() function. Refactoring of get_plane_id().
  • Loading branch information
@vanfanel
vanfanel committed Aug 5, 2020
1 parent fc722b2 commit 09692b6
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 40 deletions.
24 changes: 14 additions & 10 deletions src/video/kmsdrm/SDL_kmsdrmopengles.c
View file
Expand Up @@ -80,15 +80,16 @@ KMSDRM_GLES_SwapWindow(_THIS, SDL_Window * window)
SDL_DisplayData *dispdata = (SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata;
KMSDRM_FBInfo *fb;
int ret;
uint32_t flags = 0;

uint32_t flags = DRM_MODE_ATOMIC_NONBLOCK;

/* Do we need to set video mode this time? */
if (windata->crtc_setup_pending) {
/* Do we need to set video mode this time? If yes, pass the right flag and issue a blocking atomic ioctl. */
if (dispdata->modeset_pending) {
flags |= DRM_MODE_ATOMIC_ALLOW_MODESET;
windata->crtc_setup_pending = SDL_FALSE;
dispdata->modeset_pending = SDL_FALSE;
}
else {
flags |= DRM_MODE_ATOMIC_NONBLOCK;
}


/*************************************************************************/
/* Block for telling KMS to wait for GPU rendering of the current frame */
Expand Down Expand Up @@ -184,12 +185,15 @@ KMSDRM_GLES_SwapWindowDB(_THIS, SDL_Window * window)
SDL_DisplayData *dispdata = (SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata;
KMSDRM_FBInfo *fb;
int ret;
uint32_t flags = 0;

/* Do we need to set video mode this time? */
uint32_t flags = DRM_MODE_ATOMIC_NONBLOCK;
if (windata->crtc_setup_pending) {
/* Do we need to set video mode this time? If yes, pass the right flag and issue a blocking atomic ioctl. */
if (dispdata->modeset_pending) {
flags |= DRM_MODE_ATOMIC_ALLOW_MODESET;
windata->crtc_setup_pending = SDL_FALSE;
dispdata->modeset_pending = SDL_FALSE;
}
else {
flags |= DRM_MODE_ATOMIC_NONBLOCK;
}

/* Create the fence that will be inserted in the cmdstream exactly at the end
Expand Down
66 changes: 39 additions & 27 deletions src/video/kmsdrm/SDL_kmsdrmvideo.c
View file
Expand Up @@ -333,18 +333,27 @@ void get_planes_info(_THIS)

#endif

/* Get a plane that is PRIMARY (there's no guarantee that we have overlays in all hardware!)
and can use the CRTC we have chosen. That's all. */
uint32_t get_plane_id(_THIS)
/* Get a plane that is PRIMARY (there's no guarantee that we have overlays in all hardware,
so we can really only count on having one primary plane) and can use the CRTC we have chosen. */
uint32_t get_plane_id(_THIS, drmModeRes *resources)
{
drmModePlaneResPtr plane_resources;
uint32_t i, j;
uint32_t crtc_index = 0;
int ret = -EINVAL;
int found_primary = 0;

SDL_VideoData *viddata = ((SDL_VideoData *)_this->driverdata);
SDL_DisplayData *dispdata = (SDL_DisplayData *)SDL_GetDisplayDriverData(0);

/* Get the crtc_index for the current CRTC. Needed to find out if a plane supports the CRTC. */
for (i = 0; i < resources->count_crtcs; i++) {
if (resources->crtcs[i] == dispdata->crtc_id) {
crtc_index = i;
break;
}
}

plane_resources = KMSDRM_drmModeGetPlaneResources(viddata->drm_fd);
if (!plane_resources) {
printf("drmModeGetPlaneResources failed: %s\n", strerror(errno));
Expand All @@ -363,9 +372,10 @@ uint32_t get_plane_id(_THIS)
}

/* See if the current CRTC is available for this plane. */
if (plane->possible_crtcs & (1 << dispdata->crtc_index)) {
if (plane->possible_crtcs & (1 << crtc_index)) {

drmModeObjectPropertiesPtr props = KMSDRM_drmModeObjectGetProperties(viddata->drm_fd, plane_id, DRM_MODE_OBJECT_PLANE);
drmModeObjectPropertiesPtr props = KMSDRM_drmModeObjectGetProperties(viddata->drm_fd,
plane_id, DRM_MODE_OBJECT_PLANE);
ret = plane_id;

/* Search the plane props, to see if it's a primary plane. */
Expand All @@ -379,7 +389,7 @@ uint32_t get_plane_id(_THIS)
found_primary = 1;
}

KMSDRM_drmModeFreeProperty(p);
KMSDRM_drmModeFreeProperty(p);
}

KMSDRM_drmModeFreeObjectProperties(props);
Expand Down Expand Up @@ -717,7 +727,7 @@ KMSDRM_CreateSurfaces(_THIS, SDL_Window * window)

/* We take note here about the need to do a modeset in the atomic_commit(),
called in KMSDRM_GLES_SwapWindow(). */
windata->crtc_setup_pending = SDL_TRUE;
dispdata->modeset_pending = SDL_TRUE;

return 0;
}
Expand Down Expand Up @@ -870,20 +880,12 @@ KMSDRM_VideoInit(_THIS)
/* Atomic block */
/****************/

/* Find crtc_index. It's used to find out if a plane supports a CRTC. */
/* TODO: include this in the get_plane_id() function somehow. */
for (int i = 0; i < resources->count_crtcs; i++) {
if (resources->crtcs[i] == dispdata->crtc_id) {
dispdata->crtc_index = i;
break;
}
}

/* Initialize the fences and their fds: */
dispdata->kms_fence = NULL;
dispdata->gpu_fence = NULL;
dispdata->kms_out_fence_fd = -1,
dispdata->kms_in_fence_fd = -1,
dispdata->modeset_pending = SDL_FALSE;

/*********************/
/* Atomic block ends */
Expand Down Expand Up @@ -949,7 +951,7 @@ KMSDRM_VideoInit(_THIS)
goto cleanup;
}

dispdata->plane_id = get_plane_id(_this);
dispdata->plane_id = get_plane_id(_this, resources);
if (!dispdata->plane_id) {
ret = SDL_SetError("could not find a suitable plane.");
goto cleanup;
Expand Down Expand Up @@ -1011,6 +1013,11 @@ KMSDRM_VideoInit(_THIS)
SDL_EVDEV_Init();
#endif

if (encoder)
KMSDRM_drmModeFreeEncoder(encoder);
if (resources)
KMSDRM_drmModeFreeResources(resources);

KMSDRM_InitMouse(_this);

return ret;
Expand Down Expand Up @@ -1044,12 +1051,21 @@ KMSDRM_VideoInit(_THIS)
return ret;
}

/* Fn to restore original video mode and crtc buffer on quit, using the atomic interface. */
/*int
restore_video (_THIS)
{
SDL_DisplayData *dispdata = (SDL_DisplayData *)SDL_GetDisplayDriverData(0);
ret = drm_atomic_commit(_this, fb->fb_id, flags);
}*/

void
KMSDRM_VideoQuit(_THIS)
{
SDL_VideoData *viddata = ((SDL_VideoData *)_this->driverdata);
SDL_DisplayData *dispdata = (SDL_DisplayData *)SDL_GetDisplayDriverData(0);

SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, "KMSDRM_VideoQuit()");

if (_this->gl_config.driver_loaded) {
Expand All @@ -1062,16 +1078,14 @@ KMSDRM_VideoQuit(_THIS)
viddata->max_windows = 0;
viddata->num_windows = 0;

/* Restore saved CRTC settings */
/* Restore original videomode. */
if (viddata->drm_fd >= 0 && dispdata && dispdata->connector && dispdata->crtc) {
drmModeConnector *conn = dispdata->connector;
drmModeCrtc *crtc = dispdata->crtc;
uint32_t flags = DRM_MODE_ATOMIC_ALLOW_MODESET;

int ret = KMSDRM_drmModeSetCrtc(viddata->drm_fd, crtc->crtc_id, crtc->buffer_id,
crtc->x, crtc->y, &conn->connector_id, 1, &crtc->mode);
int ret = drm_atomic_commit(_this, dispdata->crtc->buffer_id, flags);

if (ret != 0) {
SDL_LogWarn(SDL_LOG_CATEGORY_VIDEO, "Could not restore original CRTC mode");
SDL_LogWarn(SDL_LOG_CATEGORY_VIDEO, "Could not restore original videomode");
}
}
/****************/
Expand Down Expand Up @@ -1191,11 +1205,9 @@ KMSDRM_CreateWindow(_THIS, SDL_Window * window)
goto error;
}

/* Init windata fields. */
windata->crtc_setup_pending = SDL_FALSE;
/* Init fields. */
windata->egl_surface_dirty = SDL_FALSE;


/* First remember that certain functions in SDL_Video.c will call *_SetDisplayMode when the
SDL_WINDOW_FULLSCREEN is set and SDL_WINDOW_FULLSCREEN_DESKTOP is not set.
So I am determining here that the behavior when creating an SDL_Window() in KMSDRM, is:
Expand Down
4 changes: 1 addition & 3 deletions src/video/kmsdrm/SDL_kmsdrmvideo.h
View file
Expand Up @@ -75,14 +75,13 @@ typedef struct SDL_DisplayData
drmModeObjectProperties *connector_props;
drmModePropertyRes **connector_props_info;

int crtc_index;

int kms_in_fence_fd;
int kms_out_fence_fd;

EGLSyncKHR kms_fence; /* Signaled when kms completes changes requested in atomic iotcl (pageflip, etc). */
EGLSyncKHR gpu_fence; /* Signaled when GPU rendering is done. */

SDL_bool modeset_pending;
} SDL_DisplayData;


Expand All @@ -93,7 +92,6 @@ typedef struct SDL_WindowData
struct gbm_bo *bo;
struct gbm_bo *next_bo;
struct gbm_bo *crtc_bo;
SDL_bool crtc_setup_pending;
#if SDL_VIDEO_OPENGL_EGL
SDL_bool egl_surface_dirty;
EGLSurface egl_surface;
Expand Down

0 comments on commit 09692b6

Please sign in to comment.