diff options
| author | Adam Jackson <ajax@redhat.com> | 2012-10-18 14:24:19 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2013-09-10 13:28:24 -0400 |
| commit | dff81687f5eac3eac9b49f58d4654cc30add2547 (patch) | |
| tree | 344b14be1cd0e32402accaa41450dc3941c7b932 | |
| parent | bb82191bcfa8042f8d98ec8b1c6616dc31d2c5c8 (diff) | |
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>
| -rw-r--r-- | hw/xfree86/vbe/vbe.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c index f0344af9c..39f0cefb6 100644 --- a/hw/xfree86/vbe/vbe.c +++ b/hw/xfree86/vbe/vbe.c @@ -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) \ |