compositor-drm: Fix bad rebase
compositor-drm: Fix bad rebase

I failed to compile test my rebase of Robs compositor-drm fixes.

Tarnyko/weston-xdg_surface_present,kwm81/weston,Gnurou/weston,kwm81/weston,udoprog/weston,krezovic/weston,udoprog/weston,Fantu/compositor-spice,krezovic/weston,Fantu/compositor-spice,eyolfson/weston,jonnylamb/weston,mchalupa/weston,jonnylamb/weston,giucam/weston,Tarnyko/weston-xdg_surface_present,xorgy/weston,Fantu/compositor-spice,eyolfson/weston,giucam/weston,xorgy/weston,sir-murray/weston,mchalupa/weston,Gnurou/weston,sir-murray/weston