We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] [PATCH] Uninitialized KMSDRM fixes

sdl-2.0.9-kmsdrm-fixes.patch (text/plain), 3.26 KB, created by Sergey Zhuravlevich on 2018-11-30 12:11:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sergey Zhuravlevich

Created: 2018-11-30 12:11:41 UTC

Size: 3.26 KB

patch

obsolete

>Author: Sergey Zhuravlevich <zhurxx@gmail.com>
>Date:   Fri Nov 16 03:24:32 +06 2018
>
>    * 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.
>
>--- SDL2-2.0.9/src/video/kmsdrm/SDL_kmsdrmvideo.c	2018-10-31 16:07:22.000000000 +0100
>+++ SDL2-2.0.9/src/video/kmsdrm/SDL_kmsdrmvideo.c	2018-11-15 22:06:58.203160891 +0100
>@@ -333,7 +333,8 @@
> 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 @@
>         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 @@
>             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 @@
>     }
>
>     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 @@
>     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);

Actions: View | Diff

Attachments on bug 4404: 3516

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.