summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2009-01-26 03:12:44 -0500
committerAlex Deucher <alexdeucher@gmail.com>2009-01-26 03:12:44 -0500
commit2f92b885457c5cee2098ebbf8c6fe5a5eb98ec48 (patch)
treecc49bdb98f858f3bad7b47c75bc04fde340ccf46
parent4cbf6189f3a7945a1141b0451e4f7881ceaaadcd (diff)
Warning fixes
-rw-r--r--src/atombios_crtc.c3
-rw-r--r--src/atombios_output.c1
-rw-r--r--src/legacy_output.c6
-rw-r--r--src/radeon_atombios.h9
-rw-r--r--src/radeon_output.c2
5 files changed, 17 insertions, 4 deletions
diff --git a/src/atombios_crtc.c b/src/atombios_crtc.c
index 9f8bc690..cebd3287 100644
--- a/src/atombios_crtc.c
+++ b/src/atombios_crtc.c
@@ -47,6 +47,9 @@
#include "sarea.h"
#endif
+extern int
+atombios_get_encoder_mode(xf86OutputPtr output);
+
AtomBiosResult
atombios_lock_crtc(atomBiosHandlePtr atomBIOS, int crtc, int lock)
{
diff --git a/src/atombios_output.c b/src/atombios_output.c
index cb1a01ca..4634aebe 100644
--- a/src/atombios_output.c
+++ b/src/atombios_output.c
@@ -1065,7 +1065,6 @@ atombios_output_mode_set(xf86OutputPtr output,
DisplayModePtr adjusted_mode)
{
RADEONOutputPrivatePtr radeon_output = output->driver_private;
- RADEONInfoPtr info = RADEONPTR(output->scrn);
radeon_encoder_ptr radeon_encoder = radeon_get_encoder(output);
if (radeon_encoder == NULL)
diff --git a/src/legacy_output.c b/src/legacy_output.c
index 1a5fd092..8ec6db2a 100644
--- a/src/legacy_output.c
+++ b/src/legacy_output.c
@@ -55,6 +55,9 @@ static RADEONMonitorType radeon_detect_primary_dac(ScrnInfoPtr pScrn, Bool color
static RADEONMonitorType radeon_detect_tv_dac(ScrnInfoPtr pScrn, Bool color);
static RADEONMonitorType radeon_detect_ext_dac(ScrnInfoPtr pScrn);
+extern Bool
+RADEONI2CInit(xf86OutputPtr output, I2CBusPtr *bus_ptr, char *name, Bool dvo);
+
static const RADEONTMDSPll default_tmds_pll[CHIP_FAMILY_LAST][4] =
{
{{0, 0}, {0, 0}, {0, 0}, {0, 0}}, /*CHIP_FAMILY_UNKNOW*/
@@ -823,8 +826,7 @@ legacy_output_dpms(xf86OutputPtr output, int mode)
RADEONSavePtr save = info->ModeReg;
unsigned char * RADEONMMIO = info->MMIO;
unsigned long tmp;
- RADEONOutputPrivatePtr radeon_output;
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+ RADEONOutputPrivatePtr radeon_output = output->driver_private;
radeon_encoder_ptr radeon_encoder = radeon_get_encoder(output);
if (radeon_encoder == NULL)
diff --git a/src/radeon_atombios.h b/src/radeon_atombios.h
index a0163598..68df40d0 100644
--- a/src/radeon_atombios.h
+++ b/src/radeon_atombios.h
@@ -269,4 +269,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_ */
diff --git a/src/radeon_output.c b/src/radeon_output.c
index 349acd29..345252d1 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -1679,7 +1679,7 @@ static void RADEONI2CPutBits(I2CBusPtr b, int Clock, int data)
}
-static Bool
+Bool
RADEONI2CInit(xf86OutputPtr output, I2CBusPtr *bus_ptr, char *name, Bool dvo)
{
ScrnInfoPtr pScrn = output->scrn;