diff options
| author | Dave Airlie <airlied@linux.ie> | 2006-12-04 18:53:33 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-12-04 18:53:33 +1100 |
| commit | 5d5fa1b86e5179b061f0db47fe0227d1b84c37f8 (patch) | |
| tree | 4a38eb3405f99b802e1c13d00c0682f02e973830 /src/radeon.h | |
| parent | 51d1cf19e71dd5de47f2c6467f4a1685eefd9e1e (diff) | |
update radeon driver to Intel driver xf86Crtc interfaces
Diffstat (limited to 'src/radeon.h')
| -rw-r--r-- | src/radeon.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/radeon.h b/src/radeon.h index f6a02275..e40905ab 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -77,6 +77,8 @@ #endif #endif +#include "radeon_xf86Crtc.h" + /* Render support */ #ifdef RENDER #include "picturestr.h" @@ -405,6 +407,7 @@ typedef struct { }RADEONTMDSPll; typedef struct { + xf86CrtcConfigRec xf86_config; EntityInfoPtr pEnt; pciVideoPtr PciInfo; PCITAG PciTag; @@ -897,7 +900,7 @@ extern Bool RADEONI2cInit(ScrnInfoPtr pScrn); extern void RADEONSetSyncRangeFromEdid(ScrnInfoPtr pScrn, int flag); extern void RADEONSetupConnectors(ScrnInfoPtr pScrn); extern Bool RADEONMapControllers(ScrnInfoPtr pScrn); -extern void RADEONEnableDisplay(ScrnInfoPtr pScrn, RADEONConnector* pPort, BOOL bEnable); +extern void RADEONEnableDisplay(ScrnInfoPtr pScrn, xf86OutputPtr pPort, BOOL bEnable); extern void RADEONDisableDisplays(ScrnInfoPtr pScrn); extern void RADEONGetPanelInfo(ScrnInfoPtr pScrn); extern void RADEONGetTVDacAdjInfo(ScrnInfoPtr pScrn); @@ -908,7 +911,7 @@ extern void RADEONDisplayPowerManagementSet(ScrnInfoPtr pScrn, int flags); extern Bool RADEONAllocateControllers(ScrnInfoPtr pScrn); extern Bool RADEONAllocateConnectors(ScrnInfoPtr pScrn); -extern RADEONConnector *RADEONGetCrtcConnector(ScrnInfoPtr pScrn, int crtc_num); +extern xf86OutputPtr RADEONGetCrtcConnector(ScrnInfoPtr pScrn, int crtc_num); extern int RADEONValidateMergeModes(ScrnInfoPtr pScrn); extern int RADEONValidateDDCModes(ScrnInfoPtr pScrn1, char **ppModeName, RADEONMonitorType DisplayType, int crtc2); |