[haiku-commits] r42684 - haiku/trunk/src/add-ons/accelerants/radeon_hd
- From: kallisti5@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 24 Aug 2011 16:49:32 +0200 (CEST)
Author: kallisti5
Date: 2011-08-24 16:49:31 +0200 (Wed, 24 Aug 2011)
New Revision: 42684
Changeset: https://dev.haiku-os.org/changeset/42684
Modified:
haiku/trunk/src/add-ons/accelerants/radeon_hd/accelerant.h
haiku/trunk/src/add-ons/accelerants/radeon_hd/display.cpp
Log:
* complete encoder detection
* 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.
Modified: haiku/trunk/src/add-ons/accelerants/radeon_hd/accelerant.h
===================================================================
--- haiku/trunk/src/add-ons/accelerants/radeon_hd/accelerant.h 2011-08-24
04:28:46 UTC (rev 42683)
+++ haiku/trunk/src/add-ons/accelerants/radeon_hd/accelerant.h 2011-08-24
14:49:31 UTC (rev 42684)
@@ -144,6 +144,8 @@
uint16 devices;
uint32 connector_type;
uint16 connector_object_id;
+ uint32 encoder_type;
+ uint16 encoder_object_id;
// TODO struct radeon_i2c_bus_rec ddc_bus;
// TODO struct radeon_hpd hpd;
} connector_info;
Modified: haiku/trunk/src/add-ons/accelerants/radeon_hd/display.cpp
===================================================================
--- haiku/trunk/src/add-ons/accelerants/radeon_hd/display.cpp 2011-08-24
04:28:46 UTC (rev 42683)
+++ haiku/trunk/src/add-ons/accelerants/radeon_hd/display.cpp 2011-08-24
14:49:31 UTC (rev 42684)
@@ -418,14 +418,14 @@
continue;
}
- // TODO : to find encoder for connector
- #if 0
+ uint32 encoder_type = VIDEO_ENCODER_NONE;
+ uint16 encoder_object_id = 0;
int32 j;
for (j = 0; j < ((B_LENDIAN_TO_HOST_INT16(path->usSize)
- 8) / 2);
j++) {
- //uint8 grph_obj_id
- // =
(B_LENDIAN_TO_HOST_INT16(path->usGraphicObjIds[j]) &
- // OBJECT_ID_MASK) >> OBJECT_ID_SHIFT;
+ uint16 grph_obj_id
+ =
(B_LENDIAN_TO_HOST_INT16(path->usGraphicObjIds[j])
+ & OBJECT_ID_MASK) >> OBJECT_ID_SHIFT;
//uint8 grph_obj_num
// =
(B_LENDIAN_TO_HOST_INT16(path->usGraphicObjIds[j]) &
// ENUM_ID_MASK) >> ENUM_ID_SHIFT;
@@ -463,21 +463,81 @@
record =
(ATOM_COMMON_RECORD_HEADER *)
((char
*)record + record->ucRecordSize);
}
- TRACE("%s: add
encoder\n", __func__);
- // TODO : add the
encoder - Finally!
-
//radeon_add_atom_encoder(dev,
- // encoder_obj,
- // le16_to_cpu
- // (path->
- // usDeviceTag),
- // caps);
+ uint32 encoder_id =
(encoder_obj & OBJECT_ID_MASK)
+ >>
OBJECT_ID_SHIFT;
+ uint32 encoder_support
+ =
B_LENDIAN_TO_HOST_INT16(path->usDeviceTag);
+
+ switch(encoder_id) {
+ case
ENCODER_OBJECT_ID_INTERNAL_LVDS:
+ 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) {
ERROR("%s: TODO : Router object?\n",
__func__);
}
}
- #endif
// TODO : look up gpio for ddc, hpd
@@ -486,10 +546,15 @@
TRACE("%s: Path #%" B_PRId32 ": Found %s (0x%" B_PRIX32
")\n",
__func__, i,
decode_connector_name(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]->connector_type =
connector_type;
gConnector[connector_index]->connector_object_id
= connector_object_id;
+ gConnector[connector_index]->encoder_type =
encoder_type;
+ gConnector[connector_index]->encoder_object_id =
encoder_object_id;
connector_index++;
// radeon_add_atom_connector(dev,
Other related posts:
- » [haiku-commits] r42684 - haiku/trunk/src/add-ons/accelerants/radeon_hd - kallisti5
