[haiku-commits] r42670 - in haiku/trunk/src/add-ons/accelerants/radeon_hd: . atombios
- From: kallisti5@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 21 Aug 2011 23:21:37 +0200 (CEST)
Author: kallisti5
Date: 2011-08-21 23:21:36 +0200 (Sun, 21 Aug 2011)
New Revision: 42670
Changeset: https://dev.haiku-os.org/changeset/42670
Added:
haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/ObjectID.h
Modified:
haiku/trunk/src/add-ons/accelerants/radeon_hd/accelerant.cpp
haiku/trunk/src/add-ons/accelerants/radeon_hd/accelerant.h
haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/atom.h
haiku/trunk/src/add-ons/accelerants/radeon_hd/display.cpp
haiku/trunk/src/add-ons/accelerants/radeon_hd/display.h
Log:
* add gConnector for card connector storage
* add detect_connectors to detect card connectors
* add infinitely compex detect_connectors_manual
(used when detect_connectors fails)
* add missing AtomBIOS header
Modified: haiku/trunk/src/add-ons/accelerants/radeon_hd/accelerant.cpp
===================================================================
--- haiku/trunk/src/add-ons/accelerants/radeon_hd/accelerant.cpp
2011-08-21 21:10:24 UTC (rev 42669)
+++ haiku/trunk/src/add-ons/accelerants/radeon_hd/accelerant.cpp
2011-08-21 21:21:36 UTC (rev 42670)
@@ -41,6 +41,7 @@
struct accelerant_info *gInfo;
display_info *gDisplay[MAX_DISPLAY];
+connector_info *gConnector[ATOM_MAX_SUPPORTED_DEVICE];
class AreaCloner {
@@ -110,6 +111,7 @@
gInfo->mc_info = (gpu_mc_info *)malloc(sizeof(gpu_mc_info));
+ // malloc memory for active display information
for (uint32 id = 0; id < MAX_DISPLAY; id++) {
gDisplay[id] = (display_info *)malloc(sizeof(display_info));
if (gDisplay[id] == NULL)
@@ -122,6 +124,16 @@
memset(gDisplay[id]->regs, 0, sizeof(register_info));
}
+ // malloc for possible physical card connectors
+ for (uint32 id = 0; id < ATOM_MAX_SUPPORTED_DEVICE; id++) {
+ gConnector[id] = (connector_info
*)malloc(sizeof(connector_info));
+
+ if (gConnector[id] == NULL)
+ return B_NO_MEMORY;
+ memset(gConnector[id], 0, sizeof(connector_info));
+ }
+
+
gInfo->is_clone = isClone;
gInfo->device = device;
@@ -205,6 +217,12 @@
free(gDisplay[id]);
}
}
+
+ for (uint32 id = 0; id < ATOM_MAX_SUPPORTED_DEVICE; id++) {
+ if (gConnector[id] != NULL) {
+ free(gConnector[id]);
+ }
+ }
}
@@ -228,6 +246,13 @@
radeon_init_bios(gInfo->rom);
+ status = detect_connectors();
+ if (status != B_OK) {
+ // TODO : detect_connectors_manual to get from object table
+ TRACE("%s: couldn't detect supported connectors!\n", __func__);
+ return status;
+ }
+
status = detect_displays();
//if (status != B_OK)
// return status;
Modified: haiku/trunk/src/add-ons/accelerants/radeon_hd/accelerant.h
===================================================================
--- haiku/trunk/src/add-ons/accelerants/radeon_hd/accelerant.h 2011-08-21
21:10:24 UTC (rev 42669)
+++ haiku/trunk/src/add-ons/accelerants/radeon_hd/accelerant.h 2011-08-21
21:21:36 UTC (rev 42670)
@@ -139,6 +139,16 @@
typedef struct {
+ bool valid;
+ uint16 line_mux;
+ uint16 devices;
+ uint32 connector_type;
+ // TODO struct radeon_i2c_bus_rec ddc_bus;
+ // TODO struct radeon_hpd hpd;
+} connector_info;
+
+
+typedef struct {
bool active;
uint32 connection_type;
uint8 connection_id;
@@ -163,6 +173,7 @@
extern accelerant_info *gInfo;
extern atom_context *gAtomContext;
extern display_info *gDisplay[MAX_DISPLAY];
+extern connector_info *gConnector[ATOM_MAX_SUPPORTED_DEVICE];
// register access
Added: haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/ObjectID.h
===================================================================
--- haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/ObjectID.h
(rev 0)
+++ haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/ObjectID.h
2011-08-21 21:21:36 UTC (rev 42670)
@@ -0,0 +1,691 @@
+/*
+* Copyright 2006-2007 Advanced Micro Devices, Inc.
+*
+* Permission is hereby granted, free of charge, to any person obtaining a
+* copy of this software and associated documentation files (the "Software"),
+* to deal in the Software without restriction, including without limitation
+* the rights to use, copy, modify, merge, publish, distribute, sublicense,
+* and/or sell copies of the Software, and to permit persons to whom the
+* Software is furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+* OTHER DEALINGS IN THE SOFTWARE.
+*/
+/* based on stg/asic_reg/drivers/inc/asic_reg/ObjectID.h ver 23 */
+
+#ifndef _OBJECTID_H
+#define _OBJECTID_H
+
+#if defined(_X86_)
+#pragma pack(1)
+#endif
+
+/****************************************************/
+/* Graphics Object Type Definition */
+/****************************************************/
+#define GRAPH_OBJECT_TYPE_NONE 0x0
+#define GRAPH_OBJECT_TYPE_GPU 0x1
+#define GRAPH_OBJECT_TYPE_ENCODER 0x2
+#define GRAPH_OBJECT_TYPE_CONNECTOR 0x3
+#define GRAPH_OBJECT_TYPE_ROUTER 0x4
+/* deleted */
+#define GRAPH_OBJECT_TYPE_DISPLAY_PATH 0x6
+#define GRAPH_OBJECT_TYPE_GENERIC 0x7
+
+/****************************************************/
+/* Encoder Object ID Definition */
+/****************************************************/
+#define ENCODER_OBJECT_ID_NONE 0x00
+
+/* Radeon Class Display Hardware */
+#define ENCODER_OBJECT_ID_INTERNAL_LVDS 0x01
+#define ENCODER_OBJECT_ID_INTERNAL_TMDS1 0x02
+#define ENCODER_OBJECT_ID_INTERNAL_TMDS2 0x03
+#define ENCODER_OBJECT_ID_INTERNAL_DAC1 0x04
+#define ENCODER_OBJECT_ID_INTERNAL_DAC2 0x05 /* TV/CV DAC */
+#define ENCODER_OBJECT_ID_INTERNAL_SDVOA 0x06
+#define ENCODER_OBJECT_ID_INTERNAL_SDVOB 0x07
+
+/* External Third Party Encoders */
+#define ENCODER_OBJECT_ID_SI170B 0x08
+#define ENCODER_OBJECT_ID_CH7303 0x09
+#define ENCODER_OBJECT_ID_CH7301 0x0A
+#define ENCODER_OBJECT_ID_INTERNAL_DVO1 0x0B /* This belongs to
Radeon Class Display Hardware */
+#define ENCODER_OBJECT_ID_EXTERNAL_SDVOA 0x0C
+#define ENCODER_OBJECT_ID_EXTERNAL_SDVOB 0x0D
+#define ENCODER_OBJECT_ID_TITFP513 0x0E
+#define ENCODER_OBJECT_ID_INTERNAL_LVTM1 0x0F /* not used for
Radeon */
+#define ENCODER_OBJECT_ID_VT1623 0x10
+#define ENCODER_OBJECT_ID_HDMI_SI1930 0x11
+#define ENCODER_OBJECT_ID_HDMI_INTERNAL 0x12
+#define ENCODER_OBJECT_ID_ALMOND 0x22
+#define ENCODER_OBJECT_ID_TRAVIS 0x23
+#define ENCODER_OBJECT_ID_NUTMEG 0x22
+/* Kaleidoscope (KLDSCP) Class Display Hardware (internal) */
+#define ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1 0x13
+#define ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1 0x14
+#define ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1 0x15
+#define ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2 0x16 /* Shared with CV/TV
and CRT */
+#define ENCODER_OBJECT_ID_SI178 0X17 /* External TMDS (dual
link, no HDCP.) */
+#define ENCODER_OBJECT_ID_MVPU_FPGA 0x18 /* MVPU FPGA chip */
+#define ENCODER_OBJECT_ID_INTERNAL_DDI 0x19
+#define ENCODER_OBJECT_ID_VT1625 0x1A
+#define ENCODER_OBJECT_ID_HDMI_SI1932 0x1B
+#define ENCODER_OBJECT_ID_DP_AN9801 0x1C
+#define ENCODER_OBJECT_ID_DP_DP501 0x1D
+#define ENCODER_OBJECT_ID_INTERNAL_UNIPHY 0x1E
+#define ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA 0x1F
+#define ENCODER_OBJECT_ID_INTERNAL_UNIPHY1 0x20
+#define ENCODER_OBJECT_ID_INTERNAL_UNIPHY2 0x21
+
+#define ENCODER_OBJECT_ID_GENERAL_EXTERNAL_DVO 0xFF
+
+/****************************************************/
+/* Connector Object ID Definition */
+/****************************************************/
+#define CONNECTOR_OBJECT_ID_NONE 0x00
+#define CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_I 0x01
+#define CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_I 0x02
+#define CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_D 0x03
+#define CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D 0x04
+#define CONNECTOR_OBJECT_ID_VGA 0x05
+#define CONNECTOR_OBJECT_ID_COMPOSITE 0x06
+#define CONNECTOR_OBJECT_ID_SVIDEO 0x07
+#define CONNECTOR_OBJECT_ID_YPbPr 0x08
+#define CONNECTOR_OBJECT_ID_D_CONNECTOR 0x09
+#define CONNECTOR_OBJECT_ID_9PIN_DIN 0x0A /* Supports both CV &
TV */
+#define CONNECTOR_OBJECT_ID_SCART 0x0B
+#define CONNECTOR_OBJECT_ID_HDMI_TYPE_A 0x0C
+#define CONNECTOR_OBJECT_ID_HDMI_TYPE_B 0x0D
+#define CONNECTOR_OBJECT_ID_LVDS 0x0E
+#define CONNECTOR_OBJECT_ID_7PIN_DIN 0x0F
+#define CONNECTOR_OBJECT_ID_PCIE_CONNECTOR 0x10
+#define CONNECTOR_OBJECT_ID_CROSSFIRE 0x11
+#define CONNECTOR_OBJECT_ID_HARDCODE_DVI 0x12
+#define CONNECTOR_OBJECT_ID_DISPLAYPORT 0x13
+#define CONNECTOR_OBJECT_ID_eDP 0x14
+#define CONNECTOR_OBJECT_ID_MXM 0x15
+#define CONNECTOR_OBJECT_ID_LVDS_eDP 0x16
+
+/* deleted */
+
+/****************************************************/
+/* Router Object ID Definition */
+/****************************************************/
+#define ROUTER_OBJECT_ID_NONE
0x00
+#define ROUTER_OBJECT_ID_I2C_EXTENDER_CNTL 0x01
+
+/****************************************************/
+/* Generic Object ID Definition */
+/****************************************************/
+#define GENERIC_OBJECT_ID_NONE 0x00
+#define GENERIC_OBJECT_ID_GLSYNC 0x01
+#define GENERIC_OBJECT_ID_PX2_NON_DRIVABLE 0x02
+#define GENERIC_OBJECT_ID_MXM_OPM 0x03
+#define GENERIC_OBJECT_ID_STEREO_PIN 0x04 //This object
could show up from Misc Object table, it follows ATOM_OBJECT format, and
contains one ATOM_OBJECT_GPIO_CNTL_RECORD for the stereo pin
+
+/****************************************************/
+/* Graphics Object ENUM ID Definition */
+/****************************************************/
+#define GRAPH_OBJECT_ENUM_ID1 0x01
+#define GRAPH_OBJECT_ENUM_ID2 0x02
+#define GRAPH_OBJECT_ENUM_ID3 0x03
+#define GRAPH_OBJECT_ENUM_ID4 0x04
+#define GRAPH_OBJECT_ENUM_ID5 0x05
+#define GRAPH_OBJECT_ENUM_ID6 0x06
+#define GRAPH_OBJECT_ENUM_ID7 0x07
+
+/****************************************************/
+/* Graphics Object ID Bit definition */
+/****************************************************/
+#define OBJECT_ID_MASK 0x00FF
+#define ENUM_ID_MASK 0x0700
+#define RESERVED1_ID_MASK 0x0800
+#define OBJECT_TYPE_MASK 0x7000
+#define RESERVED2_ID_MASK 0x8000
+
+#define OBJECT_ID_SHIFT 0x00
+#define ENUM_ID_SHIFT 0x08
+#define OBJECT_TYPE_SHIFT 0x0C
+
+
+/****************************************************/
+/* Graphics Object family definition */
+/****************************************************/
+#define CONSTRUCTOBJECTFAMILYID(GRAPHICS_OBJECT_TYPE, GRAPHICS_OBJECT_ID)
(GRAPHICS_OBJECT_TYPE << OBJECT_TYPE_SHIFT | \
+
GRAPHICS_OBJECT_ID << OBJECT_ID_SHIFT)
+/****************************************************/
+/* GPU Object ID definition - Shared with BIOS */
+/****************************************************/
+#define GPU_ENUM_ID1 ( GRAPH_OBJECT_TYPE_GPU <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT)
+
+/****************************************************/
+/* Encoder Object ID definition - Shared with BIOS */
+/****************************************************/
+/*
+#define ENCODER_INTERNAL_LVDS_ENUM_ID1 0x2101
+#define ENCODER_INTERNAL_TMDS1_ENUM_ID1 0x2102
+#define ENCODER_INTERNAL_TMDS2_ENUM_ID1 0x2103
+#define ENCODER_INTERNAL_DAC1_ENUM_ID1 0x2104
+#define ENCODER_INTERNAL_DAC2_ENUM_ID1 0x2105
+#define ENCODER_INTERNAL_SDVOA_ENUM_ID1 0x2106
+#define ENCODER_INTERNAL_SDVOB_ENUM_ID1 0x2107
+#define ENCODER_SIL170B_ENUM_ID1 0x2108
+#define ENCODER_CH7303_ENUM_ID1 0x2109
+#define ENCODER_CH7301_ENUM_ID1 0x210A
+#define ENCODER_INTERNAL_DVO1_ENUM_ID1 0x210B
+#define ENCODER_EXTERNAL_SDVOA_ENUM_ID1 0x210C
+#define ENCODER_EXTERNAL_SDVOB_ENUM_ID1 0x210D
+#define ENCODER_TITFP513_ENUM_ID1 0x210E
+#define ENCODER_INTERNAL_LVTM1_ENUM_ID1 0x210F
+#define ENCODER_VT1623_ENUM_ID1 0x2110
+#define ENCODER_HDMI_SI1930_ENUM_ID1 0x2111
+#define ENCODER_HDMI_INTERNAL_ENUM_ID1 0x2112
+#define ENCODER_INTERNAL_KLDSCP_TMDS1_ENUM_ID1 0x2113
+#define ENCODER_INTERNAL_KLDSCP_DVO1_ENUM_ID1 0x2114
+#define ENCODER_INTERNAL_KLDSCP_DAC1_ENUM_ID1 0x2115
+#define ENCODER_INTERNAL_KLDSCP_DAC2_ENUM_ID1 0x2116
+#define ENCODER_SI178_ENUM_ID1 0x2117
+#define ENCODER_MVPU_FPGA_ENUM_ID1 0x2118
+#define ENCODER_INTERNAL_DDI_ENUM_ID1 0x2119
+#define ENCODER_VT1625_ENUM_ID1 0x211A
+#define ENCODER_HDMI_SI1932_ENUM_ID1 0x211B
+#define ENCODER_ENCODER_DP_AN9801_ENUM_ID1 0x211C
+#define ENCODER_DP_DP501_ENUM_ID1 0x211D
+#define ENCODER_INTERNAL_UNIPHY_ENUM_ID1 0x211E
+*/
+#define ENCODER_INTERNAL_LVDS_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_INTERNAL_LVDS
<< OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_TMDS1_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_INTERNAL_TMDS1
<< OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_TMDS2_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_INTERNAL_TMDS2
<< OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_DAC1_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_INTERNAL_DAC1
<< OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_DAC2_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_INTERNAL_DAC2
<< OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_SDVOA_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_INTERNAL_SDVOA
<< OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_SDVOA_ENUM_ID2 ( GRAPH_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_INTERNAL_SDVOA
<< OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_SDVOB_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_INTERNAL_SDVOB
<< OBJECT_ID_SHIFT)
+
+#define ENCODER_SIL170B_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_SI170B <<
OBJECT_ID_SHIFT)
+
+#define ENCODER_CH7303_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_CH7303 <<
OBJECT_ID_SHIFT)
+
+#define ENCODER_CH7301_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_CH7301 <<
OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_DVO1_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_INTERNAL_DVO1
<< OBJECT_ID_SHIFT)
+
+#define ENCODER_EXTERNAL_SDVOA_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_EXTERNAL_SDVOA
<< OBJECT_ID_SHIFT)
+
+#define ENCODER_EXTERNAL_SDVOA_ENUM_ID2 ( GRAPH_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_EXTERNAL_SDVOA
<< OBJECT_ID_SHIFT)
+
+
+#define ENCODER_EXTERNAL_SDVOB_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_EXTERNAL_SDVOB
<< OBJECT_ID_SHIFT)
+
+
+#define ENCODER_TITFP513_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_TITFP513 <<
OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_LVTM1_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_INTERNAL_LVTM1
<< OBJECT_ID_SHIFT)
+
+#define ENCODER_VT1623_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_VT1623 <<
OBJECT_ID_SHIFT)
+
+#define ENCODER_HDMI_SI1930_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_HDMI_SI1930 <<
OBJECT_ID_SHIFT)
+
+#define ENCODER_HDMI_INTERNAL_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_HDMI_INTERNAL
<< OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_KLDSCP_TMDS1_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+
ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1 << OBJECT_ID_SHIFT)
+
+
+#define ENCODER_INTERNAL_KLDSCP_TMDS1_ENUM_ID2 ( GRAPH_OBJECT_TYPE_ENCODER
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+
ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1 << OBJECT_ID_SHIFT)
+
+
+#define ENCODER_INTERNAL_KLDSCP_DVO1_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+
ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1 << OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_KLDSCP_DAC1_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+
ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1 << OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_KLDSCP_DAC2_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+
ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2 << OBJECT_ID_SHIFT) // Shared with
CV/TV and CRT
+
+#define ENCODER_SI178_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_SI178 <<
OBJECT_ID_SHIFT)
+
+#define ENCODER_MVPU_FPGA_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_MVPU_FPGA
<< OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_DDI_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_INTERNAL_DDI <<
OBJECT_ID_SHIFT)
+
+#define ENCODER_VT1625_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_VT1625 <<
OBJECT_ID_SHIFT)
+
+#define ENCODER_HDMI_SI1932_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_HDMI_SI1932 <<
OBJECT_ID_SHIFT)
+
+#define ENCODER_DP_DP501_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_DP_DP501 <<
OBJECT_ID_SHIFT)
+
+#define ENCODER_DP_AN9801_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_DP_AN9801 <<
OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_UNIPHY_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+
ENCODER_OBJECT_ID_INTERNAL_UNIPHY << OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_UNIPHY_ENUM_ID2 ( GRAPH_OBJECT_TYPE_ENCODER
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+
ENCODER_OBJECT_ID_INTERNAL_UNIPHY << OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_KLDSCP_LVTMA_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+
ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA << OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_UNIPHY1_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+
ENCODER_OBJECT_ID_INTERNAL_UNIPHY1 << OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_UNIPHY1_ENUM_ID2 ( GRAPH_OBJECT_TYPE_ENCODER
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+
ENCODER_OBJECT_ID_INTERNAL_UNIPHY1 << OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_UNIPHY2_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+
ENCODER_OBJECT_ID_INTERNAL_UNIPHY2 << OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_UNIPHY2_ENUM_ID2 ( GRAPH_OBJECT_TYPE_ENCODER
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+
ENCODER_OBJECT_ID_INTERNAL_UNIPHY2 << OBJECT_ID_SHIFT)
+
+#define ENCODER_GENERAL_EXTERNAL_DVO_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+
ENCODER_OBJECT_ID_GENERAL_EXTERNAL_DVO << OBJECT_ID_SHIFT)
+
+#define ENCODER_ALMOND_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_ALMOND <<
OBJECT_ID_SHIFT)
+
+#define ENCODER_ALMOND_ENUM_ID2 ( GRAPH_OBJECT_TYPE_ENCODER
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_ALMOND <<
OBJECT_ID_SHIFT)
+
+#define ENCODER_TRAVIS_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_TRAVIS <<
OBJECT_ID_SHIFT)
+
+#define ENCODER_TRAVIS_ENUM_ID2 ( GRAPH_OBJECT_TYPE_ENCODER
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_TRAVIS <<
OBJECT_ID_SHIFT)
+
+#define ENCODER_NUTMEG_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_NUTMEG <<
OBJECT_ID_SHIFT)
+
+/****************************************************/
+/* Connector Object ID definition - Shared with BIOS */
+/****************************************************/
+/*
+#define CONNECTOR_SINGLE_LINK_DVI_I_ENUM_ID1 0x3101
+#define CONNECTOR_DUAL_LINK_DVI_I_ENUM_ID1 0x3102
+#define CONNECTOR_SINGLE_LINK_DVI_D_ENUM_ID1 0x3103
+#define CONNECTOR_DUAL_LINK_DVI_D_ENUM_ID1 0x3104
+#define CONNECTOR_VGA_ENUM_ID1 0x3105
+#define CONNECTOR_COMPOSITE_ENUM_ID1 0x3106
+#define CONNECTOR_SVIDEO_ENUM_ID1 0x3107
+#define CONNECTOR_YPbPr_ENUM_ID1 0x3108
+#define CONNECTOR_D_CONNECTORE_ENUM_ID1 0x3109
+#define CONNECTOR_9PIN_DIN_ENUM_ID1 0x310A
+#define CONNECTOR_SCART_ENUM_ID1 0x310B
+#define CONNECTOR_HDMI_TYPE_A_ENUM_ID1 0x310C
+#define CONNECTOR_HDMI_TYPE_B_ENUM_ID1 0x310D
+#define CONNECTOR_LVDS_ENUM_ID1 0x310E
+#define CONNECTOR_7PIN_DIN_ENUM_ID1 0x310F
+#define CONNECTOR_PCIE_CONNECTOR_ENUM_ID1 0x3110
+*/
+#define CONNECTOR_LVDS_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_LVDS <<
OBJECT_ID_SHIFT)
+
+#define CONNECTOR_LVDS_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_LVDS <<
OBJECT_ID_SHIFT)
+
+#define CONNECTOR_eDP_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_eDP <<
OBJECT_ID_SHIFT)
+
+#define CONNECTOR_eDP_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_eDP <<
OBJECT_ID_SHIFT)
+
+#define CONNECTOR_SINGLE_LINK_DVI_I_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+
CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_I << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_SINGLE_LINK_DVI_I_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+
CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_I << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_DUAL_LINK_DVI_I_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+
CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_I << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_DUAL_LINK_DVI_I_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+
CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_I << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_SINGLE_LINK_DVI_D_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+
CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_D << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_SINGLE_LINK_DVI_D_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+
CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_D << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_SINGLE_LINK_DVI_D_ENUM_ID3 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID3 <<
ENUM_ID_SHIFT |\
+
CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_D << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_SINGLE_LINK_DVI_D_ENUM_ID4 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID4 <<
ENUM_ID_SHIFT |\
+
CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_D << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_DUAL_LINK_DVI_D_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+
CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_DUAL_LINK_DVI_D_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+
CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_DUAL_LINK_DVI_D_ENUM_ID3 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID3 <<
ENUM_ID_SHIFT |\
+
CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_VGA_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_VGA <<
OBJECT_ID_SHIFT)
+
+#define CONNECTOR_VGA_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_VGA <<
OBJECT_ID_SHIFT)
+
+#define CONNECTOR_COMPOSITE_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_COMPOSITE
<< OBJECT_ID_SHIFT)
+
+#define CONNECTOR_COMPOSITE_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_COMPOSITE
<< OBJECT_ID_SHIFT)
+
+#define CONNECTOR_SVIDEO_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_SVIDEO <<
OBJECT_ID_SHIFT)
+
+#define CONNECTOR_SVIDEO_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_SVIDEO <<
OBJECT_ID_SHIFT)
+
+#define CONNECTOR_YPbPr_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_YPbPr <<
OBJECT_ID_SHIFT)
+
+#define CONNECTOR_YPbPr_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_YPbPr <<
OBJECT_ID_SHIFT)
+
+#define CONNECTOR_D_CONNECTOR_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+
CONNECTOR_OBJECT_ID_D_CONNECTOR << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_D_CONNECTOR_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+
CONNECTOR_OBJECT_ID_D_CONNECTOR << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_9PIN_DIN_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_9PIN_DIN
<< OBJECT_ID_SHIFT)
+
+#define CONNECTOR_9PIN_DIN_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_9PIN_DIN
<< OBJECT_ID_SHIFT)
+
+#define CONNECTOR_SCART_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_SCART <<
OBJECT_ID_SHIFT)
+
+#define CONNECTOR_SCART_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_SCART <<
OBJECT_ID_SHIFT)
+
+#define CONNECTOR_HDMI_TYPE_A_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+
CONNECTOR_OBJECT_ID_HDMI_TYPE_A << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_HDMI_TYPE_A_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+
CONNECTOR_OBJECT_ID_HDMI_TYPE_A << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_HDMI_TYPE_A_ENUM_ID3 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID3 <<
ENUM_ID_SHIFT |\
+
CONNECTOR_OBJECT_ID_HDMI_TYPE_A << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_HDMI_TYPE_B_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+
CONNECTOR_OBJECT_ID_HDMI_TYPE_B << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_HDMI_TYPE_B_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+
CONNECTOR_OBJECT_ID_HDMI_TYPE_B << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_7PIN_DIN_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_7PIN_DIN
<< OBJECT_ID_SHIFT)
+
+#define CONNECTOR_7PIN_DIN_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_7PIN_DIN
<< OBJECT_ID_SHIFT)
+
+#define CONNECTOR_PCIE_CONNECTOR_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+
CONNECTOR_OBJECT_ID_PCIE_CONNECTOR << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_PCIE_CONNECTOR_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+
CONNECTOR_OBJECT_ID_PCIE_CONNECTOR << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_CROSSFIRE_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_CROSSFIRE
<< OBJECT_ID_SHIFT)
+
+#define CONNECTOR_CROSSFIRE_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_CROSSFIRE
<< OBJECT_ID_SHIFT)
+
+
+#define CONNECTOR_HARDCODE_DVI_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+
CONNECTOR_OBJECT_ID_HARDCODE_DVI << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_HARDCODE_DVI_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+
CONNECTOR_OBJECT_ID_HARDCODE_DVI << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_DISPLAYPORT_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+
CONNECTOR_OBJECT_ID_DISPLAYPORT << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_DISPLAYPORT_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+
CONNECTOR_OBJECT_ID_DISPLAYPORT << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_DISPLAYPORT_ENUM_ID3 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID3 <<
ENUM_ID_SHIFT |\
+
CONNECTOR_OBJECT_ID_DISPLAYPORT << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_DISPLAYPORT_ENUM_ID4 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID4 <<
ENUM_ID_SHIFT |\
+
CONNECTOR_OBJECT_ID_DISPLAYPORT << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_DISPLAYPORT_ENUM_ID5 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID5 <<
ENUM_ID_SHIFT |\
+
CONNECTOR_OBJECT_ID_DISPLAYPORT << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_DISPLAYPORT_ENUM_ID6 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID6 <<
ENUM_ID_SHIFT |\
+
CONNECTOR_OBJECT_ID_DISPLAYPORT << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_MXM_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_MXM <<
OBJECT_ID_SHIFT) //Mapping to MXM_DP_A
+
+#define CONNECTOR_MXM_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_MXM <<
OBJECT_ID_SHIFT) //Mapping to MXM_DP_B
+
+#define CONNECTOR_MXM_ENUM_ID3 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID3 <<
ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_MXM <<
OBJECT_ID_SHIFT) //Mapping to MXM_DP_C
+
+#define CONNECTOR_MXM_ENUM_ID4 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID4 <<
ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_MXM <<
OBJECT_ID_SHIFT) //Mapping to MXM_DP_D
+
+#define CONNECTOR_MXM_ENUM_ID5 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID5 <<
ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_MXM <<
OBJECT_ID_SHIFT) //Mapping to MXM_LVDS_TXxx
+
+#define CONNECTOR_MXM_ENUM_ID6 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID6 <<
ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_MXM <<
OBJECT_ID_SHIFT) //Mapping to MXM_LVDS_UXxx
+
+#define CONNECTOR_MXM_ENUM_ID7 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID7 <<
ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_MXM <<
OBJECT_ID_SHIFT) //Mapping to MXM_DAC
+
+#define CONNECTOR_LVDS_eDP_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_LVDS_eDP
<< OBJECT_ID_SHIFT)
+
+#define CONNECTOR_LVDS_eDP_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR
<< OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_LVDS_eDP
<< OBJECT_ID_SHIFT)
+
+/****************************************************/
+/* Router Object ID definition - Shared with BIOS */
+/****************************************************/
+#define ROUTER_I2C_EXTENDER_CNTL_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ROUTER <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+
ROUTER_OBJECT_ID_I2C_EXTENDER_CNTL << OBJECT_ID_SHIFT)
+
+/* deleted */
+
+/****************************************************/
+/* Generic Object ID definition - Shared with BIOS */
+/****************************************************/
+#define GENERICOBJECT_GLSYNC_ENUM_ID1 (GRAPH_OBJECT_TYPE_GENERIC <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ GENERIC_OBJECT_ID_GLSYNC <<
OBJECT_ID_SHIFT)
+
+#define GENERICOBJECT_PX2_NON_DRIVABLE_ID1 (GRAPH_OBJECT_TYPE_GENERIC <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+
GENERIC_OBJECT_ID_PX2_NON_DRIVABLE<< OBJECT_ID_SHIFT)
+
+#define GENERICOBJECT_PX2_NON_DRIVABLE_ID2 (GRAPH_OBJECT_TYPE_GENERIC <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
+
GENERIC_OBJECT_ID_PX2_NON_DRIVABLE<< OBJECT_ID_SHIFT)
+
+#define GENERICOBJECT_MXM_OPM_ENUM_ID1 (GRAPH_OBJECT_TYPE_GENERIC <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ GENERIC_OBJECT_ID_MXM_OPM <<
OBJECT_ID_SHIFT)
+
+#define GENERICOBJECT_STEREO_PIN_ENUM_ID1 (GRAPH_OBJECT_TYPE_GENERIC <<
OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
+ GENERIC_OBJECT_ID_STEREO_PIN
<< OBJECT_ID_SHIFT)
+
+/****************************************************/
+/* Object Cap definition - Shared with BIOS */
+/****************************************************/
+#define GRAPHICS_OBJECT_CAP_I2C 0x00000001L
+#define GRAPHICS_OBJECT_CAP_TABLE_ID 0x00000002L
+
+
+#define GRAPHICS_OBJECT_I2CCOMMAND_TABLE_ID 0x01
+#define GRAPHICS_OBJECT_HOTPLUGDETECTIONINTERUPT_TABLE_ID 0x02
+#define GRAPHICS_OBJECT_ENCODER_OUTPUT_PROTECTION_TABLE_ID 0x03
+
+#if defined(_X86_)
+#pragma pack()
+#endif
+
+#endif /*GRAPHICTYPE */
+
+
+
+
Modified: haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/atom.h
===================================================================
--- haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/atom.h
2011-08-21 21:10:24 UTC (rev 42669)
+++ haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/atom.h
2011-08-21 21:21:36 UTC (rev 42670)
@@ -26,6 +26,7 @@
#include "atombios.h"
+#include "ObjectID.h"
#include <String.h>
#include <SupportDefs.h>
Modified: haiku/trunk/src/add-ons/accelerants/radeon_hd/display.cpp
===================================================================
--- haiku/trunk/src/add-ons/accelerants/radeon_hd/display.cpp 2011-08-21
21:10:24 UTC (rev 42669)
+++ haiku/trunk/src/add-ons/accelerants/radeon_hd/display.cpp 2011-08-21
21:21:36 UTC (rev 42670)
@@ -24,7 +24,9 @@
# define TRACE(x...) ;
#endif
+#define ERROR(x...) _sPrintf("radeon_hd: " x)
+
/*! Populate regs with device dependant register locations */
status_t
init_registers(register_info* regs, uint8 crtid)
@@ -218,7 +220,282 @@
}
+union atom_supported_devices {
+ struct _ATOM_SUPPORTED_DEVICES_INFO info;
+ struct _ATOM_SUPPORTED_DEVICES_INFO_2 info_2;
+ struct _ATOM_SUPPORTED_DEVICES_INFO_2d1 info_2d1;
+};
+
+
status_t
+detect_connectors()
+{
+ int index = GetIndexIntoMasterTable(DATA, SupportedDevicesInfo);
+ uint8 frev;
+ uint8 crev;
+ uint16 size;
+ uint16 data_offset;
+
+ if (atom_parse_data_header(gAtomContext, index, &size, &frev, &crev,
+ &data_offset) != B_OK) {
+ ERROR("%s: unable to parse data header!\n", __func__);
+ return B_ERROR;
+ }
+
+ union atom_supported_devices *supported_devices;
+ supported_devices
+ = (union atom_supported_devices *)
+ ((uint16 *)gAtomContext->bios + data_offset);
+
+ uint16 device_support
+ =
B_LENDIAN_TO_HOST_INT16(supported_devices->info.usDeviceSupport);
+
+ int32 i;
+ for (i = 0; i < ATOM_MAX_SUPPORTED_DEVICE; i++) {
+ ATOM_CONNECTOR_INFO_I2C ci
+ = supported_devices->info.asConnInfo[i];
+
+ gConnector[i]->valid = false;
+
+ if (!(device_support & (1 << i)))
+ continue;
+
+ if (i == ATOM_DEVICE_CV_INDEX) {
+ TRACE("%s: skipping component video\n",
+ __func__);
+ continue;
+ }
+
+ gConnector[i]->connector_type
+ =
connector_convert[ci.sucConnectorInfo.sbfAccess.bfConnectorType];
+
+ if (gConnector[i]->connector_type
+ == VIDEO_CONNECTOR_UNKNOWN) {
+ TRACE("%s: skipping unknown connector at %" B_PRId32
+ " of 0x%" B_PRIX8"\n", __func__, i,
+ ci.sucConnectorInfo.sbfAccess.bfConnectorType);
+ continue;
+ }
+
+ // uint8 dac = ci.sucConnectorInfo.sbfAccess.bfAssociatedDAC;
+ gConnector[i]->line_mux = ci.sucI2cId.ucAccess;
+
+ // TODO : give tv unique connector ids
+ // TODO : ddc bus
+
+ // Always set CRT1 and CRT2 as VGA, some cards incorrectly set
+ // VGA ports as DVI
+ if (i == ATOM_DEVICE_CRT1_INDEX || i == ATOM_DEVICE_CRT2_INDEX)
+ gConnector[i]->connector_type = VIDEO_CONNECTOR_VGA;
+
+ gConnector[i]->valid = true;
+ gConnector[i]->devices = (1 << i);
+
+ // TODO : add the encoder
+ #if 0
+ radeon_add_atom_encoder(dev,
+ radeon_get_encoder_enum(dev,
+ (1 << i),
+ dac),
+ (1 << i),
+ 0);
+ #endif
+ }
+
+ // TODO : combine shared connectors
+
+ // TODO : add connectors
+
+ for (i = 0; i < ATOM_MAX_SUPPORTED_DEVICE_INFO; i++) {
+ if (gConnector[i]->valid == true) {
+ TRACE("%s: connector #%" B_PRId32 " is %s\n", __func__,
i,
+
decode_connector_name(gConnector[i]->connector_type));
+ }
+ }
+
+ return B_OK;
+}
+
+
+// TODO : this gets connectors from object table
+status_t
+detect_connectors_manual()
+{
+ int index = GetIndexIntoMasterTable(DATA, Object_Header);
+
+ uint8 frev;
+ uint8 crev;
+ uint16 size;
+ uint16 data_offset;
+
+ if (atom_parse_data_header(gAtomContext, index, &size, &frev, &crev,
+ &data_offset) != B_OK) {
+ ERROR("%s: ERROR: parsing data header failed!\n", __func__);
+ return B_ERROR;
+ }
+
+ if (crev < 2) {
+ ERROR("%s: ERROR: data header version unknown!\n", __func__);
+ return B_ERROR;
+ }
+
+ ATOM_CONNECTOR_OBJECT_TABLE *con_obj;
+ ATOM_ENCODER_OBJECT_TABLE *enc_obj;
+ ATOM_OBJECT_TABLE *router_obj;
+ ATOM_DISPLAY_OBJECT_PATH_TABLE *path_obj;
+ ATOM_OBJECT_HEADER *obj_header;
+
+ obj_header = (ATOM_OBJECT_HEADER *)
+ ((uint16 *)gAtomContext->bios + data_offset);
+ path_obj = (ATOM_DISPLAY_OBJECT_PATH_TABLE *)
+ ((uint16 *)gAtomContext->bios + data_offset
+ +
B_LENDIAN_TO_HOST_INT16(obj_header->usDisplayPathTableOffset));
+ con_obj = (ATOM_CONNECTOR_OBJECT_TABLE *)
+ ((uint16 *)gAtomContext->bios + data_offset
+ +
B_LENDIAN_TO_HOST_INT16(obj_header->usConnectorObjectTableOffset));
+ enc_obj = (ATOM_ENCODER_OBJECT_TABLE *)
+ ((uint16 *)gAtomContext->bios + data_offset
+ +
B_LENDIAN_TO_HOST_INT16(obj_header->usEncoderObjectTableOffset));
+ router_obj = (ATOM_OBJECT_TABLE *)
+ ((uint16 *)gAtomContext->bios + data_offset
+ +
B_LENDIAN_TO_HOST_INT16(obj_header->usRouterObjectTableOffset));
+ int device_support =
B_LENDIAN_TO_HOST_INT16(obj_header->usDeviceSupport);
+
+ int path_size = 0;
+ int32 i = 0;
+
+ TRACE("%s: found %" B_PRIu8 " potential display paths.\n", __func__,
+ path_obj->ucNumOfDispPath);
+
+ for (i = 0; i < path_obj->ucNumOfDispPath; i++) {
+ uint8 *addr = (uint8*)path_obj->asDispPath;
+ ATOM_DISPLAY_OBJECT_PATH *path;
+ addr += path_size;
+ path = (ATOM_DISPLAY_OBJECT_PATH *) addr;
+ path_size += B_LENDIAN_TO_HOST_INT16(path->usSize);
+
+ int connector_type;
+ uint16 connector_object_id;
+
+ if (device_support &
B_LENDIAN_TO_HOST_INT16(path->usDeviceTag)) {
+ TRACE("%s: Display Path #%" B_PRId32 "\n", __func__, i);
+
+ uint16 igp_lane_info;
+
+ uint8 con_obj_id
+ = (B_LENDIAN_TO_HOST_INT16(path->usConnObjectId)
+ & OBJECT_ID_MASK) >> OBJECT_ID_SHIFT;
+ //uint8 con_obj_num
+ // = (B_LENDIAN_TO_HOST_INT16(path->usConnObjectId)
+ // & ENUM_ID_MASK) >> ENUM_ID_SHIFT;
+ //uint8 con_obj_type
+ // = (B_LENDIAN_TO_HOST_INT16(path->usConnObjectId)
+ // & OBJECT_TYPE_MASK) >> OBJECT_TYPE_SHIFT;
+
+ // TODO : CV support
+ if (B_LENDIAN_TO_HOST_INT16(path->usDeviceTag)
+ == ATOM_DEVICE_CV_SUPPORT) {
+ continue;
+ }
[... truncated: 166 lines follow ...]
Other related posts:
- » [haiku-commits] r42670 - in haiku/trunk/src/add-ons/accelerants/radeon_hd: . atombios - kallisti5
