[PATCH:xserver] Fix modesetting build when glamor is disabled

[Hans de Goede]

Hi,

On 10-09-16 20:05, Alan Coopersmith wrote:
> present.c: In function ‘ms_present_queue_vblank’:
> present.c:144:31: error: implicit declaration of function ‘ms_flush_drm_events’
> [-Werror=implicit-function-declaration]
>          if (errno != EBUSY || ms_flush_drm_events(screen) < 0) {
>                                ^
> present.c:144:9: warning: nested extern declaration of ‘ms_flush_drm_events’
> [-Wnested-externs]
>          if (errno != EBUSY || ms_flush_drm_events(screen) < 0) {
>          ^
>
> Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

A fix for this was already posted (and reviewed) a few days ago,
that fix instead moved the ms_flush_drm_events() implementation
outside of #ifdef GLAMOR, since it does not depend on GLAMOR,
which seems like a better fix to me.

Regards,

Hans


> ---
>  hw/xfree86/drivers/modesetting/present.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/hw/xfree86/drivers/modesetting/present.c b/hw/xfree86/drivers/modesetting/present.c
> index 55b622c..288957d 100644
> --- a/hw/xfree86/drivers/modesetting/present.c
> +++ b/hw/xfree86/drivers/modesetting/present.c
> @@ -141,7 +141,10 @@ ms_present_queue_vblank(RRCrtcPtr crtc,
>          /* If we hit EBUSY, then try to flush events.  If we can't, then
>           * this is an error.
>           */
> -        if (errno != EBUSY || ms_flush_drm_events(screen) < 0) {
> +#ifdef GLAMOR
> +        if (errno != EBUSY || ms_flush_drm_events(screen) < 0)
> +#endif
> +        {
>  	    ms_drm_abort_seq(scrn, seq);
>              return BadAlloc;
>          }
>