From bc83207890507317e98cc18b61e075fc78d9379f Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Thu, 22 Mar 2012 08:37:00 -0500
Subject: [PATCH] radeon_hd: Add new VCE encoder defines

* Internal encoder introduced for HD 7xxx
* si_tn [PATCH 02/48]
---
 src/add-ons/accelerants/radeon_hd/atombios/ObjectID.h | 5 +++++
 src/add-ons/accelerants/radeon_hd/encoder.cpp         | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/add-ons/accelerants/radeon_hd/atombios/ObjectID.h b/src/add-ons/accelerants/radeon_hd/atombios/ObjectID.h
index c61c3fe9fb..8ec594ced7 100644
--- a/src/add-ons/accelerants/radeon_hd/atombios/ObjectID.h
+++ b/src/add-ons/accelerants/radeon_hd/atombios/ObjectID.h
@@ -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 */
 /****************************************************/
diff --git a/src/add-ons/accelerants/radeon_hd/encoder.cpp b/src/add-ons/accelerants/radeon_hd/encoder.cpp
index f5215a60d1..fc2496107c 100644
--- a/src/add-ons/accelerants/radeon_hd/encoder.cpp
+++ b/src/add-ons/accelerants/radeon_hd/encoder.cpp
@@ -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"
 };