forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2025-12-23 18:50:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

v4p: wait for dma_fd on close

Browse Source
This commit is contained in:
Maxim Devaev 2024-03-10 16:49:49 +02:00
parent 646afbffff
commit c4cf4f015b
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/v4p/drm.c
View File

@ -69,8 +69,9 @@ us_drm_s *us_drm_init(void) {
US_CALLOC(run, 1);
run->fd = -1;
run->status_fd = -1;
run->has_vsync = true;
run->dpms_state = -1;
run->has_vsync = true;
run->exposing_dma_fd = -1;
run->ft = us_frametext_init();
us_drm_s *drm;
@ -161,8 +162,9 @@ int us_drm_open(us_drm_s *drm, const us_device_s *dev) {
goto error;
}
run->unplugged_reported = false;
run->opened_for_stub = (stub > 0);
run->exposing_dma_fd = -1;
run->unplugged_reported = false;
_D_LOG_INFO("Opened for %s ...", (run->opened_for_stub ? "STUB" : "DMA"));
return stub;
@ -182,6 +184,14 @@ unplugged:
void us_drm_close(us_drm_s *drm) {
us_drm_runtime_s *const run = drm->run;
if (run->exposing_dma_fd >= 0) {
// Нужно подождать, пока dma_fd не освободится, прежде чем прерывать процесс.
// Просто на всякий случай.
assert(run->fd >= 0);
us_drm_wait_for_vsync(drm);
run->exposing_dma_fd = -1;
}
if (run->saved_crtc != NULL) {
_D_LOG_DEBUG("Restoring CRTC ...");
if (drmModeSetCrtc(run->fd,
@ -221,8 +231,8 @@ void us_drm_close(us_drm_s *drm) {
US_CLOSE_FD(run->fd);
run->crtc_id = 0;
run->has_vsync = true;
run->dpms_state = -1;
run->has_vsync = true;
run->stub_n_buf = 0;
if (say) {
@ -291,6 +301,7 @@ static void _drm_vsync_callback(int fd, uint n_frame, uint sec, uint usec, void
(void)usec;
us_drm_buffer_s *const buf = v_buf;
*buf->ctx.has_vsync = true;
*buf->ctx.exposing_dma_fd = -1;
_D_LOG_DEBUG("Got VSync signal");
}
@ -387,6 +398,7 @@ int us_drm_expose_dma(us_drm_s *drm, const us_hw_buffer_s *hw) {
_D_LOG_PERROR("Can't expose DMA framebuffer n_buf=%u ...", run->stub_n_buf);
}
_D_LOG_DEBUG("Exposed DMA framebuffer n_buf=%u", run->stub_n_buf);
run->exposing_dma_fd = hw->dma_fd;
return retval;
}
@ -458,6 +470,7 @@ static int _drm_init_buffers(us_drm_s *drm, const us_device_s *dev) {
us_drm_buffer_s *const buf = &run->bufs[n_buf];
buf->ctx.has_vsync = &run->has_vsync;
buf->ctx.exposing_dma_fd = &run->exposing_dma_fd;
u32 handles[4] = {0};
u32 strides[4] = {0};

4
src/v4p/drm.h
View File

@ -47,7 +47,8 @@ typedef struct {
bool dumb_created;
bool fb_added;
struct {
bool *has_vsync;
bool *has_vsync;
int *exposing_dma_fd;
} ctx;
} us_drm_buffer_s;
@ -64,6 +65,7 @@ typedef struct {
int dpms_state;
bool opened_for_stub;
bool has_vsync;
int exposing_dma_fd;
uint stub_n_buf;
bool unplugged_reported;
us_frametext_s *ft;