On Mon, 2018-02-12 at 13:51 -0800, Keith Packard wrote: > +static void > +drmmode_validate_leases(ScrnInfoPtr scrn) > +{ > + ScreenPtr screen = scrn->pScreen; > + rrScrPrivPtr scr_priv = rrGetScrPriv(screen); > + modesettingPtr ms = modesettingPTR(scrn); > + drmmode_ptr drmmode = &ms->drmmode; > + drmModeLesseeListPtr lessees; > + RRLeasePtr lease, next; > + int l; > + > + /* We can't talk to the kernel about leases when VT switched */ > + if (!scrn->vtSema) > + return; > + > + lessees = drmModeListLessees(drmmode->fd); > + if (!lessees) > + return;
This is new in libdrm 2.4.89, but we're still only requiring >= 2.3.1 (lulz). I've bumped the requirement in configure.ac and meson.build. In 2/7, you begin using a #define from randrproto 1.6 without requiring it; I've fixed that too. With those changes, merged 1-5 of this series: remote: I: patch #204074 updated using rev fabbaa8d6260da14fe5b7ca0f3f8748af16253a2. remote: E: failed to find patch for rev b91c787c4cd2d20685db69426c539938c556128a. remote: I: patch #192311 updated using rev 39573605050f6253d14a4786bb79ce2b48537039. remote: I: patch #204071 updated using rev 023d4aba8d45e9e3630b944ecfb650c081799b96. remote: E: failed to find patch for rev e4e3447603b5fd3a38a92c3f972396d1f81168ad. remote: I: 3 patch(es) updated to state Accepted. To ssh://git.freedesktop.org/git/xorg/xserver 80d4f4b6c2..e4e3447603 master -> master I didn't merge 6/7 because libxcb has the following dumbness: desoxy:~% pkg-config --modversion xcb-randr 1.12 That is, of course, the libxcb version number, not a reflection of the randr protocol it supports. I don't have a good solution for that yet. At any rate it would break the build for people without git-fresh xcb bits, so it's left out for now. Likewise I didn't merge 7/7 because you'd said you would change it to a command line option. - ajax _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel