diff options
| -rw-r--r-- | src/legacy_output.c | 1 | ||||
| -rw-r--r-- | src/radeon.h | 27 | ||||
| -rw-r--r-- | src/radeon_bios.c | 1 | ||||
| -rw-r--r-- | src/radeon_driver.c | 25 | ||||
| -rw-r--r-- | src/radeon_output.c | 1 |
5 files changed, 36 insertions, 19 deletions
diff --git a/src/legacy_output.c b/src/legacy_output.c index 799aa2e..9caebdd 100644 --- a/src/legacy_output.c +++ b/src/legacy_output.c @@ -212,7 +212,6 @@ RADEONSaveFPRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save) } } - Bool RADEONDVOReadByte(I2CDevPtr dvo, int addr, CARD8 *ch) { diff --git a/src/radeon.h b/src/radeon.h index 5c15888..c376cdb 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -849,22 +849,15 @@ extern void RADEONGetPanelInfo(ScrnInfoPtr pScrn); extern void RADEONUnblank(ScrnInfoPtr pScrn); extern void RADEONUnblank(ScrnInfoPtr pScrn); extern void RADEONBlank(ScrnInfoPtr pScrn); -extern void RADEONDisplayPowerManagementSet(ScrnInfoPtr pScrn, - int PowerManagementMode, - int flags); + extern Bool RADEONAllocateControllers(ScrnInfoPtr pScrn, int mask); extern Bool RADEONAllocateConnectors(ScrnInfoPtr pScrn); -extern int RADEONValidateMergeModes(ScrnInfoPtr pScrn); -extern int RADEONValidateDDCModes(ScrnInfoPtr pScrn1, char **ppModeName, - RADEONMonitorType DisplayType, int crtc2); + extern void RADEONSetPitch (ScrnInfoPtr pScrn); extern void RADEONUpdateHVPosition(xf86OutputPtr output, DisplayModePtr mode); -DisplayModePtr +extern DisplayModePtr RADEONProbeOutputModes(xf86OutputPtr output); -extern Bool RADEONInit2(ScrnInfoPtr pScrn, DisplayModePtr crtc1, - DisplayModePtr crtc2, int crtc_mask, - RADEONSavePtr save, RADEONMonitorType montype); extern Bool RADEONDVOReadByte(I2CDevPtr dvo, int addr, CARD8 *ch); @@ -875,20 +868,18 @@ RADEONGetExtTMDSInfoFromBIOS (xf86OutputPtr output); extern Bool RADEONInitExtTMDSInfoFromBIOS (xf86OutputPtr output); -void +extern void radeon_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y); -void +extern void radeon_crtc_show_cursor (xf86CrtcPtr crtc); -void +extern void radeon_crtc_hide_cursor (xf86CrtcPtr crtc); -void +extern void radeon_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y); -void +extern void radeon_crtc_set_cursor_colors (xf86CrtcPtr crtc, int bg, int fg); -void +extern void radeon_crtc_load_cursor_argb (xf86CrtcPtr crtc, CARD32 *image); -void -RADEONEnableOutputs(ScrnInfoPtr pScrn, int crtc_num); extern void RADEONAdjustCrtcRegistersForTV(ScrnInfoPtr pScrn, RADEONSavePtr save, DisplayModePtr mode, xf86OutputPtr output); diff --git a/src/radeon_bios.c b/src/radeon_bios.c index 752b31e..1a4f99d 100644 --- a/src/radeon_bios.c +++ b/src/radeon_bios.c @@ -65,6 +65,7 @@ typedef enum CONNECTOR_UNSUPPORTED_LEGACY } RADEONLegacyConnectorType; + /* Read the Video BIOS block and the FP registers (if applicable). */ Bool RADEONGetBIOSInfo(ScrnInfoPtr pScrn, xf86Int10InfoPtr pInt10) { diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 1662e04..b9a05f3 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -128,6 +128,31 @@ static void RADEONAdjustMemMapRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save); extern DisplayModePtr RADEONCrtcFindClosestMode(xf86CrtcPtr crtc, DisplayModePtr pMode); +extern void +RADEONSaveCommonRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save); +extern void +RADEONSaveBIOSRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save); +extern void +RADEONSaveCrtcRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save); +extern void +RADEONSaveCrtc2Registers(ScrnInfoPtr pScrn, RADEONSavePtr save); +extern void +RADEONSavePLLRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save); +extern void +RADEONSavePLL2Registers(ScrnInfoPtr pScrn, RADEONSavePtr save); +extern void +RADEONSaveFPRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save); +extern void +RADEONSaveDACRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save); + +#ifdef USE_XAA +#ifdef XF86DRI +extern Bool +RADEONSetupMemXAA_DRI(int scrnIndex, ScreenPtr pScreen); +#endif /* XF86DRI */ +extern Bool +RADEONSetupMemXAA(int scrnIndex, ScreenPtr pScreen); +#endif /* USE_XAA */ static const OptionInfoRec RADEONOptions[] = { { OPTION_NOACCEL, "NoAccel", OPTV_BOOLEAN, {0}, FALSE }, diff --git a/src/radeon_output.c b/src/radeon_output.c index 2346932..84b1dd9 100644 --- a/src/radeon_output.c +++ b/src/radeon_output.c @@ -177,6 +177,7 @@ extern void legacy_output_dpms(xf86OutputPtr output, int mode); extern RADEONMonitorType atombios_dac_detect(ScrnInfoPtr pScrn, xf86OutputPtr output); extern RADEONMonitorType legacy_dac_detect(ScrnInfoPtr pScrn, xf86OutputPtr output); extern int atombios_external_tmds_setup(xf86OutputPtr output, DisplayModePtr mode); +extern I2CDevPtr RADEONDVODeviceInit(I2CBusPtr b, I2CSlaveAddr addr); void RADEONPrintPortMap(ScrnInfoPtr pScrn) |