diff options
| -rw-r--r-- | src/radeon.h | 14 | ||||
| -rw-r--r-- | src/radeon_output.c | 8 |
2 files changed, 1 insertions, 21 deletions
diff --git a/src/radeon.h b/src/radeon.h index 7705b2a3..0c114c60 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -793,16 +793,13 @@ typedef struct { DisplayModePtr currentMode, savedCurrentMode; /* special handlings for DELL triple-head server */ - Bool IsDellServer; + Bool IsDellServer; Bool VGAAccess; int MaxSurfaceWidth; int MaxLines; - uint32_t tv_dac_adj; - uint32_t tv_dac_enable_mask; - Bool want_vblank_interrupts; RADEONBIOSConnector BiosConnector[RADEON_MAX_BIOS_CONNECTOR]; radeon_encoder_ptr encoders[RADEON_MAX_BIOS_CONNECTOR]; @@ -813,7 +810,6 @@ typedef struct { Bool crtc2_on; Bool InternalTVOut; - int tvdac_use_count; #if defined(__powerpc__) RADEONMacModel MacModel; @@ -824,14 +820,6 @@ typedef struct { unsigned long FbFreeStart, FbFreeSize; unsigned char* BIOSCopy; - /* output enable masks for outputs shared across connectors */ - int output_crt1; - int output_crt2; - int output_dfp1; - int output_dfp2; - int output_lcd1; - int output_tv1; - Rotation rotation; void (*PointerMoved)(int, int, int); CreateScreenResourcesProcPtr CreateScreenResources; diff --git a/src/radeon_output.c b/src/radeon_output.c index 83aaf4f7..e5023106 100644 --- a/src/radeon_output.c +++ b/src/radeon_output.c @@ -3108,14 +3108,6 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn) } } - /* clear the enable masks */ - info->output_crt1 = 0; - info->output_crt2 = 0; - info->output_dfp1 = 0; - info->output_dfp2 = 0; - info->output_lcd1 = 0; - info->output_tv1 = 0; - for (i = 0 ; i < RADEON_MAX_BIOS_CONNECTOR; i++) { if (info->BiosConnector[i].valid) { RADEONOutputPrivatePtr radeon_output; |