diff options
| author | Bartosz Kosiorek <gang65@poczta.onet.pl> | 2011-02-20 11:25:17 +0000 |
|---|---|---|
| committer | Bartosz Kosiorek <gang65@poczta.onet.pl> | 2011-02-20 11:25:17 +0000 |
| commit | 1e57b1c07ff86fe4b401c3d41bf93524490f356d (patch) | |
| tree | 67f605949f07f47bef8e69f0be2b284dfa899dee | |
| parent | 481b48f0c0d854993772cc5651444149c01e5532 (diff) | |
Fix #395 - revert ViaPanelGetSizeFromDDC renaming (thanks to julienvdg)
| -rw-r--r-- | src/via_panel.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/via_panel.c b/src/via_panel.c index d9ad742..583e12f 100644 --- a/src/via_panel.c +++ b/src/via_panel.c @@ -307,11 +307,8 @@ ViaPanelPreInit(ScrnInfoPtr pScrn) int width, height; Bool ret; - ret = ViaPanelGetSizeFromDDC(pScrn, &width, &height); -/* - if (!ret) - ret = ViaPanelGetSizeFromDDCv2(pScrn, &width); -*/ + ret = ViaPanelGetSizeFromDDCv1(pScrn, &width, &height); + if (ret) { panel->NativeModeIndex = ViaPanelLookUpModeIndex(width, height); DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaPanelLookUpModeIndex, Width %d, Height %d, NativeModeIndex%d\n", width, height, panel->NativeModeIndex)); @@ -411,7 +408,7 @@ ViaPanelGetSizeFromEDID(ScrnInfoPtr pScrn, xf86MonPtr pMon, } Bool -ViaPanelGetSizeFromDDC(ScrnInfoPtr pScrn, int *width, int *height) +ViaPanelGetSizeFromDDCv1(ScrnInfoPtr pScrn, int *width, int *height) { VIAPtr pVia = VIAPTR(pScrn); xf86MonPtr pMon; |