diff options
| author | Adam Jackson <ajax@redhat.com> | 2014-10-17 09:49:26 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2014-10-17 09:49:26 -0400 |
| commit | 9187d76bd4f8d500fc3403b6d4a7bef55508bf2b (patch) | |
| tree | 67b71ca2e4a584d12e38b10c35c7eb9dc387d418 | |
| parent | bb03c06322f875e905dec956e06a99b9674e57aa (diff) | |
Update for xserver 1.17
Signed-off-by: Adam Jackson <ajax@redhat.com>
| -rw-r--r-- | src/ct_driver.c | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/src/ct_driver.c b/src/ct_driver.c index effbc60..378a23c 100644 --- a/src/ct_driver.c +++ b/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); |