diff options
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c')
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c b/xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c index 5d7ce6965..ad77bc48a 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c +++ b/xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c @@ -11,7 +11,7 @@ * Guy DESBIEF */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c,v 1.61 2000/12/02 15:30:36 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c,v 1.62 2000/12/06 15:35:15 eich Exp $ */ /* All drivers should typically include these */ #include "xf86.h" @@ -29,6 +29,10 @@ #include "xf86Pci.h" #include "cir.h" +#include "alp.h" +#include "lg.h" + +#include "vbe.h" /* * Forward definitions for the functions that make up the driver. @@ -40,11 +44,6 @@ static OptionInfoPtr CIRAvailableOptions(int chipid, int busid); static void CIRIdentify(int flags); static Bool CIRProbe(DriverPtr drv, int flags); -extern OptionInfoPtr AlpAvailableOptions(int chipid); -extern OptionInfoPtr LgAvailableOptions(int chipid); -extern ScrnInfoPtr AlpProbe(int entity); -extern ScrnInfoPtr LgProbe(int entity); - static Bool lg_loaded = FALSE; static Bool alp_loaded = FALSE; @@ -393,3 +392,14 @@ CirUnmapMem(CirPtr pCir, int scrnIndex) pCir->FbBase = NULL; return TRUE; } + +void +cirProbeDDC(ScrnInfoPtr pScrn, int index) +{ + vbeInfoPtr pVbe; + + if (xf86LoadSubModule(pScrn, "vbe")) { + pVbe = VBEInit(NULL,index); + ConfiguredMonitor = vbeDoEDID(pVbe, NULL); + } +} |