diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-01-28 14:33:14 -0500 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-01-28 14:33:14 -0500 |
| commit | bd8021d46e9066e4cd116c03a7b7adcfe2557aff (patch) | |
| tree | 4c4982475b8d3acbbf943b194141ae0876043479 /src/radeon_atombios.h | |
| parent | 4f88dd83f290fb38e41256a7f1804008c0f28139 (diff) | |
| parent | 20d5dd387da555e895e2b73fb53e2b026dd91003 (diff) | |
Merge branch 'atom-rework' and fix conflicts
Diffstat (limited to 'src/radeon_atombios.h')
| -rw-r--r-- | src/radeon_atombios.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/radeon_atombios.h b/src/radeon_atombios.h index a0163598..efebc626 100644 --- a/src/radeon_atombios.h +++ b/src/radeon_atombios.h @@ -125,9 +125,6 @@ atombios_static_pwrmgt_setup(ScrnInfoPtr pScrn, int enable); extern Bool RADEONGetATOMTVInfo(xf86OutputPtr output); -extern Bool -RADEONGetATOMLVDSInfo(xf86OutputPtr output); - extern int atombios_external_tmds_setup(xf86OutputPtr output, DisplayModePtr mode); @@ -269,4 +266,13 @@ typedef struct _atomBiosHandle { extern Bool RADEONATOMGetTVTimings(ScrnInfoPtr pScrn, int index, SET_CRTC_TIMING_PARAMETERS_PS_ALLOCATION *crtc_timing, int32_t *pixel_clock); +extern uint32_t +radeon_get_device_index(uint32_t device_support); +extern radeon_encoder_ptr +radeon_get_encoder(xf86OutputPtr output); +extern Bool +radeon_add_encoder(ScrnInfoPtr pScrn, uint32_t encoder_id, uint32_t device_support); +extern uint32_t +radeon_get_encoder_id_from_supported_device(ScrnInfoPtr pScrn, uint32_t supported_device, int dac); + #endif /* RHD_ATOMBIOS_H_ */ |