mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 18:21:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

kmssink: add sync support for secondary pipes

Browse source 
The vblank event request must specify the crtc for which to request
the event. This fixes kmssink synchronisation for crtcs other than
the first.

https://bugzilla.gnome.org/show_bug.cgi?id=765064
This commit is contained in:
Philipp Zabel 2016-04-14 12:46:58 +02:00 committed by Víctor Manuel Jáquez Leal
parent bbe2e41653
commit b2c58d3bc5
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sys/kms/gstkmssink.c
View file

@ -125,7 +125,8 @@ find_plane_for_crtc (int fd, drmModeRes * res, drmModePlaneRes * pres,
} }
static drmModeCrtc * static drmModeCrtc *
find_crtc_for_connector (int fd, drmModeRes * res, drmModeConnector * conn) find_crtc_for_connector (int fd, drmModeRes * res, drmModeConnector * conn,
guint * pipe)
{ {
int i; int i;
int crtc_id; int crtc_id;
@ -151,8 +152,11 @@ find_crtc_for_connector (int fd, drmModeRes * res, drmModeConnector * conn)
for (i = 0; i < res->count_crtcs; i++) { for (i = 0; i < res->count_crtcs; i++) {
crtc = drmModeGetCrtc (fd, res->crtcs[i]); crtc = drmModeGetCrtc (fd, res->crtcs[i]);
if (crtc) { if (crtc) {
if (crtc_id == crtc->crtc_id) if (crtc_id == crtc->crtc_id) {
if (pipe)
*pipe = i;
return crtc; return crtc;
}
drmModeFreeCrtc (crtc); drmModeFreeCrtc (crtc);
} }
} }
@ -167,7 +171,7 @@ connector_is_used (int fd, drmModeRes * res, drmModeConnector * conn)
drmModeCrtc *crtc; drmModeCrtc *crtc;
result = FALSE; result = FALSE;
crtc = find_crtc_for_connector (fd, res, conn); crtc = find_crtc_for_connector (fd, res, conn, NULL);
if (crtc) { if (crtc) {
result = crtc->buffer_id != 0; result = crtc->buffer_id != 0;
drmModeFreeCrtc (crtc); drmModeFreeCrtc (crtc);
@ -376,7 +380,7 @@ gst_kms_sink_start (GstBaseSink * bsink)
if (!conn) if (!conn)
goto connector_failed; goto connector_failed;
crtc = find_crtc_for_connector (self->fd, res, conn); crtc = find_crtc_for_connector (self->fd, res, conn, &self->pipe);
if (!crtc) if (!crtc)
goto crtc_failed; goto crtc_failed;
@ -794,6 +798,11 @@ gst_kms_sink_sync (GstKMSSink * self)
}, },
}; };
if (self->pipe == 1)
vbl.request.type |= DRM_VBLANK_SECONDARY;
else if (self->pipe > 1)
vbl.request.type |= self->pipe << DRM_VBLANK_HIGH_CRTC_SHIFT;
waiting = TRUE; waiting = TRUE;
if (!self->has_async_page_flip) { if (!self->has_async_page_flip) {
ret = drmWaitVBlank (self->fd, &vbl); ret = drmWaitVBlank (self->fd, &vbl);

1
sys/kms/gstkmssink.h
View file

@ -52,6 +52,7 @@ struct _GstKMSSink {
gint conn_id; gint conn_id;
gint crtc_id; gint crtc_id;
gint plane_id; gint plane_id;
guint pipe;
/* crtc data */ /* crtc data */
guint16 hdisplay, vdisplay; guint16 hdisplay, vdisplay;