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

* complete encoder detection

Browse Source 
* need to break out connector and encoder addition into seperate functions as
  the linux kernel did... that function is getting pretty large and deep.
* my card seems to map everything as TV DAC or TMDS... weird.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42684 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexander von Gluck IV 2011-08-24 14:49:31 +00:00
parent 2c062f84e5
commit b81f42ecbc
2 changed files with 81 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/add-ons/accelerants/radeon_hd/accelerant.h
View File

@ -144,6 +144,8 @@ typedef struct {
uint16 devices; uint16 devices;
uint32 connector_type; uint32 connector_type;
uint16 connector_object_id; uint16 connector_object_id;
uint32 encoder_type;
uint16 encoder_object_id;
// TODO struct radeon_i2c_bus_rec ddc_bus; // TODO struct radeon_i2c_bus_rec ddc_bus;
// TODO struct radeon_hpd hpd; // TODO struct radeon_hpd hpd;
} connector_info; } connector_info;

93
src/add-ons/accelerants/radeon_hd/display.cpp
View File

@ -418,14 +418,14 @@ detect_connectors()
continue; continue;
} }
// TODO : to find encoder for connector uint32 encoder_type = VIDEO_ENCODER_NONE;
#if 0 uint16 encoder_object_id = 0;
int32 j; int32 j;
for (j = 0; j < ((B_LENDIAN_TO_HOST_INT16(path->usSize) - 8) / 2); for (j = 0; j < ((B_LENDIAN_TO_HOST_INT16(path->usSize) - 8) / 2);
j++) { j++) {
//uint8 grph_obj_id uint16 grph_obj_id
// = (B_LENDIAN_TO_HOST_INT16(path->usGraphicObjIds[j]) & = (B_LENDIAN_TO_HOST_INT16(path->usGraphicObjIds[j])
// OBJECT_ID_MASK) >> OBJECT_ID_SHIFT; & OBJECT_ID_MASK) >> OBJECT_ID_SHIFT;
//uint8 grph_obj_num //uint8 grph_obj_num
// = (B_LENDIAN_TO_HOST_INT16(path->usGraphicObjIds[j]) & // = (B_LENDIAN_TO_HOST_INT16(path->usGraphicObjIds[j]) &
// ENUM_ID_MASK) >> ENUM_ID_SHIFT; // ENUM_ID_MASK) >> ENUM_ID_SHIFT;
@ -463,21 +463,81 @@ detect_connectors()
record = (ATOM_COMMON_RECORD_HEADER *) record = (ATOM_COMMON_RECORD_HEADER *)
((char *)record + record->ucRecordSize); ((char *)record + record->ucRecordSize);
} }
TRACE("%s: add encoder\n", __func__); uint32 encoder_id = (encoder_obj & OBJECT_ID_MASK)
// TODO : add the encoder - Finally! >> OBJECT_ID_SHIFT;
//radeon_add_atom_encoder(dev, uint32 encoder_support
// encoder_obj, = B_LENDIAN_TO_HOST_INT16(path->usDeviceTag);
// le16_to_cpu
// (path-> switch(encoder_id) {
// usDeviceTag), case ENCODER_OBJECT_ID_INTERNAL_LVDS:
// caps); case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
case ENCODER_OBJECT_ID_INTERNAL_LVTM1:
if (encoder_support
& ATOM_DEVICE_LCD_SUPPORT) {
encoder_type = VIDEO_ENCODER_LVDS;
// radeon_atombios_get_lvds_info
} else {
encoder_type = VIDEO_ENCODER_TMDS;
// radeon_atombios_set_dig_info
}
// drm_encoder_helper_add
break;
case ENCODER_OBJECT_ID_INTERNAL_DAC1:
encoder_type = VIDEO_ENCODER_DAC;
break;
case ENCODER_OBJECT_ID_INTERNAL_DAC2:
case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1:
case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2:
encoder_type = VIDEO_ENCODER_TVDAC;
// drm_encoder_helper_add
break;
case ENCODER_OBJECT_ID_INTERNAL_DVO1:
case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1:
case ENCODER_OBJECT_ID_INTERNAL_DDI:
case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
if (encoder_support
& ATOM_DEVICE_LCD_SUPPORT) {
encoder_type = VIDEO_ENCODER_LVDS;
} else if (encoder_support
& ATOM_DEVICE_CRT_SUPPORT) {
encoder_type = VIDEO_ENCODER_DAC;
} else {
encoder_type = VIDEO_ENCODER_TMDS;
}
// drm_encoder_helper_add
break;
case ENCODER_OBJECT_ID_SI170B:
case ENCODER_OBJECT_ID_CH7303:
case ENCODER_OBJECT_ID_EXTERNAL_SDVOA:
case ENCODER_OBJECT_ID_EXTERNAL_SDVOB:
case ENCODER_OBJECT_ID_TITFP513:
case ENCODER_OBJECT_ID_VT1623:
case ENCODER_OBJECT_ID_HDMI_SI1930:
case ENCODER_OBJECT_ID_TRAVIS:
case ENCODER_OBJECT_ID_NUTMEG:
if (encoder_support
& ATOM_DEVICE_LCD_SUPPORT) {
encoder_type = VIDEO_ENCODER_LVDS;
} else if (encoder_support
& ATOM_DEVICE_CRT_SUPPORT) {
encoder_type = VIDEO_ENCODER_DAC;
} else {
encoder_type = VIDEO_ENCODER_TMDS;
}
// drm_encoder_helper_add
break;
}
encoder_object_id = grph_obj_id;
} }
} }
} else if (grph_obj_type == GRAPH_OBJECT_TYPE_ROUTER) { } else if (grph_obj_type == GRAPH_OBJECT_TYPE_ROUTER) {
ERROR("%s: TODO : Router object?\n", __func__); ERROR("%s: TODO : Router object?\n", __func__);
} }
} }
#endif
// TODO : look up gpio for ddc, hpd // TODO : look up gpio for ddc, hpd
@ -486,10 +546,15 @@ detect_connectors()
TRACE("%s: Path #%" B_PRId32 ": Found %s (0x%" B_PRIX32 ")\n", TRACE("%s: Path #%" B_PRId32 ": Found %s (0x%" B_PRIX32 ")\n",
__func__, i, decode_connector_name(connector_type), __func__, i, decode_connector_name(connector_type),
connector_type); connector_type);
TRACE("%s: Path #%" B_PRId32 ": Found encoder %s\n", __func__,
i, decode_encoder_name(encoder_type));
gConnector[connector_index]->valid = true; gConnector[connector_index]->valid = true;
gConnector[connector_index]->connector_type = connector_type; gConnector[connector_index]->connector_type = connector_type;
gConnector[connector_index]->connector_object_id gConnector[connector_index]->connector_object_id
= connector_object_id; = connector_object_id;
gConnector[connector_index]->encoder_type = encoder_type;
gConnector[connector_index]->encoder_object_id = encoder_object_id;
connector_index++; connector_index++;
// radeon_add_atom_connector(dev, // radeon_add_atom_connector(dev,