On 05/09/16 07:05 PM, Qiang Yu wrote: > Move ms_flush_drm_events out of GLAMOR ifdef. > Fix Bug 97586.
The second line should be written like this: Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97586 (with an empty line above it, so it's grouped with other tags such as Signed-off-by. > diff --git a/hw/xfree86/drivers/modesetting/driver.h > b/hw/xfree86/drivers/modesetting/driver.h > index 761490a..4bb4b4d 100644 > --- a/hw/xfree86/drivers/modesetting/driver.h > +++ b/hw/xfree86/drivers/modesetting/driver.h > @@ -163,8 +163,6 @@ typedef void (*ms_pageflip_handler_proc)(modesettingPtr > ms, > > typedef void (*ms_pageflip_abort_proc)(modesettingPtr ms, void *data); > > -int ms_flush_drm_events(ScreenPtr screen); > - > Bool ms_do_pageflip(ScreenPtr screen, > PixmapPtr new_front, > void *event, > @@ -174,3 +172,5 @@ Bool ms_do_pageflip(ScreenPtr screen, > ms_pageflip_abort_proc pageflip_abort); > > #endif > + > +int ms_flush_drm_events(ScreenPtr screen); Since the ms_flush_drm_events function definition is moved before the #ifdef GLAMOR in pageflip.c, it would be more consistent to do the same in driver.h. But either way, with the bugzilla tag fixed, Reviewed-by: Michel Dänzer <michel.daen...@amd.com> -- Earthling Michel Dänzer | http://www.amd.com Libre software enthusiast | Mesa and X developer _______________________________________________ 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
