aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2012-03-20 17:17:56 -0400
committerDave Airlie <airlied@redhat.com>2012-03-21 02:55:49 -0400
commitc67d8502d8b8038140efddf5ea93bc97258adc3c (patch)
tree627505753e63bd457c01a83751db9c6635ac21d2 /drivers/gpu
parent609c1e15a44c25f722fb93e18668da30179a172f (diff)
drm/radeon/kms: Upstream ObjectID.h updates
Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/radeon/ObjectID.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/ObjectID.h b/drivers/gpu/drm/radeon/ObjectID.h
index c61c3fe9fb98..ca4b038050d2 100644
--- a/drivers/gpu/drm/radeon/ObjectID.h
+++ b/drivers/gpu/drm/radeon/ObjectID.h
@@ -85,6 +85,7 @@
85#define ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA 0x1F 85#define ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA 0x1F
86#define ENCODER_OBJECT_ID_INTERNAL_UNIPHY1 0x20 86#define ENCODER_OBJECT_ID_INTERNAL_UNIPHY1 0x20
87#define ENCODER_OBJECT_ID_INTERNAL_UNIPHY2 0x21 87#define ENCODER_OBJECT_ID_INTERNAL_UNIPHY2 0x21
88#define ENCODER_OBJECT_ID_INTERNAL_VCE 0x24
88 89
89#define ENCODER_OBJECT_ID_GENERAL_EXTERNAL_DVO 0xFF 90#define ENCODER_OBJECT_ID_GENERAL_EXTERNAL_DVO 0xFF
90 91
@@ -387,6 +388,10 @@
387 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\ 388 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
388 ENCODER_OBJECT_ID_NUTMEG << OBJECT_ID_SHIFT) 389 ENCODER_OBJECT_ID_NUTMEG << OBJECT_ID_SHIFT)
389 390
391#define ENCODER_VCE_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
392 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
393 ENCODER_OBJECT_ID_INTERNAL_VCE << OBJECT_ID_SHIFT)
394
390/****************************************************/ 395/****************************************************/
391/* Connector Object ID definition - Shared with BIOS */ 396/* Connector Object ID definition - Shared with BIOS */
392/****************************************************/ 397/****************************************************/