Commit b3ac87d559cd03122be2a6f4801e80b3574cb384
2018-12-01T13:09:00
kmsdrm: uninitialized KMSDRM fixes * Search for valid encoder in connector when it doesn't have an encoder ID set. * Search for valid CRTC in resources and encoder's possible CRTCs when encoder doesn't have one set. * Select default mode if CRTC doesn't have a valid one. * Pick current_mode's W/H/Refresh Rate basing on current and valid CRTC mode, not the saved one.
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 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86
diff --git a/src/video/kmsdrm/SDL_kmsdrmvideo.c b/src/video/kmsdrm/SDL_kmsdrmvideo.c
index 1d53ee9..080ec66 100644
--- a/src/video/kmsdrm/SDL_kmsdrmvideo.c
+++ b/src/video/kmsdrm/SDL_kmsdrmvideo.c
@@ -333,7 +333,8 @@ KMSDRM_FlipHandler(int fd, unsigned int frame, unsigned int sec, unsigned int us
int
KMSDRM_VideoInit(_THIS)
{
- int i;
+ int i, j;
+ SDL_bool found;
int ret = 0;
char *devname;
SDL_VideoData *vdata = ((SDL_VideoData *)_this->driverdata);
@@ -402,6 +403,8 @@ KMSDRM_VideoInit(_THIS)
goto cleanup;
}
+ found = SDL_FALSE;
+
for (i = 0; i < resources->count_encoders; i++) {
encoder = KMSDRM_drmModeGetEncoder(vdata->drm_fd, resources->encoders[i]);
@@ -409,8 +412,20 @@ KMSDRM_VideoInit(_THIS)
continue;
if (encoder->encoder_id == connector->encoder_id) {
- SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, "Found encoder %d.", encoder->encoder_id);
data->encoder_id = encoder->encoder_id;
+ found = SDL_TRUE;
+ } else {
+ for (j = 0; j < connector->count_encoders; j++) {
+ if (connector->encoders[j] == encoder->encoder_id) {
+ data->encoder_id = encoder->encoder_id;
+ found = SDL_TRUE;
+ break;
+ }
+ }
+ }
+
+ if (found == SDL_TRUE) {
+ SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, "Found encoder %d.", data->encoder_id);
break;
}
@@ -424,6 +439,18 @@ KMSDRM_VideoInit(_THIS)
}
vdata->saved_crtc = KMSDRM_drmModeGetCrtc(vdata->drm_fd, encoder->crtc_id);
+
+ if (vdata->saved_crtc == NULL) {
+ for (i = 0; i < resources->count_crtcs; i++) {
+ if (encoder->possible_crtcs & (1 << i)) {
+ encoder->crtc_id = resources->crtcs[i];
+ SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, "Set encoder's CRTC to %d.", encoder->crtc_id);
+ vdata->saved_crtc = KMSDRM_drmModeGetCrtc(vdata->drm_fd, encoder->crtc_id);
+ break;
+ }
+ }
+ }
+
if (vdata->saved_crtc == NULL) {
ret = SDL_SetError("No CRTC found.");
goto cleanup;
@@ -435,11 +462,18 @@ KMSDRM_VideoInit(_THIS)
data->cur_mode = vdata->saved_crtc->mode;
vdata->crtc_id = encoder->crtc_id;
+ // select default mode if this one is not valid
+ if (vdata->saved_crtc->mode_valid == 0) {
+ SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO,
+ "Current mode is invalid, selecting connector's mode #0.");
+ data->cur_mode = connector->modes[0];
+ }
+
SDL_zero(current_mode);
- current_mode.w = vdata->saved_crtc->mode.hdisplay;
- current_mode.h = vdata->saved_crtc->mode.vdisplay;
- current_mode.refresh_rate = vdata->saved_crtc->mode.vrefresh;
+ current_mode.w = data->cur_mode.hdisplay;
+ current_mode.h = data->cur_mode.vdisplay;
+ current_mode.refresh_rate = data->cur_mode.vrefresh;
/* FIXME ?
drmModeFB *fb = drmModeGetFB(vdata->drm_fd, vdata->saved_crtc->buffer_id);