xf86-video-intel: 2 commits - configure.ac src/i810_dri.h src/i810_driver.c src/i810.h src/i830_dri.h

[Eric Anholt]

 configure.ac      |   10 ++++++++++
 src/i810.h        |    4 ----
 src/i810_dri.h    |    4 ++++
 src/i810_driver.c |    2 +-
 src/i830_dri.h    |   23 +++++++++++++++++++++--
 5 files changed, 36 insertions(+), 7 deletions(-)

New commits:
diff-tree 975e60261088dee124b329d28c64e508bce1f90b (from 820e9a22fdb759cbdaac4a488322825bc0908b0d)
Author: Eric Anholt <eric at anholt.net>
Date:   Thu Aug 10 13:49:43 2006 -0700

    Bug #7829: Fix reported driver version.
    
    The driver now reports itself as the PACKAGE_VERSION from autoconf.  The DRI
    DDX -> client interface version is dissociated from this so that we can do
    appropriate major/minor versioning of the interface that's not tied to the
    package version.  Bumped the i830 ddx dri version patchlevel to note the
    fix in the previous commit.

diff --git a/configure.ac b/configure.ac
index 74e676b..edd5d7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,16 @@ AC_INIT([xf86-video-i810],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-i810)
 
+AC_DEFINE_UNQUOTED([INTEL_VERSION_MAJOR],
+		   [$(echo $PACKAGE_VERSION | sed -e 's/^\([[0-9]]\)\.[[0-9]]\.[[0-9]]/\1/')],
+		   [Major version])
+AC_DEFINE_UNQUOTED([INTEL_VERSION_MINOR],
+		   [$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]]\.\([[0-9]]\)\.[[0-9]]/\1/')],
+		   [Minor version])
+AC_DEFINE_UNQUOTED([INTEL_VERSION_PATCH],
+		   [$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]]\.[[0-9]]\.\([[0-9]]\)/\1/')],
+		   [Patch version])
+
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_AUX_DIR(.)
diff --git a/src/i810.h b/src/i810.h
index 4237485..852a64a 100644
--- a/src/i810.h
+++ b/src/i810.h
@@ -64,10 +64,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #define I810_VERSION 4000
 #define I810_NAME "I810"
 #define I810_DRIVER_NAME "i810"
-#define I810_MAJOR_VERSION 1
-#define I810_MINOR_VERSION 6
-#define I810_PATCHLEVEL 3
-
 
 /* HWMC Surfaces */
 #define I810_MAX_SURFACES 7
diff --git a/src/i810_dri.h b/src/i810_dri.h
index 408a4eb..027a47a 100644
--- a/src/i810_dri.h
+++ b/src/i810_dri.h
@@ -8,6 +8,10 @@
 
 #define I810_MAX_DRAWABLES 256
 
+#define I810_MAJOR_VERSION 1
+#define I810_MINOR_VERSION 6
+#define I810_PATCHLEVEL 3
+
 typedef struct {
    drm_handle_t regs;
    drmSize regsSize;
diff --git a/src/i810_driver.c b/src/i810_driver.c
index 65136bf..3481d0b 100644
--- a/src/i810_driver.c
+++ b/src/i810_driver.c
@@ -379,7 +379,7 @@ static XF86ModuleVersionInfo i810VersRec
    MODINFOSTRING1,
    MODINFOSTRING2,
    XORG_VERSION_CURRENT,
-   I810_MAJOR_VERSION, I810_MINOR_VERSION, I810_PATCHLEVEL,
+   INTEL_VERSION_MAJOR, INTEL_VERSION_MINOR, INTEL_VERSION_PATCH,
    ABI_CLASS_VIDEODRV,
    ABI_VIDEODRV_VERSION,
    MOD_CLASS_VIDEODRV,
diff --git a/src/i830_dri.h b/src/i830_dri.h
index 44be353..41f8a90 100644
--- a/src/i830_dri.h
+++ b/src/i830_dri.h
@@ -10,7 +10,7 @@
 
 #define I830_MAJOR_VERSION 1
 #define I830_MINOR_VERSION 6
-#define I830_PATCHLEVEL 2
+#define I830_PATCHLEVEL 4
 
 #define I830_REG_SIZE 0x80000
 
diff-tree 820e9a22fdb759cbdaac4a488322825bc0908b0d (from caa3b35cd772fc75d65a7ff791f00addbb39a764)
Author: Eric Anholt <eric at anholt.net>
Date:   Thu Aug 10 13:37:18 2006 -0700

    Bug #7835: Restore unused fields in I830DRIRec to avoid i915 DRI breakage.
    
    As it was, 1.6.4 broke compatibility with the released DRI driver.

diff --git a/src/i830_dri.h b/src/i830_dri.h
index f97c1dd..44be353 100644
--- a/src/i830_dri.h
+++ b/src/i830_dri.h
@@ -3,7 +3,6 @@
 #ifndef _I830_DRI_H
 #define _I830_DRI_H
 
-#include "xf86dri.h"
 #include "xf86drm.h"
 #include "i830_common.h"
 
@@ -19,6 +18,21 @@ typedef struct _I830DRIRec {
    drm_handle_t regs;
    drmSize regsSize;
 
+   drmSize unused1; /* backbufferSize */
+   drm_handle_t unused2; /* backbuffer */
+
+   drmSize unused3; /* depthbufferSize */
+   drm_handle_t unused4; /* depthbuffer */
+
+   drmSize unused5; /* rotatedSize /*/
+   drm_handle_t unused6; /* rotatedbuffer */
+
+   drm_handle_t unused7; /* textures */
+   int unused8; /* textureSize */
+
+   drm_handle_t unused9; /* agp_buffers */
+   drmSize unused10; /* agp_buf_size */
+
    int deviceID;
    int width;
    int height;
@@ -26,6 +40,11 @@ typedef struct _I830DRIRec {
    int cpp;
    int bitsPerPixel;
 
+   int unused11[8]; /* was front/back/depth/rotated offset/pitch */
+
+   int unused12; /* logTextureGranularity */
+   int unused13; /* textureOffset */
+
    int irq;
    int sarea_priv_offset;
 } I830DRIRec, *I830DRIPtr;