diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2015-08-23 17:39:53 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2015-08-23 17:39:53 +0000 |
| commit | c7e038a2a9eaca712b7146527cea533bb6c2f6b4 (patch) | |
| tree | 995986015e4f8e70ae62ed8d61befb72af6df080 | |
| parent | 6b63e59785080d2fa46e7628f9909f71e3f9d151 (diff) | |
Merge from upstreams: Prepare for xserver 1.17
| -rw-r--r-- | driver/xf86-video-chips/src/ct_driver.c | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/driver/xf86-video-chips/src/ct_driver.c b/driver/xf86-video-chips/src/ct_driver.c index effbc6059..c59d9613f 100644 --- a/driver/xf86-video-chips/src/ct_driver.c +++ b/driver/xf86-video-chips/src/ct_driver.c @@ -2098,13 +2098,7 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags) pScrn->progClock = TRUE; cPtr->ClockType = HiQV_STYLE | TYPE_PROGRAMMABLE; - if (cPtr->pEnt->device->textClockFreq > 0) { - SaveClk->Clock = cPtr->pEnt->device->textClockFreq; - xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, - "Using textclock freq: %7.3f.\n", - SaveClk->Clock/1000.0); - } else - SaveClk->Clock = 0; + SaveClk->Clock = 0; xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Using programmable clocks\n"); @@ -2807,13 +2801,7 @@ chipsPreInitWingine(ScrnInfoPtr pScrn, int flags) if (cPtr->ClockType & TYPE_PROGRAMMABLE) { pScrn->numClocks = NoClocks; - if(cPtr->pEnt->device->textClockFreq > 0) { - SaveClk->Clock = cPtr->pEnt->device->textClockFreq; - xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, - "Using textclock freq: %7.3f.\n", - SaveClk->Clock/1000.0); - } else - SaveClk->Clock = CRT_TEXT_CLK_FREQ; + SaveClk->Clock = CRT_TEXT_CLK_FREQ; xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Using programmable clocks\n"); } else { /* TYPE_PROGRAMMABLE */ SaveClk->Clock = chipsGetHWClock(pScrn); @@ -3500,14 +3488,8 @@ chipsPreInit655xx(ScrnInfoPtr pScrn, int flags) if (cPtr->ClockType & TYPE_PROGRAMMABLE) { pScrn->numClocks = NoClocks; - if (cPtr->pEnt->device->textClockFreq > 0) { - SaveClk->Clock = cPtr->pEnt->device->textClockFreq; - xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, - "Using textclock freq: %7.3f.\n", - SaveClk->Clock/1000.0); - } else - SaveClk->Clock = ((cPtr->PanelType & ChipsLCDProbed) ? - LCD_TEXT_CLK_FREQ : CRT_TEXT_CLK_FREQ); + SaveClk->Clock = ((cPtr->PanelType & ChipsLCDProbed) ? + LCD_TEXT_CLK_FREQ : CRT_TEXT_CLK_FREQ); xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Using programmable clocks\n"); } else { /* TYPE_PROGRAMMABLE */ SaveClk->Clock = chipsGetHWClock(pScrn); |