diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2010-05-18 19:26:47 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-05-18 20:31:41 -0400 |
commit | 8e36ed00842668a39a6ed1b0a00b8ac92b7c4cd5 (patch) | |
tree | b16da6957fdfbea44ef4cdd540a13d4be59c9445 /drivers/gpu/drm/radeon/radeon_mode.h | |
parent | 2bfcc0fc698d550689ef020c73b2d977b73e728c (diff) |
drm/radeon/kms: hpd cleanup
- Use radeon hpd enum consistently (in both hotplug and dp)
- Legacy r100 with DVI should be HPD_1 not NONE
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_mode.h')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_mode.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h index 71e1f0e7438d..67358baf28b2 100644 --- a/drivers/gpu/drm/radeon/radeon_mode.h +++ b/drivers/gpu/drm/radeon/radeon_mode.h | |||
@@ -66,6 +66,16 @@ enum radeon_tv_std { | |||
66 | TV_STD_PAL_N, | 66 | TV_STD_PAL_N, |
67 | }; | 67 | }; |
68 | 68 | ||
69 | enum radeon_hpd_id { | ||
70 | RADEON_HPD_1 = 0, | ||
71 | RADEON_HPD_2, | ||
72 | RADEON_HPD_3, | ||
73 | RADEON_HPD_4, | ||
74 | RADEON_HPD_5, | ||
75 | RADEON_HPD_6, | ||
76 | RADEON_HPD_NONE = 0xff, | ||
77 | }; | ||
78 | |||
69 | /* radeon gpio-based i2c | 79 | /* radeon gpio-based i2c |
70 | * 1. "mask" reg and bits | 80 | * 1. "mask" reg and bits |
71 | * grabs the gpio pins for software use | 81 | * grabs the gpio pins for software use |
@@ -85,7 +95,7 @@ struct radeon_i2c_bus_rec { | |||
85 | /* id used by atom */ | 95 | /* id used by atom */ |
86 | uint8_t i2c_id; | 96 | uint8_t i2c_id; |
87 | /* id used by atom */ | 97 | /* id used by atom */ |
88 | uint8_t hpd_id; | 98 | enum radeon_hpd_id hpd; |
89 | /* can be used with hw i2c engine */ | 99 | /* can be used with hw i2c engine */ |
90 | bool hw_capable; | 100 | bool hw_capable; |
91 | /* uses multi-media i2c engine */ | 101 | /* uses multi-media i2c engine */ |
@@ -370,16 +380,6 @@ struct radeon_gpio_rec { | |||
370 | u32 mask; | 380 | u32 mask; |
371 | }; | 381 | }; |
372 | 382 | ||
373 | enum radeon_hpd_id { | ||
374 | RADEON_HPD_NONE = 0, | ||
375 | RADEON_HPD_1, | ||
376 | RADEON_HPD_2, | ||
377 | RADEON_HPD_3, | ||
378 | RADEON_HPD_4, | ||
379 | RADEON_HPD_5, | ||
380 | RADEON_HPD_6, | ||
381 | }; | ||
382 | |||
383 | struct radeon_hpd { | 383 | struct radeon_hpd { |
384 | enum radeon_hpd_id hpd; | 384 | enum radeon_hpd_id hpd; |
385 | u8 plugged_state; | 385 | u8 plugged_state; |