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

radeon_hd: Make crtc lookup fault less catastrophic

Browse Source
This commit is contained in:
Alexander von Gluck IV
2012-04-18 21:50:39 +00:00
parent e47f861975
commit c363019152
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/radeon_hd/display.cpp
+7 -6
View File
@@ -388,7 +388,7 @@ display_get_encoder_mode(uint32 connectorIndex)
return ATOM_ENCODER_MODE_DVO; return ATOM_ENCODER_MODE_DVO;
} }
// Find crtc for connector // Find crtc for connector so we can identify source of edid data
int32 crtc = -1; int32 crtc = -1;
for (int32 id = 0; id < MAX_DISPLAY; id++) { for (int32 id = 0; id < MAX_DISPLAY; id++) {
if (gDisplay[id]->connectorIndex == connectorIndex) { if (gDisplay[id]->connectorIndex == connectorIndex) {
@@ -396,12 +396,13 @@ display_get_encoder_mode(uint32 connectorIndex)
break; break;
} }
} }
bool edidDigital = false;
if (crtc == -1) { if (crtc == -1) {
ERROR("%s: BUG: ran on connector without crtc!\n", __func__); ERROR("%s: BUG: executed on connector without crtc!\n", __func__);
return ATOM_ENCODER_MODE_CRT; } else {
}
edid1_info* edid = &gDisplay[crtc]->edid_info; edid1_info* edid = &gDisplay[crtc]->edid_info;
edidDigital = edid->display.input_type ? true : false;
}
// Normal encoder situations // Normal encoder situations
switch (gConnector[connectorIndex]->type) { switch (gConnector[connectorIndex]->type) {
@@ -409,7 +410,7 @@ display_get_encoder_mode(uint32 connectorIndex)
case VIDEO_CONNECTOR_HDMIB: /* HDMI-B is DL-DVI; analog works fine */ case VIDEO_CONNECTOR_HDMIB: /* HDMI-B is DL-DVI; analog works fine */
// TODO: if audio detected on edid and DCE4, ATOM_ENCODER_MODE_DVI // TODO: if audio detected on edid and DCE4, ATOM_ENCODER_MODE_DVI
// if audio detected on edid not DCE4, ATOM_ENCODER_MODE_HDMI // if audio detected on edid not DCE4, ATOM_ENCODER_MODE_HDMI
if (edid->display.input_type) // is digital? if (edidDigital)
return ATOM_ENCODER_MODE_DVI; return ATOM_ENCODER_MODE_DVI;
else else
return ATOM_ENCODER_MODE_CRT; return ATOM_ENCODER_MODE_CRT;