summaryrefslogtreecommitdiff
path: root/shared-core/radeon_ms.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2008-01-04 16:12:24 +1100
committerDave Airlie <airlied@redhat.com>2008-01-04 16:12:24 +1100
commit10937cf20b6814e4cf68114fab4619fad94eafcb (patch)
tree05bb4c7e91c63d5f25eb7efa6ac67134027e5cf8 /shared-core/radeon_ms.h
parent219ba5cd9aff2dc79e414bbe2e9f90406f7543df (diff)
drm: move drm_head to drm_minor and fix up users
Diffstat (limited to 'shared-core/radeon_ms.h')
-rw-r--r--shared-core/radeon_ms.h15
1 files changed, 14 insertions, 1 deletions
diff --git a/shared-core/radeon_ms.h b/shared-core/radeon_ms.h
index d86c40b9..ee795f3a 100644
--- a/shared-core/radeon_ms.h
+++ b/shared-core/radeon_ms.h
@@ -87,6 +87,17 @@ enum radeon_monitor_type {
MT_STV = 5
};
+enum radeon_connector_type {
+ CONNECTOR_NONE,
+ CONNECTOR_PROPRIETARY,
+ CONNECTOR_VGA,
+ CONNECTOR_DVI_I,
+ CONNECTOR_DVI_D,
+ CONNECTOR_CTV,
+ CONNECTOR_STV,
+ CONNECTOR_UNSUPPORTED
+};
+
enum radeon_output_type {
OUTPUT_NONE,
OUTPUT_DAC1,
@@ -120,6 +131,7 @@ struct radeon_ms_connector {
int crtc;
uint32_t i2c_reg;
char outputs[RADEON_MAX_OUTPUTS];
+ char name[32];
};
struct radeon_ms_output {
@@ -447,7 +459,8 @@ int radeon_ms_wait_for_idle(struct drm_device *dev);
/* radeon_ms_i2c.c */
void radeon_ms_i2c_destroy(struct radeon_ms_i2c *i2c);
struct radeon_ms_i2c *radeon_ms_i2c_create(struct drm_device *dev,
- const uint32_t reg, int type);
+ const uint32_t reg,
+ const char *name);
/* radeon_ms_irq.c */
void radeon_ms_irq_emit(struct drm_device *dev);