summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alex@cube.(none)>2008-03-06 13:35:43 -0500
committerAlex Deucher <alex@cube.(none)>2008-03-06 13:35:43 -0500
commit766f464dfdfccadef23e4232f2bce5db22195513 (patch)
tree322a6b8d4c75cd2192549b1b80ad7151415e5538
parenta842ce9ca6494e724a7828cead9b61c9ef02b6aa (diff)
RADEON: take 2 on proper pragma pack support for bsds
See bug 14594. Based on suggestion by Henry Zhao
-rw-r--r--configure.ac9
-rw-r--r--src/Makefile.am5
-rw-r--r--src/atombios_output.c2
3 files changed, 3 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac
index 83219158..b6443488 100644
--- a/configure.ac
+++ b/configure.ac
@@ -233,14 +233,9 @@ fi
AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
case $host_os in
- *freebsd*)
- AC_DEFINE(ALT_PRAGMA_PACK, 1, [Use alternate pragma pack]) ;;
- *netbsd*)
- AC_DEFINE(ALT_PRAGMA_PACK, 1, [Use alternate pragma pack]) ;;
- *openbsd*)
- AC_DEFINE(ALT_PRAGMA_PACK, 1, [Use alternate pragma pack]) ;;
+ *linux*)
+ AC_DEFINE(FGL_LINUX, 1, [Use linux pragma pack]) ;;
esac
-AM_CONDITIONAL(ALT_PRAGMA_PACK, test "x$ALT_PRAGMA_PACK" = xyes)
AC_SUBST([XORG_CFLAGS])
AC_SUBST([DRI_CFLAGS])
diff --git a/src/Makefile.am b/src/Makefile.am
index 6fe06952..53334951 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -66,11 +66,8 @@ if USE_EXA
RADEON_EXA_SOURCES = radeon_exa.c
endif
-if ALT_PRAGMA_PACK
AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XMODES_CFLAGS@ -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS -DATOM_BIOS -DATOM_BIOS_PARSER -DDRIVER_PARSER
-else
-AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XMODES_CFLAGS@ -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS -DATOM_BIOS -DATOM_BIOS_PARSER -DFGL_LINUX -DDRIVER_PARSER
-endif
+
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 8e0776d2..06e5a778 100644
--- a/src/atombios_output.c
+++ b/src/atombios_output.c
@@ -398,7 +398,6 @@ atombios_output_dig1_transmitter_setup(xf86OutputPtr output, DisplayModePtr mode
disp_data.ucAction = ATOM_TRANSMITTER_ACTION_ENABLE;
disp_data.usPixelClock = mode->Clock / 10;
- // not sure on clk src...
disp_data.ucConfig = ATOM_TRANSMITTER_CONFIG_DIG1_ENCODER | ATOM_TRANSMITTER_CONFIG_CLKSRC_PPLL;
if (mode->Clock > 165000)
disp_data.ucConfig |= (ATOM_TRANSMITTER_CONFIG_8LANE_LINK |
@@ -476,7 +475,6 @@ atombios_output_dig2_transmitter_setup(xf86OutputPtr output, DisplayModePtr mode
disp_data.ucAction = ATOM_TRANSMITTER_ACTION_ENABLE;
disp_data.usPixelClock = mode->Clock / 10;
- // not sure on clk src...
disp_data.ucConfig = ATOM_TRANSMITTER_CONFIG_DIG2_ENCODER | ATOM_TRANSMITTER_CONFIG_CLKSRC_PPLL;
if (mode->Clock > 165000)
disp_data.ucConfig |= (ATOM_TRANSMITTER_CONFIG_8LANE_LINK |