diff options
| -rw-r--r-- | ChangeLog | 68 | ||||
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/smi_driver.c | 9 |
4 files changed, 23 insertions, 73 deletions
diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index 46bee4b..0000000 --- a/ChangeLog +++ /dev/null @@ -1,68 +0,0 @@ -2006-04-07 Adam Jackson <ajax@freedesktop.org> - - * configure.ac: - * src/smi_driver.c: - Bump to 1.4.1 for Xv changes. - -2006-04-07 Aaron Plattner <aplattner@nvidia.com> - - * src/smi_video.c: (SMI_PutVideo), (SMI_PutImage): - Add a DrawablePtr argument to the XV functions to pave the way for - redirected video. - -2006-04-07 Adam Jackson <ajax@freedesktop.org> - - * configure.ac: - * src/smi.h: - * src/smi_dga.c: - * src/smi_driver.c: - * src/smi_i2c.c: - * src/smi_shadow.c: - Unlibcwrap. Bump server version requirement. Bump to 1.4.0. - -2006-02-08 Luc Verhaegen <libv@skynet.be> - - * src/smi.h: - * src/smi_driver.c: (SMI_PreInit), (SMI_ModeInit): - - Clean up insane pScrn->clock usage. - -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version for X11R7 release. - -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for final X11R7 release candidate. - -2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * man/Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. - -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for X11R7 RC3 release. - -2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Remove extraneous AC_MSG_RESULT. - -2005-11-29 Adam Jackson <ajax@freedesktop.org> - - * configure.ac: - Only build dlloader modules by default. - -2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for X11R7 RC2 release. - -2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update pkgcheck dependencies to work with separate build roots. diff --git a/Makefile.am b/Makefile.am index 4934358..d79e354 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,4 +21,13 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man -EXTRA_DIST = CALLMAP Release.txt +EXTRA_DIST = ChangeLog CALLMAP Release.txt + +MAINTAINERCLEANFILES=ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index c157792..99690c5 100644 --- a/configure.ac +++ b/configure.ac @@ -26,6 +26,11 @@ AC_INIT([xf86-video-siliconmotion], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-siliconmotion) +# Require xorg-macros version 1.2 or newer for XORG_CWARNFLAGS and +# XORG_CHANGELOG macros +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2.1 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2.1) + AC_CONFIG_SRCDIR([Makefile.am]) AM_CONFIG_HEADER([config.h]) AC_CONFIG_AUX_DIR(.) @@ -81,6 +86,8 @@ if test "x$XMODES" = xyes; then AC_DEFINE(HAVE_XMODES, 1, [X server has new mode code]) fi +XORG_CWARNFLAGS +XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS" AC_SUBST([XORG_CFLAGS]) AC_SUBST([moduledir]) @@ -89,6 +96,7 @@ AC_SUBST([DRIVER_NAME]) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([ Makefile diff --git a/src/smi_driver.c b/src/smi_driver.c index 12b618f..28cecf3 100644 --- a/src/smi_driver.c +++ b/src/smi_driver.c @@ -1247,10 +1247,8 @@ SMI_DetectMCLK(ScrnInfoPtr pScrn) if (IS_MSOC(pSmi)) { clock.value = READ_SCR(pSmi, CURRENT_CLOCK); if (xf86GetOptValFreq(pSmi->Options, OPTION_MXCLK, - OPTUNITS_MHZ, &real)) { + OPTUNITS_MHZ, &real)) pSmi->MXCLK = (int)(real * 1000.0); - mxclk = pSmi->MXCLK; - } } /* Already programmed MCLK */ @@ -1282,10 +1280,13 @@ SMI_DetectMCLK(ScrnInfoPtr pScrn) xf86DrvMsg(pScrn->scrnIndex, X_INFO, "MCLK = %1.3f\n", mclk / 1000.0); if (IS_MSOC(pSmi)) { - if (pSmi->MXCLK == 0) + if (pSmi->MXCLK == 0) { mxclk = ((clock.f.m1_select ? 336 : 288) / ((clock.f.m1_divider ? 3 : 1) << (unsigned)clock.f.m1_shift)) * 1000; + } + else + mxclk = pSmi->MXCLK; xf86DrvMsg(pScrn->scrnIndex, X_INFO, "MXCLK = %1.3f\n", mxclk / 1000.0); } } |