I've just built/installed the git master of drm.  Trying to build the git master of xf86-video-ati dies with

libtool: link: ( cd ".libs" && rm -f "ati_drv.la" && ln -s "../ati_drv.la" "ati_drv.la" )
/bin/sh ../libtool --tag=CC   --mode=compile /usr/bin/gcc -std=gnu99 -DHAVE_CONFIG_H -I. -I.. -I./AtomBios/includes  -Wall -fvisibility=hidden -I/usr/include/xorg -I/usr/include/pixman-1 -I/usr/include/libdrm -fvisibility=hidden -I/usr/include/xorg -I/usr/include/pixman-1 -I/usr/include/libdrm -I/usr/include/X11/dri -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS -DATOM_BIOS -DATOM_BIOS_PARSER -DDRIVER_PARSER -march=native -msse2 -mfpmath=sse -O3 -ffast-math -funroll-loops -fomit-frame-pointer -floop-interchange -floop-strip-mine -floop-block -MT drmmode_display.lo -MD -MP -MF .deps/drmmode_display.Tpo -c -o drmmode_display.lo drmmode_display.c
libtool: compile:  /usr/bin/gcc -std=gnu99 -DHAVE_CONFIG_H -I. -I.. -I./AtomBios/includes -Wall -fvisibility=hidden -I/usr/include/xorg -I/usr/include/pixman-1 -I/usr/include/libdrm -fvisibility=hidden -I/usr/include/xorg -I/usr/include/pixman-1 -I/usr/include/libdrm -I/usr/include/X11/dri -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS -DATOM_BIOS -DATOM_BIOS_PARSER -DDRIVER_PARSER -march=native -msse2 -mfpmath=sse -O3 -ffast-math -funroll-loops -fomit-frame-pointer -floop-interchange -floop-strip-mine -floop-block -MT drmmode_display.lo -MD -MP -MF .deps/drmmode_display.Tpo -c drmmode_display.c  -fPIC -DPIC -o .libs/drmmode_display.o
drmmode_display.c: In function 'drmmode_xf86crtc_resize':
drmmode_display.c:1148:6: error: 'struct _ScrnInfoRec' has no member named 'pixmapPrivate'
drmmode_display.c: In function 'drmmode_uevent_init':
drmmode_display.c:1445:2: warning: implicit declaration of function 'udev_monitor_filter_add_match_subsystem_devtype'
make[2]: *** [drmmode_display.lo] Error 1