* fix header function define

* while doing our last-resort fallback, skip
  TV DAC encoders as it is likely that is not
  what the user wants. This may need to change
  as the driver matures. (ex: only a tv is
  connected, no edid)


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42760 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexander von Gluck IV 2011-09-20 12:47:47 +00:00
parent 42ea87d59b
commit 6fca1a84fc
2 changed files with 12 additions and 6 deletions

View File

@ -648,11 +648,17 @@ detect_displays()
if (displayIndex == 0) {
ERROR("%s: ERROR: 0 attached monitors were found on display connectors."
" Injecting first connector as a last resort.\n", __func__);
gDisplay[displayIndex]->active = true;
gDisplay[displayIndex]->connector_index = 0;
init_registers(gDisplay[displayIndex]->regs, displayIndex);
if (detect_crt_ranges(displayIndex) == B_OK)
gDisplay[displayIndex]->found_ranges = true;
for (uint32 id = 0; id < ATOM_MAX_SUPPORTED_DEVICE; id++) {
// skip TV DAC connectors as likely fallback isn't for TV
if (gConnector[id]->encoder_type == VIDEO_ENCODER_TVDAC)
continue;
gDisplay[0]->active = true;
gDisplay[0]->connector_index = id;
init_registers(gDisplay[0]->regs, 0);
if (detect_crt_ranges(0) == B_OK)
gDisplay[0]->found_ranges = true;
break;
}
}

View File

@ -169,7 +169,7 @@ uint32 radeon_gpu_mc_idlecheck();
status_t radeon_gpu_mc_setup();
status_t radeon_gpu_irq_setup();
bool radeon_gpu_read_edid(uint32 connector, edid1_info *edid);
status_t radeon_gpu_i2c_setup(uint32 id, uint8 gpio_id);
status_t radeon_gpu_i2c_setup(uint32 id, uint8 gpio_pin);
#endif