xf86-video-intel: src/i830_driver.c src/i830.h

[Carl Worth]

On Mon, 2009-03-16 at 08:42 -0700, Keith Packard wrote:
> src/i830.h        |    1 -
>  src/i830_driver.c |    5 -----
>  2 files changed, 6 deletions(-)
> 
> New commits:
> commit 78a60e1b66fe2e8449702dd43d9b062d279af8f1
> Author: Keith Packard <keithp at keithp.com>
> Date:   Mon Mar 16 08:41:52 2009 -0700
> 
>     Revert EXA_DRIVER_KNOWN_MAJOR bump
>     
>     This was mistakenly added in the unrelated change in revision
>     fe08b81d0f5d6f96e0124e6286bd24aba6e140ad

Hi Keith,

Did you intend to also revert the following hunk, but just missed it?

-Carl

diff --git a/src/i830_exa.c b/src/i830_exa.c
index 0a22486..18d8cde 100644
--- a/src/i830_exa.c
+++ b/src/i830_exa.c
@@ -675,6 +675,10 @@ I830EXAInit(ScreenPtr pScreen)
     memset(pI830->EXADriverPtr, 0, sizeof(*pI830->EXADriverPtr));
 
     pI830->bufferOffset = 0;
+#if EXA_VERSION_MAJOR > 2
+    pI830->EXADriverPtr->exa_major = 3;
+    pI830->EXADriverPtr->exa_minor = 0;
+#else
     pI830->EXADriverPtr->exa_major = 2;
     /* If compiled against EXA 2.2, require 2.2 so we can use the
      * PixmapIsOffscreen hook.
@@ -687,6 +691,7 @@ I830EXAInit(ScreenPtr pScreen)
               "EXA compatibility mode.  Output rotation rendering "
               "performance may suffer\n");
 #endif
+#endif
     if (!pI830->use_drm_mode) {
        pI830->EXADriverPtr->memoryBase = pI830->FbBase;
        if (pI830->exa_offscreen) {

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : http://lists.freedesktop.org/archives/xorg-commit/attachments/20090316/d9395fae/attachment.pgp