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

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:
Adam Jackson 2012-10-18 14:24:19 -04:00
parent bb82191bcf
commit dff81687f5
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/xfree86/vbe/vbe.c
View File

@ -319,10 +319,8 @@ vbeReadEDID(vbeInfoPtr pVbe)
} }
xf86MonPtr xf86MonPtr
vbeDoEDID(vbeInfoPtr pVbe, pointer pDDCModule) vbeDoEDID(vbeInfoPtr pVbe, pointer unused)
{ {
xf86MonPtr pMonitor;
pointer pModule;
unsigned char *DDC_data = NULL; unsigned char *DDC_data = NULL;
if (!pVbe) if (!pVbe)
@ -330,23 +328,12 @@ vbeDoEDID(vbeInfoPtr pVbe, pointer pDDCModule)
if (pVbe->version < 0x200) if (pVbe->version < 0x200)
return NULL; return NULL;
if (!(pModule = pDDCModule)) {
pModule =
xf86LoadSubModule(pVbe->pInt10->pScrn, "ddc");
if (!pModule)
return NULL;
}
DDC_data = vbeReadEDID(pVbe); DDC_data = vbeReadEDID(pVbe);
if (!DDC_data) if (!DDC_data)
return NULL; return NULL;
pMonitor = xf86InterpretEDID(pVbe->pInt10->pScrn->scrnIndex, DDC_data); return xf86InterpretEDID(pVbe->pInt10->pScrn->scrnIndex, DDC_data);
if (!pDDCModule)
xf86UnloadSubModule(pModule);
return pMonitor;
} }
#define GET_UNALIGNED2(x) \ #define GET_UNALIGNED2(x) \