sis-git.patch

   1 diff --git a/src/sis.h b/src/sis.h
   2 index 46fca2a..20e6134 100644
   3 --- a/src/sis.h
   4 +++ b/src/sis.h
   5 @@ -75,7 +75,6 @@
   6
   7  #include "compiler.h"
   8  #include "xf86Pci.h"
   9 -#include "xf86Priv.h"
  10  #include "xf86_OSproc.h"
  11  #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
  12  #include "xf86Resources.h"
  13 diff --git a/src/sis_driver.c b/src/sis_driver.c
  14 index 61e8075..0fd83d7 100644
  15 --- a/src/sis_driver.c
  16 +++ b/src/sis_driver.c
  17 @@ -57,7 +57,6 @@
  18  #include "fb.h"
  19  #include "micmap.h"
  20  #include "mipointer.h"
  21 -#include "mibstore.h"
  22  #include "edid.h"
  23
  24  #define SIS_NEED_inSISREG
  25 @@ -94,6 +93,10 @@
  26  #include "dri.h"
  27  #endif
  28
  29 +#ifndef DEFAULT_DPI
  30 +#define DEFAULT_DPI 96
  31 +#endif
  32 +
  33  /*
  34   * LookupWindow was removed with video abi 11.
  35   */
  36 @@ -7344,7 +7347,11 @@ SISUnmapMem(ScrnInfoPtr pScrn)
  37          if(pSiSEnt->MapCountIOBase) {
  38             pSiSEnt->MapCountIOBase--;
  39             if((pSiSEnt->MapCountIOBase == 0) || (pSiSEnt->forceUnmapIOBase)) {
  40 +#ifndef XSERVER_LIBPCIACCESS
  41                 xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOBase, (pSiS->mmioSize * 1024));
  42 +#else
  43 +               pci_device_unmap_range(pSiS->PciInfo, pSiSEnt->IOBase, (pSiS->mmioSize * 1024));
  44 +#endif
  45                 pSiSEnt->IOBase = NULL;
  46                 pSiSEnt->MapCountIOBase = 0;
  47                 pSiSEnt->forceUnmapIOBase = FALSE;
  48 @@ -7355,7 +7362,11 @@ SISUnmapMem(ScrnInfoPtr pScrn)
  49         if(pSiSEnt->MapCountIOBaseDense) {
  50             pSiSEnt->MapCountIOBaseDense--;
  51             if((pSiSEnt->MapCountIOBaseDense == 0) || (pSiSEnt->forceUnmapIOBaseDense)) {
  52 +#ifndef XSERVER_LIBPCIACCESS
  53                 xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024));
  54 +#else
  55 +               pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024));
  56 +#endif
  57                 pSiSEnt->IOBaseDense = NULL;
  58                 pSiSEnt->MapCountIOBaseDense = 0;
  59                 pSiSEnt->forceUnmapIOBaseDense = FALSE;
  60 @@ -7366,7 +7377,11 @@ SISUnmapMem(ScrnInfoPtr pScrn)
  61         if(pSiSEnt->MapCountFbBase) {
  62             pSiSEnt->MapCountFbBase--;
  63             if((pSiSEnt->MapCountFbBase == 0) || (pSiSEnt->forceUnmapFbBase)) {
  64 +#ifndef XSERVER_LIBPCIACCESS
  65                 xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->RealFbBase, pSiS->FbMapSize);
  66 +#else
  67 +               pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiSEnt->RealFbBase, pSiS->FbMapSize);
  68 +#endif
  69                 pSiSEnt->FbBase = pSiSEnt->RealFbBase = NULL;
  70                 pSiSEnt->MapCountFbBase = 0;
  71                 pSiSEnt->forceUnmapFbBase = FALSE;
  72 @@ -7376,13 +7391,25 @@ SISUnmapMem(ScrnInfoPtr pScrn)
  73         }
  74      } else {
  75  #endif
  76 +#ifndef XSERVER_LIBPCIACCESS
  77         xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->IOBase, (pSiS->mmioSize * 1024));
  78 +#else
  79 +       pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->IOBase, (pSiS->mmioSize * 1024));
  80 +#endif
  81         pSiS->IOBase = NULL;
  82  #ifdef __alpha__
  83 +#ifndef XSERVER_LIBPCIACCESS
  84         xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->IOBaseDense, (pSiS->mmioSize * 1024));
  85 +#else
  86 +       pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->IOBaseDense, (pSiS->mmioSize * 1024));
  87 +#endif
  88         pSiS->IOBaseDense = NULL;
  89  #endif
  90 +#ifndef XSERVER_LIBPCIACCESS
  91         xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->RealFbBase, pSiS->FbMapSize);
  92 +#else
  93 +       pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->RealFbBase, pSiS->FbMapSize);
  94 +#endif
  95         pSiS->FbBase = pSiS->RealFbBase = NULL;
  96  #ifdef SISDUALHEAD
  97      }
  98 @@ -8859,7 +8886,6 @@ SISScreenInit(SCREEN_INIT_ARGS_DECL)
  99      }
 100      pSiS->SiSFastVidCopyDone = TRUE;
 101
 102 -    miInitializeBackingStore(pScreen);
 103      xf86SetBackingStore(pScreen);
 104      xf86SetSilkenMouse(pScreen);
 105
 106 @@ -9352,7 +9378,14 @@ SISMergedPointerMoved(SCRN_ARG_TYPE arg, int x, int y)
 107       }
 108       if(doit) {
 109         sigstate = xf86BlockSIGIO();
 110 -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15
 111 +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 18
 112 +        {
 113 +            double dx = x, dy = y;
 114 +            miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy, NULL, NULL);
 115 +            x = (int)dx;
 116 +            y = (int)dy;
 117 +        }
 118 +#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15
 119          {
 120              double dx = x, dy = y;
 121              miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy);