radeon_hd: Add new VCE encoder defines

* Internal encoder introduced for HD 7xxx
* si_tn [PATCH 02/48]
This commit is contained in:
Alexander von Gluck IV
2012-03-22 08:41:17 -05:00
parent 5b93b4477e
commit bc83207890
2 changed files with 8 additions and 2 deletions
@@ -85,6 +85,7 @@
#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_INTERNAL_VCE 0x24
#define ENCODER_OBJECT_ID_GENERAL_EXTERNAL_DVO 0xFF
@@ -387,6 +388,10 @@
GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
ENCODER_OBJECT_ID_NUTMEG << OBJECT_ID_SHIFT)
#define ENCODER_VCE_ENUM_ID1 ( GRAPH_OBHECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
ENCODER_OBJECT_ID_INTERNAL_VCE << OBJECT_ID_SHIFT)
/****************************************************/
/* Connector Object ID definition - Shared with BIOS */
/****************************************************/
@@ -1773,7 +1773,7 @@ encoder_output_lock(bool lock)
}
static const char* encoder_name_matrix[36] = {
static const char* encoder_name_matrix[37] = {
"NONE",
"Internal Radeon LVDS",
"Internal Radeon TMDS1",
@@ -1809,7 +1809,8 @@ static const char* encoder_name_matrix[36] = {
"Internal Kaleidoscope UNIPHY1",
"Internal Kaleidoscope UNIPHY2",
"External Travis Bridge",
"External Nutmeg Bridge"
"External Nutmeg Bridge",
"Internal Kaleidoscope VCE"
};