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

intel_extreme: Break port probe logic into own function for later HPD

Browse Source
This commit is contained in:
Alexander von Gluck IV
2015-10-28 14:58:33 -05:00
parent 163e66f763
commit f142870c84
1 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/intel_extreme/accelerant.cpp
+40 -23
View File
@@ -221,29 +221,9 @@ has_connected_port(port_index portIndex, uint32 type)
}
// #pragma mark - public accelerant functions
/*! Init primary accelerant */
status_t
intel_init_accelerant(int device)
static status_t
probe_ports()
{
CALLED();
status_t status = init_common(device, false);
if (status != B_OK)
return status;
intel_shared_info &info = *gInfo->shared_info;
init_lock(&info.accelerant_lock, "intel extreme accelerant");
init_lock(&info.engine_lock, "intel extreme engine");
setup_ring_buffer(info.primary_ring_buffer, "intel primary ring buffer");
TRACE("pipe control for: 0x%" B_PRIx32 " 0x%" B_PRIx32 "\n",
read32(INTEL_PIPE_CONTROL), read32(INTEL_PIPE_CONTROL));
// Try to determine what ports to use. We use the following heuristic:
// * Check for DisplayPort, these can be more or less detected reliably.
// * Check for HDMI, it'll fail on devices not having HDMI for us to fall
@@ -325,11 +305,48 @@ intel_init_accelerant(int device)
} else
delete analogPort;
gInfo->head_mode |= HEAD_MODE_TESTING;
if (gInfo->port_count == 0)
return B_ERROR;
return B_OK;
}
// #pragma mark - public accelerant functions
/*! Init primary accelerant */
status_t
intel_init_accelerant(int device)
{
CALLED();
status_t status = init_common(device, false);
if (status != B_OK)
return status;
intel_shared_info &info = *gInfo->shared_info;
init_lock(&info.accelerant_lock, "intel extreme accelerant");
init_lock(&info.engine_lock, "intel extreme engine");
setup_ring_buffer(info.primary_ring_buffer, "intel primary ring buffer");
TRACE("pipe control for: 0x%" B_PRIx32 " 0x%" B_PRIx32 "\n",
read32(INTEL_PIPE_CONTROL), read32(INTEL_PIPE_CONTROL));
// Probe all ports
status = probe_ports();
// On TRACE, dump ports and states
dump_ports();
if (status != B_OK) {
ERROR("Error: zero active displays were found!\n");
uninit_common();
return status;
}
status = create_mode_list();
if (status != B_OK) {
uninit_common();