[PATCH] modesetting: fix build with glamor disabled.

[Peter Hutterer]

On Fri, May 06, 2016 at 05:41:58AM +1000, Dave Airlie wrote:
> From: Dave Airlie <airlied at redhat.com>
> 
> Fix build without --enable-glamor.
> 
> Caught by the arm tinderbox.
> 
> Signed-off-by: Dave Airlie <airlied at redhat.com>

   66fdeb8..7f04946  master -> master

thanks.

Cheers,
   Peter

> ---
>  hw/xfree86/drivers/modesetting/drmmode_display.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
> index 546673b..2cda523 100644
> --- a/hw/xfree86/drivers/modesetting/drmmode_display.c
> +++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
> @@ -287,6 +287,7 @@ drmmode_crtc_dpms(xf86CrtcPtr crtc, int mode)
>      drmmode_crtc->dpms_mode = mode;
>  }
>  
> +#ifdef GLAMOR
>  static PixmapPtr
>  create_pixmap_for_fbcon(drmmode_ptr drmmode, ScrnInfoPtr pScrn, int fbcon_id)
>  {
> @@ -331,10 +332,12 @@ out_free_fb:
>      drmModeFreeFB(fbcon);
>      return pixmap;
>  }
> +#endif
>  
>  void
>  drmmode_copy_fb(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
>  {
> +#ifdef GLAMOR
>      xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
>      ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
>      PixmapPtr src, dst;
> @@ -381,6 +384,7 @@ drmmode_copy_fb(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
>      if (drmmode->fbcon_pixmap)
>          pScrn->pScreen->DestroyPixmap(drmmode->fbcon_pixmap);
>      drmmode->fbcon_pixmap = NULL;
> +#endif
>  }
>  
>  static Bool
> -- 
> 2.5.5
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: https://lists.x.org/mailman/listinfo/xorg-devel
>