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 file for support

kmsdrm_legacy_openbsd.patch (text/plain), 2.58 KB, created by wahil1976 on 2020-12-28 18:19:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: wahil1976

Created: 2020-12-28 18:19:30 UTC

Size: 2.58 KB

patch

obsolete

>diff -r 58ce871ea57d src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_video.c
>--- a/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_video.c	Mon Dec 28 16:19:19 2020 +0100
>+++ b/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_video.c	Mon Dec 28 23:54:49 2020 +0600
>@@ -47,7 +47,19 @@
> #include <errno.h>
> #include <poll.h>
> 
>+#ifdef __OpenBSD__
>+#define KMSDRM_LEGACY_DRI_PATH "/dev/"
>+#define KMSDRM_LEGACY_DRI_DEVFMT "%sdrm%d"
>+#define KMSDRM_LEGACY_DRI_DEVNAME "drm"
>+#define KMSDRM_LEGACY_DRI_DEVNAMESIZE 3
>+#define KMSDRM_LEGACY_DRI_CARDPATHFMT "/dev/drm%d"
>+#else
> #define KMSDRM_LEGACY_DRI_PATH "/dev/dri/"
>+#define KMSDRM_LEGACY_DRI_DEVFMT "%scard%d"
>+#define KMSDRM_LEGACY_DRI_DEVNAME "card"
>+#define KMSDRM_LEGACY_DRI_DEVNAMESIZE 4
>+#define KMSDRM_LEGACY_DRI_CARDPATHFMT "/dev/dri/card%d"
>+#endif
> 
> static int
> check_modestting(int devindex)
>@@ -56,14 +68,14 @@
>     char device[512];
>     int drm_fd;
> 
>-    SDL_snprintf(device, sizeof (device), "%scard%d", KMSDRM_LEGACY_DRI_PATH, devindex);
>+    SDL_snprintf(device, sizeof (device), KMSDRM_LEGACY_DRI_DEVFMT, KMSDRM_LEGACY_DRI_PATH, devindex);
> 
>     drm_fd = open(device, O_RDWR | O_CLOEXEC);
>     if (drm_fd >= 0) {
>         if (SDL_KMSDRM_LEGACY_LoadSymbols()) {
>             drmModeRes *resources = KMSDRM_LEGACY_drmModeGetResources(drm_fd);
>             if (resources) {
>-                SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, "%scard%d connector, encoder and CRTC counts are: %d %d %d",
>+                SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, KMSDRM_LEGACY_DRI_DEVFMT " connector, encoder and CRTC counts are: %d %d %d",
>                              KMSDRM_LEGACY_DRI_PATH, devindex,
>                              resources->count_connectors, resources->count_encoders, resources->count_crtcs);
> 
>@@ -104,7 +116,7 @@
>     if (folder) {
>         while ((res = readdir(folder))) {
>             int len = SDL_strlen(res->d_name);
>-            if (len > 4 && SDL_strncmp(res->d_name, "card", 4) == 0) {
>+            if (len > KMSDRM_LEGACY_DRI_DEVNAMESIZE && SDL_strncmp(res->d_name, KMSDRM_LEGACY_DRI_DEVNAME, KMSDRM_LEGACY_DRI_DEVNAMESIZE) == 0) {
>                 devcount++;
>             }
>         }
>@@ -441,8 +453,8 @@
> 
>     SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, "KMSDRM_LEGACY_VideoInit()");
> 
>-    /* Open /dev/dri/cardNN */
>-    SDL_snprintf(devname, sizeof(devname), "/dev/dri/card%d", viddata->devindex);
>+    /* Open /dev/dri/cardNN (/dev/drmN if on OpenBSD) */
>+    SDL_snprintf(devname, sizeof(devname), KMSDRM_LEGACY_DRI_CARDPATHFMT, viddata->devindex);
> 
>     SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, "Opening device %s", devname);
>     viddata->drm_fd = open(devname, O_RDWR | O_CLOEXEC);

Actions: View | Diff

Attachments on bug 5422: 4616

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.