summaryrefslogtreecommitdiffstats
path: root/video/out/drm_common.c
diff options
context:
space:
mode:
authorAnton Kindestam <antonki@kth.se>2019-12-07 18:23:42 +0100
committerAnton Kindestam <antonki@kth.se>2019-12-07 18:34:25 +0100
commitd5cabf73489fe165562adea765ed7f53fd264e53 (patch)
tree42ebb44b8d924489c1b0556b3ba5805d8880cfff /video/out/drm_common.c
parent83b742df77e9edd0fb2290567097c5d5dc0c2c55 (diff)
downloadmpv-d5cabf73489fe165562adea765ed7f53fd264e53.tar.bz2
mpv-d5cabf73489fe165562adea765ed7f53fd264e53.tar.xz
drm: avoid division by 0 in drm_pflip_cb with bad drivers
Seems like some drivers only increment msc every other page flip when running in interlaced mode (I'm looking at you nouveau). I.e. it seems to be incremented at the frame rate, rather than the field rate. Obviously we can't work with this, so shame the driver and bail. On intel this isn't an issue, as msc is incremented at field rate there. This means presentation feedback won't work correctly in interlaced modes with those drivers, but who in their right mind uses an interlaced mode these days, anyway?
Diffstat (limited to 'video/out/drm_common.c')
-rw-r--r--video/out/drm_common.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/video/out/drm_common.c b/video/out/drm_common.c
index 9c56227b9e..084cf22768 100644
--- a/video/out/drm_common.c
+++ b/video/out/drm_common.c
@@ -944,6 +944,15 @@ void drm_pflip_cb(int fd, unsigned int msc, unsigned int sec,
const uint64_t ust = (sec * 1000000LL) + usec;
const unsigned int msc_since_last_flip = msc - vsync->msc;
+ if (ready && msc == vsync->msc) {
+ // Seems like some drivers only increment msc every other page flip when
+ // running in interlaced mode (I'm looking at you nouveau). Obviously we
+ // can't work with this, so shame the driver and bail.
+ mp_err(closure->log,
+ "Got the same msc value twice: (msc: %u, vsync->msc: %u). This shouldn't happen. Possibly broken driver/interlaced mode?\n",
+ msc, vsync->msc);
+ goto fail;
+ }
vsync->ust = ust;
vsync->msc = msc;