xserver-xorg-video-siliconmotion: Changes to 'upstream-experimental'
configure.ac | 14 +++++
man/Makefile.am | 1
src/Makefile.am | 1
src/regsmi.h | 1
src/smi.h | 5 +-
src/smi_accel.c | 1
src/smi_dac.c | 1
src/smi_dga.c | 1
src/smi_driver.c | 59 +++++++++++++++++++------
src/smi_hwcurs.c | 1
src/smi_i2c.c | 1
src/smi_pcirename.h | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++
src/smi_shadow.c | 1
src/smi_video.c | 2
src/smi_video.h | 1
15 files changed, 185 insertions(+), 27 deletions(-)
New commits:
commit 7cfecd313aaea74ad5675c53b4d0099d6e9dec39
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 19 15:26:14 2008 -0400
siliconmotion 1.6.0
diff --git a/configure.ac b/configure.ac
index ad1ba4c..b736ef7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-siliconmotion],
- 1.5.1,
+ 1.6.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-siliconmotion)
commit c0e80b14a8af7c9df44919b2df58030e59ecbf88
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 19 15:25:23 2008 -0400
Fix distcheck
diff --git a/src/Makefile.am b/src/Makefile.am
index 869f852..7cdf9ab 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,6 +39,7 @@ siliconmotion_drv_la_SOURCES = \
smi.h \
smi_hwcurs.c \
smi_i2c.c \
+ smi_pcirename.h \
smi_shadow.c \
smi_video.c \
smi_video.h
commit e53d07525952e1281170db01c48d7a14a6983049
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 19 15:24:11 2008 -0400
Death to RCS tags.
diff --git a/src/regsmi.h b/src/regsmi.h
index 8319d5b..c5af8cc 100644
--- a/src/regsmi.h
+++ b/src/regsmi.h
@@ -26,7 +26,6 @@ Silicon Motion shall not be used in advertising or otherwise to promote the
sale, use or other dealings in this Software without prior written
authorization from the XFree86 Project and SIlicon Motion.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/regsmi.h,v 1.2 2002/01/25 21:56:09 tsi Exp $ */
#ifndef _REGSMI_H
#define _REGSMI_H
diff --git a/src/smi.h b/src/smi.h
index 75e4554..c785fa0 100644
--- a/src/smi.h
+++ b/src/smi.h
@@ -26,7 +26,6 @@ Silicon Motion shall not be used in advertising or otherwise to promote the
sale, use or other dealings in this Software without prior written
authorization from the XFree86 Project and Silicon Motion.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi.h,v 1.12tsi Exp $ */
#ifndef _SMI_H
#define _SMI_H
diff --git a/src/smi_accel.c b/src/smi_accel.c
index 40c530a..5cdadc0 100644
--- a/src/smi_accel.c
+++ b/src/smi_accel.c
@@ -26,7 +26,6 @@ Silicon Motion shall not be used in advertising or otherwise to promote the
sale, use or other dealings in this Software without prior written
authorization from the XFree86 Project and silicon Motion.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_accel.c,v 1.7tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/smi_dac.c b/src/smi_dac.c
index ac73323..a5cfd77 100644
--- a/src/smi_dac.c
+++ b/src/smi_dac.c
@@ -26,7 +26,6 @@ Silicon Motion shall not be used in advertising or otherwise to promote the
sale, use or other dealings in this Software without prior written
authorization from the XFree86 Project and Silicon Motion.
*/
-/* $XFree86$ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/smi_dga.c b/src/smi_dga.c
index 504b700..a51b0b1 100644
--- a/src/smi_dga.c
+++ b/src/smi_dga.c
@@ -26,7 +26,6 @@ Silicon Motion shall not be used in advertising or otherwise to promote the
sale, use or other dealings in this Software without prior written
authorization from the XFree86 Project and Silicon Motion.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_dga.c,v 1.1 2000/11/28 20:59:19 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/smi_driver.c b/src/smi_driver.c
index 11a3ef4..ec2af1a 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -26,7 +26,6 @@ Silicon Motion shall not be used in advertising or otherwise to promote the
sale, use or other dealings in this Software without prior written
authorization from The XFree86 Project or Silicon Motion.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_driver.c,v 1.36tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/smi_hwcurs.c b/src/smi_hwcurs.c
index ef55896..b48a409 100644
--- a/src/smi_hwcurs.c
+++ b/src/smi_hwcurs.c
@@ -26,7 +26,6 @@ Silicon Motion shall not be used in advertising or otherwise to promote the
sale, use or other dealings in this Software without prior written
authorization from the XFree86 Project and Silicon Motion.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_hwcurs.c,v 1.1 2000/11/28 20:59:20 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/smi_i2c.c b/src/smi_i2c.c
index 959b5b6..a829463 100644
--- a/src/smi_i2c.c
+++ b/src/smi_i2c.c
@@ -26,7 +26,6 @@ Silicon Motion shall not be used in advertising or otherwise to promote the
sale, use or other dealings in this Software without prior written
authorization from the XFree86 Project and Silicon Motion.
*/
-/* $XFree86$ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/smi_shadow.c b/src/smi_shadow.c
index 5b6e65a..dcfa16a 100644
--- a/src/smi_shadow.c
+++ b/src/smi_shadow.c
@@ -26,7 +26,6 @@ Silicon Motion shall not be used in advertising or otherwise to promote the
sale, use or other dealings in this Software without prior written
authorization from the XFree86 Project and Silicon Motion.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_shadow.c,v 1.1 2000/11/28 20:59:20 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/smi_video.c b/src/smi_video.c
index 8ea1114..b00b8da 100644
--- a/src/smi_video.c
+++ b/src/smi_video.c
@@ -41,8 +41,6 @@ Author of changes: Corvin Zahn <zahn@zac.de>
Date: 2.11.2001
*/
-/* $XdotOrg: driver/xf86-video-siliconmotion/src/smi_video.c,v 1.5 2005/07/11 02:29:59 ajax Exp $ */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_video.c,v 1.13 2003/11/10 18:22:26 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/smi_video.h b/src/smi_video.h
index 13c0ace..03195a7 100644
--- a/src/smi_video.h
+++ b/src/smi_video.h
@@ -26,7 +26,6 @@ Silicon Motion shall not be used in advertising or otherwise to promote the
sale, use or other dealings in this Software without prior written
authorization from the XFree86 Project and silicon Motion.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_video.h,v 1.4 2002/09/16 18:06:01 eich Exp $ */
#ifndef _SMI_VIDEO_H
#define _SMI_VIDEO_H
commit 46e68bf899754f6f70a0f5a7b0d42c5e208aaa5a
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Mar 10 13:53:00 2008 +1000
smi: add pciaccess support
diff --git a/configure.ac b/configure.ac
index a5fde7a..ad1ba4c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,10 +58,22 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_M
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+ [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+ [#include "xorg-server.h"])
+CPPFLAGS="$SAVE_CPPFLAGS"
# Checks for header files.
AC_HEADER_STDC
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+ XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
diff --git a/src/smi.h b/src/smi.h
index 88aa65a..75e4554 100644
--- a/src/smi.h
+++ b/src/smi.h
@@ -31,6 +31,8 @@ authorization from the XFree86 Project and Silicon Motion.
#ifndef _SMI_H
#define _SMI_H
+#include "smi_pcirename.h"
+
#include <string.h>
#include <stdio.h>
@@ -187,7 +189,9 @@ typedef struct
Bool useEXA; /* enable exa acceleration */
pciVideoPtr PciInfo; /* PCI info vars */
+#ifndef XSERVER_LIBPCIACCESS
PCITAG PciTag;
+#endif
int Chipset; /* Chip info, set using PCI
above */
int ChipRev;
diff --git a/src/smi_driver.c b/src/smi_driver.c
index 118228f..11a3ef4 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -447,10 +447,12 @@ SMI_Probe(DriverPtr drv, int flags)
return FALSE;
}
+#ifndef XSERVER_LIBPCIACCESS
if (xf86GetPciVideoInfo() == NULL) {
LEAVE_PROC("SMI_Probe");
return FALSE;
}
+#endif
numUsed = xf86MatchPciInstances(SILICONMOTION_NAME, PCI_SMI_VENDOR_ID,
SMIChipsets, SMIPciChipsets, devSections,
@@ -821,7 +823,7 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags)
pSmi->Chipset);
} else {
from = X_PROBED;
- pSmi->Chipset = pSmi->PciInfo->chipType;
+ pSmi->Chipset = PCI_DEV_DEVICE_ID(pSmi->PciInfo);
pScrn->chipset = (char *) xf86TokenToString(SMIChipsets, pSmi->Chipset);
}
@@ -830,7 +832,7 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags)
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n",
pSmi->ChipRev);
} else {
- pSmi->ChipRev = pSmi->PciInfo->chipRev;
+ pSmi->ChipRev = PCI_DEV_REVISION(pSmi->PciInfo);
}
xfree(pEnt);
@@ -854,8 +856,10 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags)
xf86DrvMsg(pScrn->scrnIndex, from, "Chipset: \"%s\"\n", pScrn->chipset);
+#ifndef XSERVER_LIBPCIACCESS
pSmi->PciTag = pciTag(pSmi->PciInfo->bus, pSmi->PciInfo->device,
pSmi->PciInfo->func);
+#endif
pSmi->Dualhead = FALSE;
if (xf86ReturnOptValBool(pSmi->Options, OPTION_DUALHEAD, FALSE) &&
@@ -1785,30 +1789,43 @@ SMI_MapMem(ScrnInfoPtr pScrn)
/* Map the Lynx register space */
switch (pSmi->Chipset) {
default:
- memBase = pSmi->PciInfo->memBase[0] + 0x400000;
+ memBase = PCI_REGION_BASE(pSmi->PciInfo, 0, REGION_MEM) + 0x400000;
pSmi->MapSize = 0x10000;
break;
case SMI_COUGAR3DR:
- memBase = pSmi->PciInfo->memBase[1];
+ memBase = PCI_REGION_BASE(pSmi->PciInfo, 1, REGION_MEM);
pSmi->MapSize = 0x200000;
break;
case SMI_LYNX3D:
- memBase = pSmi->PciInfo->memBase[0] + 0x680000;
+ memBase = PCI_REGION_BASE(pSmi->PciInfo, 0, REGION_MEM) + 0x680000;
pSmi->MapSize = 0x180000;
break;
case SMI_LYNXEM:
case SMI_LYNXEMplus:
- memBase = pSmi->PciInfo->memBase[0] + 0x400000;
+ memBase = PCI_REGION_BASE(pSmi->PciInfo, 0, REGION_MEM) + 0x400000;
pSmi->MapSize = 0x400000;
break;
case SMI_LYNX3DM:
- memBase = pSmi->PciInfo->memBase[0];
+ memBase = PCI_REGION_BASE(pSmi->PciInfo, 0, REGION_MEM);
pSmi->MapSize = 0x200000;
break;
}
+#ifndef XSERVER_LIBPCIACCESS
pSmi->MapBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO, pSmi->PciTag,
memBase, pSmi->MapSize);
-
+#else
+ {
+ void** result = (void**)&pSmi->MapBase;
+ int err = pci_device_map_range(pSmi->PciInfo,
+ memBase,
+ pSmi->MapSize,
+ PCI_DEV_MAP_FLAG_WRITABLE,
+ result);
+
+ if (err)
+ return FALSE;
+ }
+#endif
if (pSmi->MapBase == NULL) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Internal error: could not map "
"MMIO registers.\n");
@@ -1872,7 +1889,7 @@ SMI_MapMem(ScrnInfoPtr pScrn)
"DataPort=%p - %p\n", pSmi->DataPortBase,
pSmi->DataPortBase + pSmi->DataPortSize - 1);
- pScrn->memPhysBase = pSmi->PciInfo->memBase[0];
+ pScrn->memPhysBase = PCI_REGION_BASE(pSmi->PciInfo, 0, REGION_MEM);
SMI_EnableMmio(pScrn);
@@ -1887,11 +1904,26 @@ SMI_MapMem(ScrnInfoPtr pScrn)
pScrn->fbOffset = pSmi->FBOffset + pSmi->fbMapOffset;
+#ifndef XSERVER_LIBPCIACCESS
pSmi->FBBase = xf86MapPciMem(pScrn->scrnIndex,
VIDMEM_FRAMEBUFFER,
pSmi->PciTag,
pScrn->memPhysBase + pSmi->fbMapOffset,
pSmi->videoRAMBytes);
+#else
+ {
+ void** result = (void**)&pSmi->FBBase;
+ int err = pci_device_map_range(pSmi->PciInfo,
+ pScrn->memPhysBase + pSmi->fbMapOffset,
+ pSmi->videoRAMBytes,
+ PCI_DEV_MAP_FLAG_WRITABLE |
+ PCI_DEV_MAP_FLAG_WRITE_COMBINE,
+ result);
+
+ if (err)
+ return FALSE;
+ }
+#endif
if (pSmi->FBBase == NULL) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Internal error: could not "
diff --git a/src/smi_pcirename.h b/src/smi_pcirename.h
new file mode 100644
index 0000000..9321046
--- /dev/null
+++ b/src/smi_pcirename.h
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2007 George Sapountzis
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * Macros for porting drivers from legacy xfree86 PCI code to the pciaccess
+ * library. The main purpose being to facilitate source code compatibility.
+ */
+
+#ifndef S3PCIRENAME_H
+#define S3PCIRENAME_H
+
+enum region_type {
+ REGION_MEM,
+ REGION_IO
+};
+
+#ifndef XSERVER_LIBPCIACCESS
+
+/* pciVideoPtr */
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->chipType)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->chipRev)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subsysVendor)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subsysCard)
+
+#define PCI_DEV_TAG(_pcidev) pciTag((_pcidev)->bus, \
+ (_pcidev)->device, \
+ (_pcidev)->func)
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->device)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pciConfigPtr */
+#define PCI_CFG_TAG(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->tag)
+#define PCI_CFG_BUS(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->busnum)
+#define PCI_CFG_DEV(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->devnum)
+#define PCI_CFG_FUNC(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->funcnum)
+
+/* region addr: xfree86 uses different fields for memory regions and I/O ports */
+#define PCI_REGION_BASE(_pcidev, _b, _type) \
+ (((_type) == REGION_MEM) ? (_pcidev)->memBase[(_b)] \
+ : (_pcidev)->ioBase[(_b)])
+
+/* region size: xfree86 uses the log2 of the region size,
+ * but with zero meaning no region, not size of one XXX */
+#define PCI_REGION_SIZE(_pcidev, _b) \
+ (((_pcidev)->size[(_b)] > 0) ? (1 << (_pcidev)->size[(_b)]) : 0)
+
+/* read/write PCI configuration space */
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadByte(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadLong(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pciWriteLong(PCI_CFG_TAG(_pcidev), (_offset), (_value))
+
+#else /* XSERVER_LIBPCIACCESS */
+
+typedef struct pci_device *pciVideoPtr;
+
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor_id)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->device_id)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->revision)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subvendor_id)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subdevice_id)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_DEV_TAG(_pcidev) (_pcidev)
+
+/* PCI_DEV macros, typically used in printf's, add domain ? XXX */
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_CFG_TAG(_pcidev) (_pcidev)
+
+/* PCI_CFG macros, typically used in DRI init, contain the domain */
+#define PCI_CFG_BUS(_pcidev) (((_pcidev)->domain << 8) | \
+ (_pcidev)->bus)
+#define PCI_CFG_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_CFG_FUNC(_pcidev) ((_pcidev)->func)
+
+#define PCI_REGION_BASE(_pcidev, _b, _type) ((_pcidev)->regions[(_b)].base_addr)
+#define PCI_REGION_SIZE(_pcidev, _b) ((_pcidev)->regions[(_b)].size)
+
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u8((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u32((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pci_device_cfg_write_u32((_pcidev), (_value), (_offset))
+
+#endif /* XSERVER_LIBPCIACCESS */
+
+#endif /* CIRPCIRENAME_H */
commit 75182ca115cba8fcf31304aea88ca3d4b9aa66ac
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat Mar 8 23:49:58 2008 +0100
Makefile.am: nuke RCS Id
diff --git a/man/Makefile.am b/man/Makefile.am
index bf7ec17..f0eb29b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
commit ae556406ab6c4de410b68b3c8bcebb434b3efc9d
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Aug 7 10:00:25 2007 +0200
Define SILICONMOTION_VERSION* using PACKAGE_VERSION*
diff --git a/src/smi_driver.c b/src/smi_driver.c
index 5c7124f..118228f 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -89,10 +89,10 @@ static void SMI_DetectPanelSize(ScrnInfoPtr pScrn);
#define SILICONMOTION_NAME "Silicon Motion"
#define SILICONMOTION_DRIVER_NAME "siliconmotion"
-#define SILICONMOTION_VERSION_NAME "1.4.1"
-#define SILICONMOTION_VERSION_MAJOR 1
-#define SILICONMOTION_VERSION_MINOR 4
-#define SILICONMOTION_PATCHLEVEL 1
+#define SILICONMOTION_VERSION_NAME PACKAGE_VERSION
+#define SILICONMOTION_VERSION_MAJOR PACKAGE_VERSION_MAJOR
+#define SILICONMOTION_VERSION_MINOR PACKAGE_VERSION_MINOR
+#define SILICONMOTION_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
#define SILICONMOTION_DRIVER_VERSION ((SILICONMOTION_VERSION_MAJOR << 24) | \
(SILICONMOTION_VERSION_MINOR << 16) | \
(SILICONMOTION_PATCHLEVEL))
Reply to: