← Back to branch summary

~ubuntu-branches/debian/squeeze/xserver-xorg-video-voodoo/squeeze

« back to all changes in this revision

Viewing changes to src/voodoo_driver.c

  • Committer: Bazaar Package Importer
  • Author(s): Julien Cristau
  • Date: 2009-04-09 13:29:08 UTC
  • mfrom: (1.1.10 upstream) (0.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20090409132908-r0t99gdhinm4ul66
* Run autoreconf on build.
* Allow parallel builds.
* New upstream release.
* Upload to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/voodoo_driver.c
47
47
#include "fb.h"
48
48
#include "mibank.h"
49
49
#include "micmap.h"
 
50
#include "mipointer.h"
50
51
#include "xf86.h"
51
52
#include "xf86_OSproc.h"
52
 
#include "xf86Version.h"
 
53
#include "xorgVersion.h"
53
54
#include "xf86PciInfo.h"
54
55
#include "xf86Pci.h"
55
56
#include "xf86cmap.h"
56
57
#include "shadowfb.h"
57
58
#include "vgaHW.h"
58
 
#include "xf86DDC.h"
59
59
#include "xf86RAC.h"
60
60
#include "xf86Resources.h"
61
61
#include "compiler.h"
110
110
 
111
111
typedef enum {
112
112
  OPTION_NOACCEL,
113
 
  OPTION_SHADOW_FB
 
113
  OPTION_SHADOW_FB,
 
114
  OPTION_PASS_THROUGH,
114
115
} VoodooOpts;
115
116
 
116
117
static const OptionInfoRec VoodooOptions[] = {
117
118
  { OPTION_NOACCEL,     "NoAccel",      OPTV_BOOLEAN,   {0}, FALSE },
118
119
  { OPTION_SHADOW_FB,   "ShadowFB",     OPTV_BOOLEAN,   {0}, FALSE },
 
120
  { OPTION_PASS_THROUGH,"PassThrough",  OPTV_BOOLEAN,   {0}, FALSE },
119
121
  { -1,                 NULL,           OPTV_NONE,      {0}, FALSE }
120
122
};
121
123
 
162
164
  MODULEVENDORSTRING,
163
165
  MODINFOSTRING1,
164
166
  MODINFOSTRING2,
165
 
  XF86_VERSION_CURRENT,
 
167
  XORG_VERSION_CURRENT,
166
168
  VOODOO_MAJOR_VERSION, VOODOO_MINOR_VERSION, VOODOO_PATCHLEVEL,
167
169
  ABI_CLASS_VIDEODRV,                   /* This is a video driver */
168
170
  ABI_VIDEODRV_VERSION,
436
438
        pVoo->Accel = 0;
437
439
  }
438
440
  
 
441
  if (xf86ReturnOptValBool(pVoo->Options, OPTION_PASS_THROUGH,  FALSE))
 
442
      pVoo->PassThrough = 1;
 
443
 
439
444
  if (xf86ReturnOptValBool(pVoo->Options, OPTION_NOACCEL, FALSE)) {
440
445
        pVoo->ShadowFB = 1;
441
446
        pVoo->Accel = 0;
544
549
  }
545
550
 
546
551
  /* Set the current mode to the first in the list */
 
552
  xf86SetCrtcForModes(pScrn, 0);
547
553
  pScrn->currentMode = pScrn->modes;
548
554
 
549
555
  /* Do some checking, we will not support a virtual framebuffer larger than
914
920
 
915
921
  pVoo = VoodooPTR(pScrn);
916
922
  pVoo->Blanked = TRUE;
917
 
  if (!Closing || !(pVoo->OnAtExit))
918
 
    VoodooBlank(pVoo);
 
923
  if (!Closing)
 
924
      VoodooBlank(pVoo);
 
925
  if (Closing && pVoo->PassThrough)
 
926
      VoodooRestorePassThrough(pVoo);
919
927
}
920
928
 
921
929
static void