vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
5f5eec1c49d0834251dfbc36e6c84af3f4da3fef
RedBear-OS/local/patches/libdrm/01-drm-ioctl-bridge.patch
T
vasilito 5f5eec1c49 libdrm: migrate to upstream git + external patches (Rule 2 policy fix, v6.0 2026) 
Per local/AGENTS.md Rule 2 (NO OVERLAY-STYLE PATCHES — AMENDED 2026), big
external projects must NOT have source forks in local/sources/. libdrm's
Red Bear edits now live as external patches in local/patches/libdrm/,
matching the established pipewire and wireplumber migration pattern
(commits 8ff9da2ff, 722f0c452).

The 5 patches were recovered from git history (commit 89d1306c8^ —
the migration that deleted them) and renamed to the modern Rule 2
NN-prefix naming for lexical-order application:

  01-drm-ioctl-bridge.patch            (P1 from old series, 278 lines)
  02-ioctl-response-sizes.patch       (P1 from old series,  30 lines)
  03-drm-get-pci-info.patch           (P2 from old series, 153 lines)
  04-drm-get-version-driver-name.patch (P3 from old series,  34 lines)
  05-drmGetDeviceFromDevId-redox.patch (P4 from old series,  68 lines)

These patches add the Redox-side ioctl/ioctl-com and scheme: dispatch
path needed by redox-drm and Mesa radeonsi/iris.

