summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--man/savage.man17
-rw-r--r--src/savage_accel.c14
-rw-r--r--src/savage_bci.h2
-rw-r--r--src/savage_cursor.c2
-rw-r--r--src/savage_driver.c44
-rw-r--r--src/savage_driver.h2
-rw-r--r--src/savage_image.c2
-rw-r--r--src/savage_regs.h2
-rw-r--r--src/savage_shadow.c2
-rw-r--r--src/savage_vbe.c2
-rw-r--r--src/savage_vbe.h2
-rw-r--r--src/savage_video.c30
12 files changed, 51 insertions, 70 deletions
diff --git a/man/savage.man b/man/savage.man
index 4046aba..cfd00ae 100644
--- a/man/savage.man
+++ b/man/savage.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage.man,v 1.7 2003/11/09 20:43:57 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage.man,v 1.6 2002/05/14 20:19:51 alanh Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH SAVAGE __drivermansuffix__ __vendorversion__
@@ -14,7 +14,7 @@ savage \- S3 Savage video driver
.fi
.SH DESCRIPTION
.B savage
-is an __xservername__ driver for the S3 Savage family video accelerator chips. The
+is an XFree86 driver for the S3 Savage family video accelerator chips. The
.B savage
driver supports PCI and AGP boards with the following chips:
.TP 16
@@ -51,7 +51,7 @@ driver supports PCI and AGP boards with the following chips:
.B ProSavage DDR-K
(8d04)
.SH CONFIGURATION DETAILS
-Please refer to __xconfigfile__(__filemansuffix__) for general configuration
+Please refer to XF86Config(__filemansuffix__) for general configuration
details. This section only covers configuration details specific to this
driver.
.PP
@@ -81,7 +81,8 @@ forces the ShadowFB option on, and disables acceleration.
Default: no rotation.
.TP
.BI "Option \*qShadowFB\*q \*q" boolean \*q
-Enable or disable use of the shadow framebuffer layer. This option
+Enable or disable use of the shadow framebuffer layer. See
+shadowfb(__drivermansuffix__) for further information. This option
disables acceleration. Default: off.
.TP
.BI "Option \*qLCDClock\*q \*q" frequency \*q
@@ -101,13 +102,13 @@ produces the best results with the mobile chips (/MX and /IX), since the BIOS
knows how to handle the critical but unusual timing requirements of the
various LCD panels supported by the chip. To do this, the driver searches
through the BIOS mode list, looking for the mode which most closely matches
-the __xconfigfile__ mode line. Some purists find this scheme objectionable. If
+the XF86Config mode line. Some purists find this scheme objectionable. If
you would rather have the
.B savage
driver use your mode line timing exactly, turn off the UseBios option.
Default: on (use the BIOS).
.TP
-.BI "Option \*qShadowStatus\*q \*q" boolean \*q
+.BI "Option \*qShadowStatus\*q \q*" boolean \*q
Enables the use of a shadow status register. There is a chip bug in the
Savage graphics engine that can cause a bus lock when reading the engine
status register under heavy load, such as when scrolling text or dragging
@@ -119,8 +120,8 @@ which is slightly more expensive, but avoids the problem. Default: off
.SH FILES
savage_drv.o
.SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
.SH AUTHORS
Authors include Tim Roberts (timr@probo.com) and Ani Joshi (ajoshi@unixbox.com)
-for this version, and Tim Roberts and S. Marineau for the original driver from
+for the 4.0 version, and Tim Roberts and S. Marineau for the 3.3 driver from
which this was derived.
diff --git a/src/savage_accel.c b/src/savage_accel.c
index e995a6e..b0ea828 100644
--- a/src/savage_accel.c
+++ b/src/savage_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_accel.c,v 1.23 2003/12/22 17:48:10 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_accel.c,v 1.21 2003/08/04 10:32:26 eich Exp $ */
/*
*
@@ -66,7 +66,6 @@ static void SavageSubsequentSolidBresenhamLine(
int length,
int octant);
-#if 0
static void SavageSubsequentSolidTwoPointLine(
ScrnInfoPtr pScrn,
int x1,
@@ -74,7 +73,6 @@ static void SavageSubsequentSolidTwoPointLine(
int x2,
int y2,
int bias);
-#endif
#if 0
static void SavageSetupForScreenToScreenColorExpand(
@@ -130,7 +128,6 @@ static void SavageSubsequentMono8x8PatternFillRect(
int w,
int h);
-#if 0
static void SavageSetupForColor8x8PatternFill(
ScrnInfoPtr pScrn,
int patternx,
@@ -147,7 +144,6 @@ static void SavageSubsequentColor8x8PatternFillRect(
int y,
int w,
int h);
-#endif
static void SavageSetClippingRectangle(
ScrnInfoPtr pScrn,
@@ -488,6 +484,7 @@ SavageInitAccel(ScreenPtr pScreen)
xaaptr->SolidLineFlags = NO_PLANEMASK | ROP_NEEDS_SOURCE;
xaaptr->SetupForSolidLine = SavageSetupForSolidFill;
xaaptr->SubsequentSolidBresenhamLine = SavageSubsequentSolidBresenhamLine;
+ xaaptr->SubsequentSolidTwoPointLine = SavageSubsequentSolidTwoPointLine;
#if 0
xaaptr->SubsequentSolidFillTrap = SavageSubsequentSolidFillTrap;
#endif
@@ -992,7 +989,6 @@ SavageSubsequentMono8x8PatternFillRect(
}
-#if 0
static void
SavageSetupForColor8x8PatternFill(
ScrnInfoPtr pScrn,
@@ -1005,6 +1001,7 @@ SavageSetupForColor8x8PatternFill(
SavagePtr psav = SAVPTR(pScrn);
int cmd;
+ int mix;
unsigned int bd;
int pat_offset;
@@ -1016,7 +1013,7 @@ SavageSetupForColor8x8PatternFill(
cmd = BCI_CMD_RECT | BCI_CMD_RECT_XP | BCI_CMD_RECT_YP
| BCI_CMD_DEST_GBD | BCI_CMD_PAT_PBD_COLOR_NEW;
- (void) XAAHelpSolidROP( pScrn, &trans_col, planemask, &rop );
+ mix = XAAHelpSolidROP( pScrn, &trans_col, planemask, &rop );
BCI_CMD_SET_ROP(cmd, rop);
bd = BCI_BD_BW_DISABLE;
@@ -1053,7 +1050,6 @@ SavageSubsequentColor8x8PatternFillRect(
BCI_SEND(BCI_X_Y(x, y));
BCI_SEND(BCI_W_H(w, h));
}
-#endif
static void
@@ -1093,7 +1089,6 @@ SavageSubsequentSolidBresenhamLine(
}
-#if 0
static void
SavageSubsequentSolidTwoPointLine(
ScrnInfoPtr pScrn,
@@ -1153,7 +1148,6 @@ SavageSubsequentSolidTwoPointLine(
BCI_SEND( BCI_LINE_STEPS( 2 * (min - max), 2 * min ) );
BCI_SEND( BCI_LINE_MISC( max, ym, xp, yp, 2 * min - max ) );
}
-#endif
diff --git a/src/savage_bci.h b/src/savage_bci.h
index f5d44e3..0d7c489 100644
--- a/src/savage_bci.h
+++ b/src/savage_bci.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_bci.h,v 1.3 2002/05/14 20:19:51 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_bci.h,v 1.4 2002/10/02 20:39:54 alanh Exp $ */
#ifndef _S3BCI_H_
#define _S3BCI_H_
diff --git a/src/savage_cursor.c b/src/savage_cursor.c
index 60fa45d..16aaabf 100644
--- a/src/savage_cursor.c
+++ b/src/savage_cursor.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_cursor.c,v 1.7 2002/05/14 20:19:51 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_cursor.c,v 1.9 2003/01/18 15:22:29 eich Exp $ */
/*
* Hardware cursor support for S3 Savage 4.0 driver. Taken with
diff --git a/src/savage_driver.c b/src/savage_driver.c
index 8ecceec..6589044 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c,v 1.48tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c,v 1.43 2003/08/23 16:09:20 dawes Exp $ */
/*
* vim: sw=4 ts=8 ai ic:
*
@@ -288,6 +288,7 @@ static const char *xaaSymbols[] = {
"XAAHelpPatternROP",
"XAAHelpSolidROP",
"XAAInit",
+ "XAAScreenIndex",
NULL
};
@@ -323,7 +324,7 @@ static XF86ModuleVersionInfo SavageVersRec = {
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XORG_VERSION_CURRENT,
+ XF86_VERSION_CURRENT,
VERSION_MAJOR, VERSION_MINOR, PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
@@ -373,8 +374,7 @@ ResetBCI2K( SavagePtr psav )
! (ALT_STATUS_WORD0 & 0x00200000)
)
{
- ErrorF( "Resetting BCI, stat = %08lx...\n",
- (unsigned long) ALT_STATUS_WORD0);
+ ErrorF( "Resetting BCI, stat = %08x...\n", ALT_STATUS_WORD0);
/* Turn off BCI */
OUTREG( 0x48c18, cob & ~8 );
usleep(10000);
@@ -647,7 +647,7 @@ static Bool SavageProbe(DriverPtr drv, int flags)
for (i=0; i<numUsed; i++) {
ScrnInfoPtr pScrn = xf86AllocateScreen(drv, 0);
- pScrn->driverVersion = SAVAGE_VERSION;
+ pScrn->driverVersion = (int)DRIVER_VERSION;
pScrn->driverName = DRIVER_NAME;
pScrn->name = "SAVAGE";
pScrn->Probe = SavageProbe;
@@ -1481,13 +1481,7 @@ static Bool SavageEnterVT(int scrnIndex, int flags)
gpScrn = pScrn;
SavageEnableMMIO(pScrn);
SavageSave(pScrn);
- if(SavageModeInit(pScrn, pScrn->currentMode)) {
- /* some BIOSes seem to enable HW cursor on PM resume */
- if (!SAVPTR(pScrn)->hwc_on)
- SavageHideCursor( pScrn );
- return TRUE;
- }
- return FALSE;
+ return SavageModeInit(pScrn, pScrn->currentMode);
}
@@ -1690,7 +1684,7 @@ static void SavageSave(ScrnInfoPtr pScrn)
static void SavageWriteMode(ScrnInfoPtr pScrn, vgaRegPtr vgaSavePtr,
SavageRegPtr restore, Bool Entering)
{
- unsigned char tmp, cr3a, cr66;
+ unsigned char tmp, cr3a, cr66, cr67;
vgaHWPtr hwp = VGAHWPTR(pScrn);
SavagePtr psav = SAVPTR(pScrn);
int vgaCRIndex, vgaCRReg, vgaIOBase;
@@ -1858,16 +1852,6 @@ static void SavageWriteMode(ScrnInfoPtr pScrn, vgaRegPtr vgaSavePtr,
/* set the correct clock for some BIOSes */
VGAOUT8(VGA_MISC_OUT_W,
VGAIN8(VGA_MISC_OUT_R) | 0x0C);
- /* Some BIOSes turn on clock doubling on non-doubled modes */
- if (pScrn->bitsPerPixel < 24) {
- VGAOUT8(vgaCRIndex, 0x67);
- if (!(VGAIN8(vgaCRReg) & 0x10)) {
- VGAOUT8(0x3c4, 0x15);
- VGAOUT8(0x3c5, VGAIN8(0x3C5) & ~0x10);
- VGAOUT8(0x3c4, 0x18);
- VGAOUT8(0x3c5, VGAIN8(0x3c5) & ~0x80);
- }
- }
SavageInitialize2DEngine(pScrn);
SavageSetGBD(pScrn);
@@ -1906,7 +1890,7 @@ static void SavageWriteMode(ScrnInfoPtr pScrn, vgaRegPtr vgaSavePtr,
}
VGAOUT8(vgaCRIndex, 0x67);
- (void) VGAIN8(vgaCRReg);
+ cr67 = VGAIN8(vgaCRReg);
VGAOUT8(vgaCRReg, restore->CR67 & ~0x0c); /* no STREAMS yet */
/* restore extended regs */
@@ -2148,7 +2132,7 @@ static Bool SavageMapMMIO(ScrnInfoPtr pScrn)
}
xf86DrvMsg( pScrn->scrnIndex, X_PROBED,
- "mapping MMIO @ 0x%lx with size 0x%x\n",
+ "mapping MMIO @ 0x%x with size 0x%x\n",
psav->MmioBase, SAVAGE_NEWMMIO_REGSIZE);
psav->MapBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO, psav->PciTag,
@@ -2182,7 +2166,7 @@ static Bool SavageMapFB(ScrnInfoPtr pScrn)
TRACE(("SavageMapFB()\n"));
xf86DrvMsg( pScrn->scrnIndex, X_PROBED,
- "mapping framebuffer @ 0x%lx with size 0x%x\n",
+ "mapping framebuffer @ 0x%x with size 0x%x\n",
psav->FrameBufferBase, psav->videoRambytes);
if (psav->videoRambytes) {
@@ -2268,8 +2252,8 @@ static Bool SavageScreenInit(int scrnIndex, ScreenPtr pScreen,
(psav->FBBase + psav->CursorKByte*1024 + 4096 - 32);
xf86DrvMsg( pScrn->scrnIndex, X_PROBED,
- "Shadow area physical %08lx, linear %p\n",
- psav->ShadowPhysical, (void *)psav->ShadowVirtual );
+ "Shadow area physical %08x, linear %08x\n",
+ psav->ShadowPhysical, psav->ShadowVirtual );
psav->WaitQueue = ShadowWait1;
psav->WaitIdle = ShadowWait;
@@ -2972,6 +2956,10 @@ void SavageLoadPaletteSavage4(ScrnInfoPtr pScrn, int numColors, int *indicies,
int i, index;
vgaHWPtr hwp = VGAHWPTR(pScrn);
+ int vgaCRIndex, vgaCRReg, vgaIOBase;
+ vgaIOBase = hwp->IOBase;
+ vgaCRIndex = vgaIOBase + 4;
+ vgaCRReg = vgaIOBase + 5;
VerticalRetraceWait(psav);
for (i=0; i<numColors; i++) {
diff --git a/src/savage_driver.h b/src/savage_driver.h
index 4375302..b25fc56 100644
--- a/src/savage_driver.h
+++ b/src/savage_driver.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.h,v 1.16 2003/01/18 15:22:30 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.h,v 1.17 2003/04/23 14:18:37 eich Exp $ */
#ifndef SAVAGE_VGAHWMMIO_H
#define SAVAGE_VGAHWMMIO_H
diff --git a/src/savage_image.c b/src/savage_image.c
index 8b9605b..8354622 100644
--- a/src/savage_image.c
+++ b/src/savage_image.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_image.c,v 1.4 2001/05/18 23:35:32 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_image.c,v 1.6 2002/05/14 20:19:52 alanh Exp $ */
#include "savage_driver.h"
#include "xaarop.h"
diff --git a/src/savage_regs.h b/src/savage_regs.h
index 0f807a1..8913f95 100644
--- a/src/savage_regs.h
+++ b/src/savage_regs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h,v 1.11 2002/05/14 20:19:52 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h,v 1.13 2003/04/23 14:18:37 eich Exp $ */
#ifndef _SAVAGE_REGS_H
#define _SAVAGE_REGS_H
diff --git a/src/savage_shadow.c b/src/savage_shadow.c
index 2fb0e91..00a5120 100644
--- a/src/savage_shadow.c
+++ b/src/savage_shadow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_shadow.c,v 1.3 2000/03/31 20:13:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_shadow.c,v 1.2 2002/05/14 20:19:52 alanh Exp $ */
/*
Copyright (c) 1999,2000 The XFree86 Project Inc.
diff --git a/src/savage_vbe.c b/src/savage_vbe.c
index ea37260..cf8f417 100644
--- a/src/savage_vbe.c
+++ b/src/savage_vbe.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_vbe.c,v 1.11 2002/05/14 20:19:52 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_vbe.c,v 1.14 2003/06/18 16:17:40 eich Exp $ */
#include "savage_driver.h"
#include "savage_vbe.h"
diff --git a/src/savage_vbe.h b/src/savage_vbe.h
index 70bebd3..ba77773 100644
--- a/src/savage_vbe.h
+++ b/src/savage_vbe.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_vbe.h,v 1.1 2000/12/02 01:16:15 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_vbe.h,v 1.3 2002/05/14 20:19:52 alanh Exp $ */
/*
This file was originally part of the Linux Real-Mode Interface, or LRMI.
diff --git a/src/savage_video.c b/src/savage_video.c
index 4e9b5f3..43522ce 100644
--- a/src/savage_video.c
+++ b/src/savage_video.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_video.c,v 1.17tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_video.c,v 1.15 2003/06/18 16:17:40 eich Exp $ */
#include "Xv.h"
#include "dix.h"
@@ -298,10 +298,10 @@ unsigned int GetBlendForFourCC( int id )
void myOUTREG( SavagePtr psav, unsigned long offset, unsigned long value )
{
- ErrorF( "MMIO %04lx, was %08lx, want %08lx,",
- offset, (unsigned long)MMIO_IN32( psav->MapBase, offset ), value );
+ ErrorF( "MMIO %04x, was %08x, want %08x,",
+ offset, MMIO_IN32( psav->MapBase, offset ), value );
MMIO_OUT32( psav->MapBase, offset, value );
- ErrorF( " now %08lx\n", (unsigned long)MMIO_IN32( psav->MapBase, offset ) );
+ ErrorF( " now %08x\n", MMIO_IN32( psav->MapBase, offset ) );
}
void SavageInitStreamsOld(ScrnInfoPtr pScrn)
@@ -451,7 +451,7 @@ void SavageStreamsOn(ScrnInfoPtr pScrn, int id)
VGAOUT16( vgaCRIndex, (jStreamsControl << 8) | EXT_MISC_CTRL2 );
psav->blendBase = GetBlendForFourCC( id ) << 9;
- xf86ErrorFVerb(XVTRACE+1,"Format %4.4s, blend is %08x\n", (char *)&id, psav->blendBase );
+ xf86ErrorFVerb(XVTRACE+1,"Format %4.4s, blend is %08x\n", &id, psav->blendBase );
OUTREG( BLEND_CONTROL, psav->blendBase | 0x08 );
/* These values specify brightness, contrast, saturation and hue. */
@@ -705,7 +705,7 @@ void SavageSetColorOld( ScrnInfoPtr pScrn )
SavagePortPrivPtr pPriv = psav->adaptor->pPortPrivates[0].ptr;
xf86ErrorFVerb(XVTRACE, "bright %d, contrast %d, saturation %d, hue %d\n",
- pPriv->brightness, (int)pPriv->contrast, (int)pPriv->saturation, pPriv->hue );
+ pPriv->brightness, pPriv->contrast, pPriv->saturation, pPriv->hue );
if(
(psav->videoFourCC == FOURCC_RV15) ||
@@ -747,7 +747,7 @@ void SavageSetColorNew( ScrnInfoPtr pScrn )
unsigned long assembly;
xf86ErrorFVerb(XVTRACE, "bright %d, contrast %d, saturation %d, hue %d\n",
- pPriv->brightness, (int)pPriv->contrast, (int)pPriv->saturation, pPriv->hue );
+ pPriv->brightness, pPriv->contrast, pPriv->saturation, pPriv->hue );
if( psav->videoFourCC == FOURCC_Y211 )
k = 1.0; /* YUV */
@@ -775,20 +775,20 @@ void SavageSetColorNew( ScrnInfoPtr pScrn )
k2 = (int)(dk2+0.5) & 0x1ff;
k3 = (int)(dk3+0.5) & 0x1ff;
assembly = (k3<<18) | (k2<<9) | k1;
- xf86ErrorFVerb(XVTRACE+1, "CC1 = %08lx ", assembly );
+ xf86ErrorFVerb(XVTRACE+1, "CC1 = %08x ", assembly );
OUTREG( SEC_STREAM_COLOR_CONVERT1, assembly );
k4 = (int)(dk4+0.5) & 0x1ff;
k5 = (int)(dk5+0.5) & 0x1ff;
k6 = (int)(dk6+0.5) & 0x1ff;
assembly = (k6<<18) | (k5<<9) | k4;
- xf86ErrorFVerb(XVTRACE+1, "CC2 = %08lx ", assembly );
+ xf86ErrorFVerb(XVTRACE+1, "CC2 = %08x ", assembly );
OUTREG( SEC_STREAM_COLOR_CONVERT2, assembly );
k7 = (int)(dk7+0.5) & 0x1ff;
kb = (int)(dkb+0.5) & 0xffff;
assembly = (kb<<9) | k7;
- xf86ErrorFVerb(XVTRACE+1, "CC3 = %08lx\n", assembly );
+ xf86ErrorFVerb(XVTRACE+1, "CC3 = %08x\n", assembly );
OUTREG( SEC_STREAM_COLOR_CONVERT3, assembly );
}
@@ -869,7 +869,7 @@ SavageSetupImageVideo(ScreenPtr pScreen)
pPriv->lastKnownPitch = 0;
/* gotta uninit this someplace */
- REGION_NULL(pScreen, &pPriv->clip);
+ REGION_INIT(pScreen, &pPriv->clip, NullBox, 0);
psav->adaptor = adapt;
@@ -1393,7 +1393,6 @@ SavagePutImage(
){
SavagePortPrivPtr pPriv = (SavagePortPrivPtr)data;
SavagePtr psav = SAVPTR(pScrn);
- ScreenPtr pScreen = pScrn->pScreen;
INT32 x1, x2, y1, y2;
unsigned char *dst_start;
int pitch, new_h, offset, offsetV=0, offsetU=0;
@@ -1518,8 +1517,8 @@ SavagePutImage(
x1, y1, x2, y2, &dstBox, src_w, src_h, drw_w, drw_h);
/* update cliplist */
- if(!REGION_EQUAL(pScreen, &pPriv->clip, clipBoxes)) {
- REGION_COPY(pScreen, &pPriv->clip, clipBoxes);
+ if(!REGION_EQUAL(pScrn->pScreen, &pPriv->clip, clipBoxes)) {
+ REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
/* draw these */
xf86XVFillKeyHelper(pScrn->pScreen, pPriv->colorKey, clipBoxes);
}
@@ -1744,7 +1743,6 @@ SavageDisplaySurface(
){
OffscreenPrivPtr pPriv = (OffscreenPrivPtr)surface->devPrivate.ptr;
ScrnInfoPtr pScrn = surface->pScrn;
- ScreenPtr pScreen = pScrn->pScreen;
SavagePortPrivPtr portPriv = GET_PORT_PRIVATE(pScrn);
INT32 x1, y1, x2, y2;
BoxRec dstBox;
@@ -1781,7 +1779,7 @@ SavageDisplaySurface(
pPriv->isOn = TRUE;
#if 0
if(portPriv->videoStatus & CLIENT_VIDEO_ON) {
- REGION_EMPTY(pScreen, &portPriv->clip);
+ REGION_EMPTY(pScrn->pScreen, &portPriv->clip);
UpdateCurrentTime();
portPriv->videoStatus = FREE_TIMER;
portPriv->freeTime = currentTime.milliseconds + FREE_DELAY;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 21:25:46 +0000