i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel_extreme: Enable FDI PLL's before FDI training

Browse Source
This commit is contained in:
Alexander von Gluck IV
2015-11-20 10:12:30 -06:00
parent e6fefa6cbf
commit 874b248894
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/intel_extreme/FlexibleDisplayInterface.cpp
+22 -14
View File
@@ -247,12 +247,23 @@ FDILink::Train(display_mode* target)
TRACE("%s: FDI Link Lanes: %" B_PRIu32 "\n", __func__, lanes); TRACE("%s: FDI Link Lanes: %" B_PRIu32 "\n", __func__, lanes);
// Over IVB supports AutoTraining of FDI // Enable FDI clocks
if (gInfo->shared_info->device_type.Generation() >= 7) Receiver().EnablePLL();
return _AutoTrain(lanes); Receiver().SwitchClock(true);
Transmitter().EnablePLL();
//return _ManualTrain(lanes); status_t result = B_ERROR;
return B_ERROR;
// Over IVB supports AutoTraining of FDI
if (gInfo->shared_info->device_type.Generation() >= 7) {
result = _AutoTrain(lanes);
if (result != B_OK) {
ERROR("%s: FDI auto-training fault. Attempting manual train.\n",
__func__);
return _ManualTrain(lanes);
}
}
return _ManualTrain(lanes);
} }
@@ -261,14 +272,8 @@ FDILink::_ManualTrain(uint32 lanes)
{ {
CALLED(); CALLED();
// This all needs review // This needs completed
ERROR("TODO: Manual FDI Link Training\n");
// Enable FDI clocks
Receiver().EnablePLL();
Receiver().SwitchClock(true);
Transmitter().EnablePLL();
ERROR("TODO: Generation 5 FDI Link Training\n");
// Enable pipes // Enable pipes
Transmitter().Enable(); Transmitter().Enable();
@@ -285,8 +290,11 @@ FDILink::_AutoTrain(uint32 lanes)
uint32 rxControl = Receiver().Base() + PCH_FDI_RX_CONTROL; uint32 rxControl = Receiver().Base() + PCH_FDI_RX_CONTROL;
uint32 buffer = read32(txControl); uint32 buffer = read32(txControl);
// Clear port width selection and set number of lanes
buffer &= ~(7 << 19); buffer &= ~(7 << 19);
buffer |= (lanes - 1) << 19; buffer |= (lanes - 1) << 19;
if (gInfo->shared_info->device_type.InGroup(INTEL_GROUP_IVB)) if (gInfo->shared_info->device_type.InGroup(INTEL_GROUP_IVB))
buffer &= ~FDI_LINK_TRAIN_NONE_IVB; buffer &= ~FDI_LINK_TRAIN_NONE_IVB;
else else
@@ -335,7 +343,7 @@ FDILink::_AutoTrain(uint32 lanes)
return B_ERROR; return B_ERROR;
} }
// Enable ecc // Enable ecc on IVB
if (gInfo->shared_info->device_type.InGroup(INTEL_GROUP_IVB)) { if (gInfo->shared_info->device_type.InGroup(INTEL_GROUP_IVB)) {
write32(rxControl, read32(rxControl) write32(rxControl, read32(rxControl)
| FDI_FS_ERRC_ENABLE | FDI_FE_ERRC_ENABLE); | FDI_FS_ERRC_ENABLE | FDI_FE_ERRC_ENABLE);