Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intel_extreme: on gen12 PIPE_DDI_FUNC_CTL_EDP seems unreliable

Browse Source 
this is only useful when connecting an external screen, and the laptop actually uses it on boot.
should help with #17706

Change-Id: Ia3434f76cf6210b743f17d5559d031c089cbcd85
Reviewed-on: https://review.haiku-os.org/c/haiku/+/5518
Tested-by: Commit checker robot <no-reply+buildbot@haiku-os.org>
Reviewed-by: Jérôme Duval <jerome.duval@gmail.com>
This commit is contained in:
Jérôme Duval 2022-08-01 16:24:07 +02:00
parent e7893cc94f
commit 652a775f28
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/add-ons/accelerants/intel_extreme/Ports.cpp
View File

@ -759,7 +759,7 @@ Port::_DpAuxTransfer(uint8* transmitBuffer, uint8 transmitSize,
for (int i = 0; i < 5; i++)
channelData[i] = PCH_DP_AUX_CH_DATA(channel, i);
} else {
ERROR("DigitalDisplayInterface::_DpAuxTransfer() unknown register config\n");
ERROR("Port::_DpAuxTransfer() unknown register config\n");
return B_BUSY;
}
if (transmitSize > 20 || receiveSize > 20)
@ -2296,14 +2296,18 @@ DigitalDisplayInterface::IsConnected()
uint32 pipeState = 0;
if ((gInfo->shared_info->device_type.IsMobile() || _IsEDPPort())
&& (PortIndex() == INTEL_PORT_A)) {
pipeState = read32(PIPE_DDI_FUNC_CTL_EDP);
TRACE("%s: PIPE_DDI_FUNC_CTL_EDP: 0x%" B_PRIx32 "\n", __func__, pipeState);
if (!(pipeState & PIPE_DDI_FUNC_CTL_ENABLE)) {
TRACE("%s: Laptop, but eDP port down\n", __func__);
return false;
if (gInfo->shared_info->device_type.Generation() < 12) {
// TODO: the pipe state isn't reliable after gen11
pipeState = read32(PIPE_DDI_FUNC_CTL_EDP);
TRACE("%s: PIPE_DDI_FUNC_CTL_EDP: 0x%" B_PRIx32 "\n", __func__, pipeState);
if (!(pipeState & PIPE_DDI_FUNC_CTL_ENABLE)) {
TRACE("%s: Laptop, but eDP port down\n", __func__);
return false;
}
}
if (gInfo->shared_info->has_vesa_edid_info) {
if (edidDetected)
return true;
else if (gInfo->shared_info->has_vesa_edid_info) {
TRACE("%s: Laptop. Using VESA edid info\n", __func__);
memcpy(&fEDIDInfo, &gInfo->shared_info->vesa_edid_info, sizeof(edid1_info));
if (fEDIDState != B_OK) {