xf86-video-ati: Branch 'master' - 2 commits
Michel Daenzer
daenzer at kemper.freedesktop.org
Thu Jan 3 08:57:00 PST 2008
man/radeon.man | 14 ++++++++------
src/AtomBios/Decoder.c | 2 +-
src/Makefile.am | 2 +-
src/atombios_output.c | 4 ++++
src/radeon_atombios.c | 9 +++++----
src/radeon_atombios.h | 2 +-
src/radeon_output.c | 9 +++++++--
7 files changed, 27 insertions(+), 15 deletions(-)
New commits:
commit c652208861bffca94f06b7f67688ce220e050bfb
Author: Michel Dänzer <michel at tungstengraphics.com>
Date: Thu Jan 3 17:54:58 2008 +0100
radeon: Adapt manpage to reality wrt AGP options.
diff --git a/man/radeon.man b/man/radeon.man
index 141342e..b8f4f93 100644
--- a/man/radeon.man
+++ b/man/radeon.man
@@ -154,26 +154,28 @@ The default value is either 1536 (for most chips) or 1920.
Set AGP data transfer rate.
(used only when DRI is enabled)
.br
-1 \-\- 1x (before AGPv3 only)
+1 \-\- 1x (before AGP v3 only)
.br
-2 \-\- 2x (before AGPv3 only)
+2 \-\- 2x (before AGP v3 only)
.br
4 \-\- 4x
.br
-8 \-\- 8x (AGPv3 only)
+8 \-\- 8x (AGP v3 only)
.br
others \-\- invalid
.br
The default is to
-.B leave it unchanged.
+.B leave it unchanged for AGP v3
+and
+.B 1x otherwise.
.TP
.BI "Option \*qAGPFastWrite\*q \*q" boolean \*q
Enable AGP fast writes. Enabling this is frequently the cause of
instability. Used only when the DRI is enabled. If you enable
this option you will get *NO* support from developers.
.br
-The default is to
-.B leave it unchanged.
+The default is
+.B off.
.TP
.BI "Option \*qBusType\*q \*q" string \*q
Used to replace previous ForcePCIMode option.
commit ab451e4b7a5423d61b57cf0646599267d8504af4
Author: Michel Dänzer <michel at tungstengraphics.com>
Date: Thu Jan 3 17:52:39 2008 +0100
radeon: Miscellaneous warning fixes.
diff --git a/src/AtomBios/Decoder.c b/src/AtomBios/Decoder.c
index 95908d5..cdaa9ef 100644
--- a/src/AtomBios/Decoder.c
+++ b/src/AtomBios/Decoder.c
@@ -46,7 +46,7 @@ Revision History:
-#define INDIRECT_IO_TABLE (((UINT16)&((ATOM_MASTER_LIST_OF_DATA_TABLES*)0)->IndirectIOAccess)/sizeof(TABLE_UNIT_TYPE) )
+#define INDIRECT_IO_TABLE (((UINT16)(ULONG_PTR)&((ATOM_MASTER_LIST_OF_DATA_TABLES*)0)->IndirectIOAccess)/sizeof(TABLE_UNIT_TYPE) )
extern COMMANDS_PROPERTIES CallTable[];
diff --git a/src/Makefile.am b/src/Makefile.am
index 7b25e4b..5e95dd7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -77,7 +77,7 @@ ATIMISC_EXA_SOURCES = atimach64exa.c
RADEON_EXA_SOURCES = radeon_exa.c
endif
-AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XMODES_CFLAGS@ -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS -DATOM_BIOS -DATOM_BIOS_PARSER
+AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XMODES_CFLAGS@ -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS -DATOM_BIOS -DATOM_BIOS_PARSER -DFGL_LINUX -DDRIVER_PARSER
INCLUDES = -I$(srcdir)/AtomBios/includes
ati_drv_la_LTLIBRARIES = ati_drv.la
diff --git a/src/atombios_output.c b/src/atombios_output.c
index 8098185..5ec3098 100644
--- a/src/atombios_output.c
+++ b/src/atombios_output.c
@@ -316,6 +316,8 @@ atombios_output_lvds_setup(xf86OutputPtr output, DisplayModePtr mode)
return ATOM_NOT_IMPLEMENTED;
}
+#if 0
+
static int
atombios_output_scaler_setup(xf86OutputPtr output, DisplayModePtr mode)
{
@@ -354,6 +356,8 @@ atombios_output_scaler_setup(xf86OutputPtr output, DisplayModePtr mode)
}
+#endif
+
static AtomBiosResult
atombios_display_device_control(atomBiosHandlePtr atomBIOS, int device, Bool state)
{
diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index b352a56..7cf0556 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -36,9 +36,6 @@
#include "radeon_macros.h"
#include "xorg-server.h"
-#if XSERVER_LIBPCIACCESS
-#warning pciaccess defined
-#endif
/* only for testing now */
#include "xf86DDC.h"
@@ -190,6 +187,8 @@ enum {
# define LOG_CAIL LOG_DEBUG + 1
+#if 0
+
static void
RHDDebug(int scrnIndex, const char *format, ...)
{
@@ -210,6 +209,8 @@ RHDDebugCont(const char *format, ...)
va_end(ap);
}
+#endif
+
static void
CailDebug(int scrnIndex, const char *format, ...)
{
@@ -1644,7 +1645,7 @@ RADEONGetATOMTVInfo(xf86OutputPtr output)
}
Bool
-RADEONATOMGetTVTimings(ScrnInfoPtr pScrn, int index, SET_CRTC_TIMING_PARAMETERS_PS_ALLOCATION *crtc_timing, uint32_t *pixel_clock)
+RADEONATOMGetTVTimings(ScrnInfoPtr pScrn, int index, SET_CRTC_TIMING_PARAMETERS_PS_ALLOCATION *crtc_timing, int32_t *pixel_clock)
{
RADEONInfoPtr info = RADEONPTR(pScrn);
ATOM_ANALOG_TV_INFO *tv_info;
diff --git a/src/radeon_atombios.h b/src/radeon_atombios.h
index 4b15ec1..9cb279e 100644
--- a/src/radeon_atombios.h
+++ b/src/radeon_atombios.h
@@ -248,6 +248,6 @@ typedef struct _atomBiosHandle {
# endif
extern Bool
-RADEONATOMGetTVTimings(ScrnInfoPtr pScrn, int index, SET_CRTC_TIMING_PARAMETERS_PS_ALLOCATION *crtc_timing, uint32_t *pixel_clock);
+RADEONATOMGetTVTimings(ScrnInfoPtr pScrn, int index, SET_CRTC_TIMING_PARAMETERS_PS_ALLOCATION *crtc_timing, int32_t *pixel_clock);
#endif /* RHD_ATOMBIOS_H_ */
diff --git a/src/radeon_output.c b/src/radeon_output.c
index ec4f3dc..c1a0ba8 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -2254,23 +2254,28 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn)
optstr = (char *)xf86GetOptValString(info->Options, OPTION_CONNECTORTABLE);
if (optstr) {
+ unsigned int ddc_line[2];
+
for (i = 2; i < RADEON_MAX_BIOS_CONNECTOR; i++) {
info->BiosConnector[i].valid = FALSE;
}
info->BiosConnector[0].valid = TRUE;
info->BiosConnector[1].valid = TRUE;
if (sscanf(optstr, "%u,%d,%d,%u,%u,%d,%d,%u",
- (unsigned int *)&info->BiosConnector[0].ddc_line,
+ &ddc_line[0],
&info->BiosConnector[0].DACType,
&info->BiosConnector[0].TMDSType,
&info->BiosConnector[0].ConnectorType,
- (unsigned int *)&info->BiosConnector[1].ddc_line,
+ &ddc_line[1],
&info->BiosConnector[1].DACType,
&info->BiosConnector[1].TMDSType,
&info->BiosConnector[1].ConnectorType) != 8) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Invalid ConnectorTable option: %s\n", optstr);
return FALSE;
}
+
+ info->BiosConnector[0].ddc_line = ddc_line[0];
+ info->BiosConnector[1].ddc_line = ddc_line[1];
}
info->tvdac_use_count = 0;
More information about the xorg-commit
mailing list