vbe: Don't try to load the ddc submodule
DDC is built into the server now. Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
parent
bb82191bcf
commit
dff81687f5
|
@ -319,10 +319,8 @@ vbeReadEDID(vbeInfoPtr pVbe)
|
|||
}
|
||||
|
||||
xf86MonPtr
|
||||
vbeDoEDID(vbeInfoPtr pVbe, pointer pDDCModule)
|
||||
vbeDoEDID(vbeInfoPtr pVbe, pointer unused)
|
||||
{
|
||||
xf86MonPtr pMonitor;
|
||||
pointer pModule;
|
||||
unsigned char *DDC_data = NULL;
|
||||
|
||||
if (!pVbe)
|
||||
|
@ -330,23 +328,12 @@ vbeDoEDID(vbeInfoPtr pVbe, pointer pDDCModule)
|
|||
if (pVbe->version < 0x200)
|
||||
return NULL;
|
||||
|
||||
if (!(pModule = pDDCModule)) {
|
||||
pModule =
|
||||
xf86LoadSubModule(pVbe->pInt10->pScrn, "ddc");
|
||||
if (!pModule)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
DDC_data = vbeReadEDID(pVbe);
|
||||
|
||||
if (!DDC_data)
|
||||
return NULL;
|
||||
|
||||
pMonitor = xf86InterpretEDID(pVbe->pInt10->pScrn->scrnIndex, DDC_data);
|
||||
|
||||
if (!pDDCModule)
|
||||
xf86UnloadSubModule(pModule);
|
||||
return pMonitor;
|
||||
return xf86InterpretEDID(pVbe->pInt10->pScrn->scrnIndex, DDC_data);
|
||||
}
|
||||
|
||||
#define GET_UNALIGNED2(x) \
|
||||
|
|
Loading…
Reference in New Issue
Block a user