The recipe now points at upstream libdrm 2.4.125
(https://gitlab.freedesktop.org/mesa/libdrm, tag libdrm-2.4.125) and
applies the patches via a [source].script hook (the cookbook's
"Optional script to run to prepare the source" field) with a
REDBEAR_PATCHES_DIR computed from COOKBOOK_RECIPE.

Fixes the broken state where the recipe referenced the now-deleted
local/sources/libdrm/ fork.
2026-06-09 23:24:01 +03:00

279 lines
7.3 KiB
Diff
Raw Blame History

--- a/xf86drm.c
+++ b/xf86drm.c
@@ -91,6 +91,7 @@
#include "xf86drm_redox.h"
#include "libdrm_macros.h"
#include "drm_fourcc.h"
+#include "virtgpu_drm.h"
#include "util_math.h"
@@ -813,6 +814,50 @@
return REDOX_DRM_IOCTL_MODE_DESTROY_DUMB;
case 0xAF:
return REDOX_DRM_IOCTL_MODE_RMFB;
+ /* VirtGPU ioctls (NR 0x41-0x4B) */
+ case 0x41:
+ return REDOX_DRM_IOCTL_VIRTGPU_MAP;
+ case 0x42:
+ return REDOX_DRM_IOCTL_VIRTGPU_EXECBUFFER;
+ case 0x43:
+ return REDOX_DRM_IOCTL_VIRTGPU_GETPARAM;
+ case 0x44:
+ return REDOX_DRM_IOCTL_VIRTGPU_RESOURCE_CREATE;
+ case 0x45:
+ return REDOX_DRM_IOCTL_VIRTGPU_RESOURCE_INFO;
+ case 0x46:
+ return REDOX_DRM_IOCTL_VIRTGPU_TRANSFER_FROM_HOST;
+ case 0x47:
+ return REDOX_DRM_IOCTL_VIRTGPU_TRANSFER_TO_HOST;
+ case 0x48:
+ return REDOX_DRM_IOCTL_VIRTGPU_WAIT;
+ case 0x49:
+ return REDOX_DRM_IOCTL_VIRTGPU_GET_CAPS;
+ case 0x4A:
+ return REDOX_DRM_IOCTL_VIRTGPU_RESOURCE_CREATE_BLOB;
+ case 0x4B:
+ return REDOX_DRM_IOCTL_VIRTGPU_CONTEXT_INIT;
+ /* Additional standard DRM ioctls */
+ case 0x00:
+ return REDOX_DRM_IOCTL_VERSION;
+ case 0xA0:
+ return REDOX_DRM_IOCTL_MODE_GETRESOURCES;
+ case 0xA1:
+ return REDOX_DRM_IOCTL_MODE_GETCRTC;
+ case 0xA2:
+ return REDOX_DRM_IOCTL_MODE_SETCRTC;
+ case 0xA3:
+ return REDOX_DRM_IOCTL_MODE_GETCONNECTOR;
+ case 0xA4:
+ return REDOX_DRM_IOCTL_MODE_PAGE_FLIP;
+ case 0xA8:
+ return REDOX_DRM_IOCTL_MODE_CREATE_DUMB;
+ case 0xAC:
+ return REDOX_DRM_IOCTL_MODE_ADDFB;
+ case 0x2B:
+ return REDOX_DRM_IOCTL_PRIME_HANDLE_TO_FD;
+ case 0x2C:
+ return REDOX_DRM_IOCTL_PRIME_FD_TO_HANDLE;
default:
return 0;
}
@@ -908,7 +953,19 @@
static size_t redox_drm_expected_response_size(unsigned long linux_nr, size_t arg_size)
{
switch (linux_nr) {
+ case 0x00: /* VERSION */
case 0x0C:
+ case 0x2B: /* PRIME_HANDLE_TO_FD */
+ case 0x2C: /* PRIME_FD_TO_HANDLE */
+ case 0x41: /* VIRTGPU_MAP */
+ case 0x43: /* VIRTGPU_GETPARAM */
+ case 0x44: /* VIRTGPU_RESOURCE_CREATE */
+ case 0x45: /* VIRTGPU_RESOURCE_INFO */
+ case 0xA0: /* MODE_GETRESOURCES */
+ case 0xA1: /* MODE_GETCRTC */
+ case 0xA3: /* MODE_GETCONNECTOR */
+ case 0xA8: /* MODE_CREATE_DUMB */
+ case 0xAC: /* MODE_ADDFB */
case 0xA6:
case 0xB3:
return arg_size;
@@ -927,6 +984,41 @@
if (request_code == 0) {
errno = ENOTTY;
return -1;
+ }
+
+ if (linux_nr == 0x42) { /* VIRTGPU_EXECBUFFER */
+ struct drm_virtgpu_execbuffer *eb = arg;
+ size_t total = arg_size + eb->size;
+ uint8_t *buf = drmMalloc((int)total);
+ int ret;
+
+ if (!buf)
+ return -1;
+
+ memcpy(buf, arg, arg_size);
+ if (eb->size > 0 && eb->command)
+ memcpy(buf + arg_size, (void *)(uintptr_t)eb->command, eb->size);
+
+ ret = redox_drm_exchange(fd, request_code, buf, total, NULL, 0, NULL);
+ drmFree(buf);
+ return ret;
+ }
+
+ if (linux_nr == 0x49) { /* VIRTGPU_GET_CAPS */
+ struct drm_virtgpu_get_caps *gc = arg;
+ void *resp;
+ size_t resp_size;
+ int ret;
+
+ ret = redox_drm_exchange_alloc(fd, request_code, arg, arg_size, &resp, &resp_size);
+ if (ret == 0 && resp && resp_size > 0) {
+ size_t copy = resp_size < gc->size ? resp_size : gc->size;
+
+ memcpy((void *)(uintptr_t)gc->addr, resp, copy);
+ drmFree(resp);
+ }
+
+ return ret;
}
if (redox_drm_exchange(fd, request_code,
--- a/xf86drm_redox.h
+++ b/xf86drm_redox.h
@@ -28,6 +28,17 @@
#define REDOX_DRM_IOCTL_GEM_CLOSE (REDOX_DRM_IOCTL_BASE + 27)
#define REDOX_DRM_IOCTL_PRIME_HANDLE_TO_FD (REDOX_DRM_IOCTL_BASE + 29)
#define REDOX_DRM_IOCTL_PRIME_FD_TO_HANDLE (REDOX_DRM_IOCTL_BASE + 30)
+#define REDOX_DRM_IOCTL_VIRTGPU_MAP (REDOX_DRM_IOCTL_BASE + 31)
+#define REDOX_DRM_IOCTL_VIRTGPU_EXECBUFFER (REDOX_DRM_IOCTL_BASE + 32)
+#define REDOX_DRM_IOCTL_VIRTGPU_GETPARAM (REDOX_DRM_IOCTL_BASE + 33)
+#define REDOX_DRM_IOCTL_VIRTGPU_RESOURCE_CREATE (REDOX_DRM_IOCTL_BASE + 34)
+#define REDOX_DRM_IOCTL_VIRTGPU_RESOURCE_INFO (REDOX_DRM_IOCTL_BASE + 35)
+#define REDOX_DRM_IOCTL_VIRTGPU_TRANSFER_FROM_HOST (REDOX_DRM_IOCTL_BASE + 36)
+#define REDOX_DRM_IOCTL_VIRTGPU_TRANSFER_TO_HOST (REDOX_DRM_IOCTL_BASE + 37)
+#define REDOX_DRM_IOCTL_VIRTGPU_WAIT (REDOX_DRM_IOCTL_BASE + 38)
+#define REDOX_DRM_IOCTL_VIRTGPU_GET_CAPS (REDOX_DRM_IOCTL_BASE + 39)
+#define REDOX_DRM_IOCTL_VIRTGPU_RESOURCE_CREATE_BLOB (REDOX_DRM_IOCTL_BASE + 40)
+#define REDOX_DRM_IOCTL_VIRTGPU_CONTEXT_INIT (REDOX_DRM_IOCTL_BASE + 41)
struct redox_drm_resources_wire {
uint32_t connector_count;
--- /dev/null
+++ b/virtgpu_drm.h
@@ -0,0 +1,132 @@
+#ifndef _VIRTGPU_DRM_H_
+#define _VIRTGPU_DRM_H_
+
+#include <stdint.h>
+
+#define DRM_VIRTGPU_MAP 0x41
+#define DRM_VIRTGPU_EXECBUFFER 0x42
+#define DRM_VIRTGPU_GETPARAM 0x43
+#define DRM_VIRTGPU_RESOURCE_CREATE 0x44
+#define DRM_VIRTGPU_RESOURCE_INFO 0x45
+#define DRM_VIRTGPU_TRANSFER_FROM_HOST 0x46
+#define DRM_VIRTGPU_TRANSFER_TO_HOST 0x47
+#define DRM_VIRTGPU_WAIT 0x48
+#define DRM_VIRTGPU_GET_CAPS 0x49
+#define DRM_VIRTGPU_RESOURCE_CREATE_BLOB 0x4A
+#define DRM_VIRTGPU_CONTEXT_INIT 0x4B
+
+#define drm_virtgpu_resource_create drm_virtgpu_resource_create_3d
+#define drm_virtgpu_3d_transfer_to_host drm_virtgpu_transfer_to_host
+#define drm_virtgpu_3d_transfer_from_host drm_virtgpu_transfer_from_host
+#define drm_virtgpu_3d_wait drm_virtgpu_wait_3d
+#define ctx_set_params_ptr ctx_set_params
+#define resource_id res_handle
+
+struct drm_virtgpu_3d_box {
+ uint32_t x;
+ uint32_t y;
+ uint32_t z;
+ uint32_t w;
+ uint32_t h;
+ uint32_t d;
+};
+
+struct drm_virtgpu_execbuffer {
+ uint32_t flags;
+ uint32_t size;
+ uint64_t command;
+ uint64_t bo_handles;
+ uint32_t num_bo_handles;
+ int32_t fence_fd;
+ uint32_t ring_idx;
+ uint32_t syncobj_stride;
+ uint32_t num_in_syncobjs;
+ uint32_t num_out_syncobjs;
+ uint64_t in_syncobjs;
+ uint64_t out_syncobjs;
+};
+
+struct drm_virtgpu_getparam {
+ uint64_t param;
+ uint64_t value;
+};
+
+struct drm_virtgpu_resource_create_3d {
+ uint32_t target;
+ uint32_t format;
+ uint32_t bind;
+ uint32_t width;
+ uint32_t height;
+ uint32_t depth;
+ uint32_t array_size;
+ uint32_t last_level;
+ uint32_t nr_samples;
+ uint32_t flags;
+ uint32_t bo_handle;
+ uint32_t res_handle;
+ uint32_t size;
+ uint32_t stride;
+};
+
+struct drm_virtgpu_resource_info {
+ uint32_t bo_handle;
+ uint32_t res_handle;
+ uint32_t size;
+ uint32_t blob_mem;
+};
+
+struct drm_virtgpu_transfer_to_host {
+ uint32_t bo_handle;
+ struct drm_virtgpu_3d_box box;
+ uint32_t level;
+ uint32_t offset;
+ uint32_t stride;
+ uint32_t layer_stride;
+};
+
+struct drm_virtgpu_transfer_from_host {
+ uint32_t bo_handle;
+ struct drm_virtgpu_3d_box box;
+ uint32_t level;
+ uint32_t offset;
+ uint32_t stride;
+ uint32_t layer_stride;
+};
+
+struct drm_virtgpu_wait_3d {
+ uint32_t handle;
+ uint32_t flags;
+};
+
+struct drm_virtgpu_get_caps {
+ uint32_t cap_set_id;
+ uint32_t cap_set_ver;
+ uint64_t addr;
+ uint32_t size;
+ uint32_t pad;
+};
+
+struct drm_virtgpu_resource_create_blob {
+ uint32_t blob_mem;
+ uint32_t blob_flags;
+ uint32_t bo_handle;
+ uint32_t res_handle;
+ uint64_t size;
+ uint32_t pad;
+ uint32_t cmd_size;
+ uint64_t cmd;
+ uint64_t blob_id;
+};
+
+struct drm_virtgpu_context_set_param {
+ uint64_t param;
+ uint64_t value;
+};
+
+struct drm_virtgpu_context_init {
+ uint32_t num_params;
+ uint32_t pad;
+ uint64_t ctx_set_params;
+};
+
+#endif
Reference in New Issue View Git Blame Copy Permalink