moonlight-stream/moonlight-embedded
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-embedded.git synced 2025-07-01 15:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace ioctl() retry loops with drmIoctl()

Browse Source
This commit is contained in:
Cameron Gutman 2024-02-18 14:30:59 -06:00
parent ca4c517510
commit a9d6f17d5e
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/video/rk.c
View File

@ -28,7 +28,6 @@
#include <errno.h> #include <errno.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/ioctl.h>
#include <fcntl.h> #include <fcntl.h>
#include <pthread.h> #include <pthread.h>
#include <unistd.h> #include <unistd.h>
@ -248,9 +247,7 @@ void *frame_thread(void *param) {
dmcd.bpp = 8; // hor_stride is already adjusted for 10 vs 8 bit dmcd.bpp = 8; // hor_stride is already adjusted for 10 vs 8 bit
dmcd.width = hor_stride; dmcd.width = hor_stride;
dmcd.height = ver_stride * 2; // documentation say not v*2/3 but v*2 (additional info included) dmcd.height = ver_stride * 2; // documentation say not v*2/3 but v*2 (additional info included)
do { ret = drmIoctl(fd, DRM_IOCTL_MODE_CREATE_DUMB, &dmcd);
ret = ioctl(fd, DRM_IOCTL_MODE_CREATE_DUMB, &dmcd);
} while (ret == -1 && (errno == EINTR || errno == EAGAIN));
assert(!ret); assert(!ret);
assert(dmcd.pitch == dmcd.width); assert(dmcd.pitch == dmcd.width);
assert(dmcd.size == dmcd.pitch * dmcd.height); assert(dmcd.size == dmcd.pitch * dmcd.height);
@ -260,9 +257,7 @@ void *frame_thread(void *param) {
struct drm_prime_handle dph = {0}; struct drm_prime_handle dph = {0};
dph.handle = dmcd.handle; dph.handle = dmcd.handle;
dph.fd = -1; dph.fd = -1;
do { ret = drmIoctl(fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &dph);
ret = ioctl(fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &dph);
} while (ret == -1 && (errno == EINTR || errno == EAGAIN));
assert(!ret); assert(!ret);
MppBufferInfo info = {0}; MppBufferInfo info = {0};
info.type = MPP_BUFFER_TYPE_DRM; info.type = MPP_BUFFER_TYPE_DRM;
@ -587,9 +582,7 @@ void rk_cleanup() {
assert(!ret); assert(!ret);
struct drm_mode_destroy_dumb dmdd = {0}; struct drm_mode_destroy_dumb dmdd = {0};
dmdd.handle = frame_to_drm[i].handle; dmdd.handle = frame_to_drm[i].handle;
do { ret = drmIoctl(fd, DRM_IOCTL_MODE_DESTROY_DUMB, &dmdd);
ret = ioctl(fd, DRM_IOCTL_MODE_DESTROY_DUMB, &dmdd);
} while (ret == -1 && (errno == EINTR || errno == EAGAIN));
assert(!ret); assert(!ret);
} }
} }