cvs diff: Diffing . Index: aticonfig.c =================================================================== RCS file: /cvs/xorg/driver/xf86-video-ati/src/aticonfig.c,v retrieving revision 1.5 diff -u -r1.5 aticonfig.c --- aticonfig.c 11 Jul 2005 02:29:44 -0000 1.5 +++ aticonfig.c 12 Feb 2006 18:54:50 -0000 @@ -47,7 +47,8 @@ ATI_OPTION_CRT_SCREEN, /* Legacy negation of "PanelDisplay" */ ATI_OPTION_DEVEL, /* Intentionally undocumented */ ATI_OPTION_BLEND, /* Force horizontal blending of small modes */ - ATI_OPTION_LCDSYNC /* Use XF86Config panel mode porches */ + ATI_OPTION_LCDSYNC, /* Use XF86Config panel mode porches */ + ATI_OPTION_OFFSCRN_PIXMAP /* Enable offscreen pixmap */ } ATIPrivateOptionType; /* @@ -101,6 +102,13 @@ {0, }, FALSE }, + { + ATI_OPTION_OFFSCRN_PIXMAP, /* ON: disable offscreen pixmap */ + "offscreenpixmap", /* OFF: enable offscreen pixmap */ + OPTV_BOOLEAN, + {0, }, + FALSE + }, { -1, NULL, @@ -152,6 +160,7 @@ # define ShadowFB PublicOption[ATI_OPTION_SHADOW_FB].value.bool # define SWCursor PublicOption[ATI_OPTION_SWCURSOR].value.bool # define LCDSync PrivateOption[ATI_OPTION_LCDSYNC].value.bool +# define OffScrnPixmap PrivateOption[ATI_OPTION_OFFSCRN_PIXMAP].value.bool # define ReferenceClock \ PublicOption[ATI_OPTION_REFERENCE_CLOCK].value.freq.freq @@ -262,6 +271,7 @@ pATI->OptionProbeClocks = ProbeClocks; pATI->OptionShadowFB = ShadowFB; pATI->OptionLCDSync = LCDSync; + pATI->OptionOffScrnPixmap = OffScrnPixmap; /* "CRTScreen" is now "NoPanelDisplay" */ if ((PanelDisplay != CRTScreen) || Index: atimach64accel.c =================================================================== RCS file: /cvs/xorg/driver/xf86-video-ati/src/atimach64accel.c,v retrieving revision 1.4 diff -u -r1.4 atimach64accel.c --- atimach64accel.c 11 Jul 2005 02:29:44 -0000 1.4 +++ atimach64accel.c 12 Feb 2006 18:54:50 -0000 @@ -956,7 +956,10 @@ /* This doesn't seem quite right... */ if (pATI->XModifier == 1) { - pXAAInfo->Flags = PIXMAP_CACHE | OFFSCREEN_PIXMAPS; + if (pATI->OptionOffScrnPixmap) + pXAAInfo->Flags = PIXMAP_CACHE | OFFSCREEN_PIXMAPS; + else + pXAAInfo->Flags = PIXMAP_CACHE; #ifndef AVOID_CPIO Index: atistruct.h =================================================================== RCS file: /cvs/xorg/driver/xf86-video-ati/src/atistruct.h,v retrieving revision 1.5 diff -u -r1.5 atistruct.h --- atistruct.h 31 Jul 2005 17:19:27 -0000 1.5 +++ atistruct.h 12 Feb 2006 18:54:50 -0000 @@ -456,6 +456,7 @@ CARD8 OptionProbeClocks:1; /* Force probe for fixed clocks */ CARD8 OptionShadowFB:1; /* Use shadow frame buffer */ CARD8 OptionLCDSync:1; /* Temporary */ + CARD8 OptionOffScrnPixmap:1; /* Off screen pixmap */ /* * State flags.