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

XFree86: Fix build with DGA disabled 

It's optional, so we might as well work when it's disabled.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
Daniel Stone 2009-01-05 11:23:39 +02:00
parent 13ce7b98d4
commit 7da4e901e0
5 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xfree86/common/Makefile.am
View File

@ -13,6 +13,10 @@ if XF86VIDMODE
XF86VMODE_SDK = vidmodeproc.h XF86VMODE_SDK = vidmodeproc.h
endif endif
if DGA
DGASOURCES = xf86DGA.c
endif
XISOURCES = xf86Xinput.c xisb.c XISOURCES = xf86Xinput.c xisb.c
XISDKINCS = xf86Xinput.h xisb.h XISDKINCS = xf86Xinput.h xisb.h
RANDRSOURCES = xf86RandR.c RANDRSOURCES = xf86RandR.c

2
hw/xfree86/common/xf86Init.c
View File

@ -1220,7 +1220,9 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
* don't, will wrap them. * don't, will wrap them.
*/ */
xf86Screens[i]->EnableDisableFBAccess = xf86EnableDisableFBAccess; xf86Screens[i]->EnableDisableFBAccess = xf86EnableDisableFBAccess;
#ifdef XFreeXDGA
xf86Screens[i]->SetDGAMode = xf86SetDGAMode; xf86Screens[i]->SetDGAMode = xf86SetDGAMode;
#endif
xf86Screens[i]->DPMSSet = NULL; xf86Screens[i]->DPMSSet = NULL;
xf86Screens[i]->LoadPalette = NULL; xf86Screens[i]->LoadPalette = NULL;
xf86Screens[i]->SetOverscan = NULL; xf86Screens[i]->SetOverscan = NULL;

8
hw/xfree86/modes/Makefile.am
View File

@ -1,19 +1,23 @@
noinst_LTLIBRARIES = libxf86modes.la noinst_LTLIBRARIES = libxf86modes.la
if DGA
DGA_SRCS = xf86DiDGA.c
endif
libxf86modes_la_SOURCES = \ libxf86modes_la_SOURCES = \
xf86Crtc.c \ xf86Crtc.c \
xf86Crtc.h \ xf86Crtc.h \
xf86Cursors.c \ xf86Cursors.c \
xf86cvt.c \ xf86cvt.c \
xf86gtf.c \ xf86gtf.c \
xf86DiDGA.c \
xf86EdidModes.c \ xf86EdidModes.c \
xf86Modes.c \ xf86Modes.c \
xf86Modes.h \ xf86Modes.h \
xf86RandR12.c \ xf86RandR12.c \
xf86RandR12.h \ xf86RandR12.h \
xf86Rename.h \ xf86Rename.h \
xf86Rotate.c xf86Rotate.c \
$(DGA_SRCS)
INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \ INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
-I$(srcdir)/../loader -I$(srcdir)/../rac -I$(srcdir)/../parser \ -I$(srcdir)/../loader -I$(srcdir)/../rac -I$(srcdir)/../parser \

2
hw/xfree86/modes/xf86Crtc.h
View File

@ -825,6 +825,7 @@ xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus);
* Initialize dga for this screen * Initialize dga for this screen
*/ */
#ifdef XFreeXDGA
extern _X_EXPORT Bool extern _X_EXPORT Bool
xf86DiDGAInit (ScreenPtr pScreen, unsigned long dga_address); xf86DiDGAInit (ScreenPtr pScreen, unsigned long dga_address);
@ -834,6 +835,7 @@ xf86DiDGAInit (ScreenPtr pScreen, unsigned long dga_address);
extern _X_EXPORT Bool extern _X_EXPORT Bool
xf86DiDGAReInit (ScreenPtr pScreen); xf86DiDGAReInit (ScreenPtr pScreen);
#endif
/* /*
* Set the subpixel order reported for the screen using * Set the subpixel order reported for the screen using

4
hw/xfree86/modes/xf86RandR12.c
View File

@ -248,7 +248,9 @@ xf86RandR12GetInfo (ScreenPtr pScreen, Rotation *rotations)
{ {
xf86ProbeOutputModes (scrp, 0, 0); xf86ProbeOutputModes (scrp, 0, 0);
xf86SetScrnInfoModes (scrp); xf86SetScrnInfoModes (scrp);
#ifdef XFreeXDGA
xf86DiDGAReInit (pScreen); xf86DiDGAReInit (pScreen);
#endif
} }
for (mode = scrp->modes; ; mode = mode->next) for (mode = scrp->modes; ; mode = mode->next)
@ -1317,7 +1319,9 @@ xf86RandR12GetInfo12 (ScreenPtr pScreen, Rotation *rotations)
return TRUE; return TRUE;
xf86ProbeOutputModes (pScrn, 0, 0); xf86ProbeOutputModes (pScrn, 0, 0);
xf86SetScrnInfoModes (pScrn); xf86SetScrnInfoModes (pScrn);
#ifdef XFreeXDGA
xf86DiDGAReInit (pScreen); xf86DiDGAReInit (pScreen);
#endif
return xf86RandR12SetInfo12 (pScreen); return xf86RandR12SetInfo12 (pScreen);
} }