xorg-driver-video-intel-2.4.97.0-uxa.patch

   1 diff -urN xf86-video-intel-2.4.97.0.orig/src/i830_exa.c xf86-video-intel-2.4.97.0/src/i830_exa.c
   2 --- xf86-video-intel-2.4.97.0.orig/src/i830_exa.c       2008-08-21 18:36:09.000000000 +0200
   3 +++ xf86-video-intel-2.4.97.0/src/i830_exa.c    2008-09-20 23:42:31.000000000 +0200
   4 @@ -731,12 +731,12 @@
   5      return TRUE;
   6  }
   7
   8 -static DevPrivateKey   uxa_pixmap_key = &uxa_pixmap_key;
   9 +static int uxa_pixmap_index;
  10
  11  static void
  12  i830_uxa_set_pixmap_bo (PixmapPtr pixmap, dri_bo *bo)
  13  {
  14 -    dixSetPrivate(&pixmap->devPrivates, uxa_pixmap_key, bo);
  15 +    dixSetPrivate(&pixmap->devPrivates, &uxa_pixmap_index, bo);
  16  }
  17
  18  dri_bo *
  19 @@ -747,7 +747,7 @@
  20      I830Ptr i830 = I830PTR(scrn);
  21
  22      if (i830->accel == ACCEL_UXA) {
  23 -       return dixLookupPrivate(&pixmap->devPrivates, uxa_pixmap_key);
  24 +       return dixLookupPrivate(&pixmap->devPrivates, &uxa_pixmap_index);
  25      } else if (i830->accel == ACCEL_EXA) {
  26         struct i830_exa_pixmap_priv *driver_priv =
  27             exaGetPixmapDriverPrivate(pixmap);
  28 @@ -879,7 +879,7 @@
  29      ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
  30      I830Ptr i830 = I830PTR(scrn);
  31
  32 -    if (!dixRequestPrivate(uxa_pixmap_key, 0))
  33 +    if (!dixRequestPrivate(&uxa_pixmap_index, 0))
  34         return FALSE;
  35
  36      i830->uxa_driver = uxa_driver_alloc();
  37 diff -urN xf86-video-intel-2.4.97.0.orig/uxa/uxa.c xf86-video-intel-2.4.97.0/uxa/uxa.c
  38 --- xf86-video-intel-2.4.97.0.orig/uxa/uxa.c    2008-08-19 19:45:36.000000000 +0200
  39 +++ xf86-video-intel-2.4.97.0/uxa/uxa.c 2008-09-20 23:44:36.000000000 +0200
  40 @@ -39,7 +39,7 @@
  41  #include "dixfontstr.h"
  42  #include "uxa.h"
  43
  44 -DevPrivateKey uxa_screen_key = &uxa_screen_key;
  45 +int uxa_screen_index;
  46
  47  /**
  48   * uxa_get_drawable_pixmap() returns a backing pixmap for a given drawable.
  49 @@ -422,7 +422,7 @@
  50
  51      uxa_screen->info = uxa_driver;
  52
  53 -    dixSetPrivate(&screen->devPrivates, uxa_screen_key, uxa_screen);
  54 +    dixSetPrivate(&screen->devPrivates, &uxa_screen_index, uxa_screen);
  55
  56  //    exaDDXDriverInit(screen);
  57
  58 diff -urN xf86-video-intel-2.4.97.0.orig/uxa/uxa-priv.h xf86-video-intel-2.4.97.0/uxa/uxa-priv.h
  59 --- xf86-video-intel-2.4.97.0.orig/uxa/uxa-priv.h       2008-08-19 19:45:36.000000000 +0200
  60 +++ xf86-video-intel-2.4.97.0/uxa/uxa-priv.h    2008-09-20 23:43:53.000000000 +0200
  61 @@ -155,8 +155,8 @@
  62      (PixmapWidthPaddingInfo[d].padRoundUp+1)))
  63  #endif
  64
  65 -extern DevPrivateKey uxa_screen_key;
  66 -#define uxa_get_screen(s) ((uxa_screen_t *)dixLookupPrivate(&(s)->devPrivates, uxa_screen_key))
  67 +extern int uxa_screen_index;
  68 +#define uxa_get_screen(s) ((uxa_screen_t *)dixLookupPrivate(&(s)->devPrivates, &uxa_screen_index))
  69
  70  /** Align an offset to an arbitrary alignment */
  71  #define UXA_ALIGN(offset, align) (((offset) + (align) - 1) - \