frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modesetting: fix build with glamor disabled. 

Fix build without --enable-glamor.

Caught by the arm tinderbox.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Dave Airlie 2016-05-06 05:41:58 +10:00 committed by Peter Hutterer
parent 66fdeb880a
commit 7f0494671f
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xfree86/drivers/modesetting/drmmode_display.c
View File

@ -287,6 +287,7 @@ drmmode_crtc_dpms(xf86CrtcPtr crtc, int mode)
drmmode_crtc->dpms_mode = mode; drmmode_crtc->dpms_mode = mode;
} }
#ifdef GLAMOR
static PixmapPtr static PixmapPtr
create_pixmap_for_fbcon(drmmode_ptr drmmode, ScrnInfoPtr pScrn, int fbcon_id) create_pixmap_for_fbcon(drmmode_ptr drmmode, ScrnInfoPtr pScrn, int fbcon_id)
{ {
@ -331,10 +332,12 @@ out_free_fb:
drmModeFreeFB(fbcon); drmModeFreeFB(fbcon);
return pixmap; return pixmap;
} }
#endif
void void
drmmode_copy_fb(ScrnInfoPtr pScrn, drmmode_ptr drmmode) drmmode_copy_fb(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
{ {
#ifdef GLAMOR
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
ScreenPtr pScreen = xf86ScrnToScreen(pScrn); ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
PixmapPtr src, dst; PixmapPtr src, dst;
@ -381,6 +384,7 @@ drmmode_copy_fb(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
if (drmmode->fbcon_pixmap) if (drmmode->fbcon_pixmap)
pScrn->pScreen->DestroyPixmap(drmmode->fbcon_pixmap); pScrn->pScreen->DestroyPixmap(drmmode->fbcon_pixmap);
drmmode->fbcon_pixmap = NULL; drmmode->fbcon_pixmap = NULL;
#endif
} }
static Bool static Bool