RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vo_drm: fix releasing VT if received signal twice 

If user switched terminals frantically, mpv could get SIGUSR1 twice in a
row, which, up until now, resulted in destroying CRTC twice. This caused
it to segfault. After this fix, double SIGUSR1 should be ignored.
This commit is contained in:
Marcin Kurczewski 2015-04-20 21:30:26 +02:00 committed by wm4
parent a7cf35c1ca
commit 7f29172baf
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
video/out/vo_drm.c
View File

@ -350,6 +350,7 @@ static void modeset_page_flipped(int fd, unsigned int frame, unsigned int sec,
static int setup_vo_crtc(struct vo *vo)
{
struct priv *p = vo->priv;
if (p->active) return;
p->old_crtc = drmModeGetCrtc(p->fd, p->dev->crtc);
int ret = drmModeSetCrtc(p->fd, p->dev->crtc,
p->dev->bufs[p->dev->front_buf + BUF_COUNT - 1].fb,
@ -362,6 +363,7 @@ static void release_vo_crtc(struct vo *vo)
{
struct priv *p = vo->priv;
if (!p->active) return;
p->active = false;
// wait for current page flip
@ -383,6 +385,7 @@ static void release_vo_crtc(struct vo *vo)
1,
&p->dev->mode);
drmModeFreeCrtc(p->old_crtc);
p->old_crtc = NULL;
}
}