hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-16 00:19:55 +00:00
Code Issues Projects Releases Wiki Activity

Add offscreen memory manager and update the servers to reflect the name

Browse source 
change for the kaa structure.
This commit is contained in:
Anders Carlsson 2003-10-13 00:19:58 +00:00
commit a50438b470
12 changed files with 434 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

26
hw/kdrive/mga/mga.c
View file

@ -54,7 +54,6 @@ mgaCardInit (KdCardInfo *card)
Bool
mgaScreenInit (KdScreenInfo *screen)
{
MgaCardInfo *mgac = screen->card->driver;
MgaScreenInfo *mgas;
int screen_size, memory;
@ -84,13 +83,13 @@ mgaScreenInit (KdScreenInfo *screen)
memory -= screen_size;
if (memory > screen->fb[0].byteStride)
{
mgas->off_screen = mgas->screen + screen_size;
mgas->off_screen_size = memory;
screen->off_screen_base = screen_size;
screen->off_screen_size = memory;
}
else
{
mgas->off_screen = 0;
mgas->off_screen_size = 0;
screen->off_screen_base = 0;
screen->off_screen_size = 0;
}
screen->driver = mgas;
return TRUE;
@ -115,8 +114,6 @@ mgaFinishInitScreen (ScreenPtr pScreen)
void
mgaPreserve (KdCardInfo *card)
{
MgaCardInfo *mgac = card->driver;
vesaPreserve (card);
}
@ -165,6 +162,13 @@ mgaResetMMIO (KdCardInfo *card, MgaCardInfo *mgac)
mgaUnmapReg (card, mgac);
}
Bool
mgaDPMS (ScreenPtr pScreen, int mode)
{
/* XXX */
return TRUE;
}
Bool
mgaEnable (ScreenPtr pScreen)
{
@ -187,14 +191,8 @@ mgaDisable (ScreenPtr pScreen)
MgaCardInfo *mgac = pScreenPriv->card->driver;
mgaResetMMIO (pScreenPriv->card, mgac);
vesaDisable (pScreen);
}
Bool
mgaDPMS (ScreenPtr pScreen, int mode)
{
/* XXX */
return TRUE;
vesaDisable (pScreen);
}
void

2
hw/kdrive/mga/mga.h
View file

@ -96,8 +96,6 @@ typedef struct _mgaCardInfo {
typedef struct _mgaScreenInfo {
VesaScreenPrivRec vesa;
CARD8 *screen;
CARD8 *off_screen;
int off_screen_size;
int pitch;
int pw;

81
hw/kdrive/mga/mgadraw.c
View file

@ -48,14 +48,12 @@ CARD32 mgaRop[16] = {
static VOL8 *mmio;
int fifo_size;
int pitch;
int pitch, src_pitch;
int dir;
void
mgaWaitAvail (int n)
{
int i;
if (fifo_size < n) {
while ((fifo_size = MGA_IN32 (mmio, MGA_REG_FIFOSTATUS) & 0xff) < n)
;
@ -84,25 +82,43 @@ mgaSetup (ScreenPtr pScreen, int wait)
if (!mmio)
return FALSE;
mgaWaitAvail (wait + 7);
MGA_OUT32 (mmio, MGA_REG_PITCH, mgas->pitch);
MGA_OUT32 (mmio, MGA_REG_SRCORG, 0);
MGA_OUT32 (mmio, MGA_REG_DSTORG, 0);
mgaWaitAvail (wait + 4);
MGA_OUT32 (mmio, MGA_REG_MACCESS, mgas->pw);
MGA_OUT32 (mmio, MGA_REG_CXBNDRY, 0xffff0000);
MGA_OUT32 (mmio, MGA_REG_YTOP, 0x00000000);
MGA_OUT32 (mmio, MGA_REG_YBOT, 0x007fffff);
return TRUE;
}
Bool
mgaPrepareSolid (DrawablePtr pDrawable, int alu, Pixel pm, Pixel fg)
{
KdScreenPriv(pDrawable->pScreen);
mgaScreenInfo (pScreenPriv);
int cmd;
cmd = MGA_OPCOD_TRAP | MGA_DWGCTL_SOLID | MGA_DWGCTL_ARZERO | MGA_DWGCTL_SGNZERO |
MGA_DWGCTL_SHIFTZERO | mgaRop[alu];
mgaSetup (pDrawable->pScreen, 3);
mgaSetup (pDrawable->pScreen, 5);
if (pDrawable->type == DRAWABLE_WINDOW)
{
MGA_OUT32 (mmio, MGA_REG_DSTORG, 0);
MGA_OUT32 (mmio, MGA_REG_PITCH, pitch);
}
else
{
PixmapPtr pPixmap = (PixmapPtr)pDrawable;
int dst_org;
dst_org = (int)pPixmap->devPrivate.ptr - (int)mgas->screen;
MGA_OUT32 (mmio, MGA_REG_DSTORG, dst_org);
MGA_OUT32 (mmio, MGA_REG_PITCH, pPixmap->devKind / (pPixmap->drawable.bitsPerPixel >> 3));
}
MGA_OUT32 (mmio, MGA_REG_DWGCTL, cmd);
MGA_OUT32 (mmio, MGA_REG_FCOL, fg);
MGA_OUT32 (mmio, MGA_REG_PLNWT, pm);
@ -114,7 +130,8 @@ void
mgaSolid (int x1, int y1, int x2, int y2)
{
mgaWaitAvail (2);
MGA_OUT32 (mmio, MGA_REG_FXBNDRY, (x2 << 16) | x1 & 0xffff);
MGA_OUT32 (mmio, MGA_REG_FXBNDRY, (x2 << 16) | (x1 & 0xffff));
MGA_OUT32 (mmio, MGA_REG_YDSTLEN | MGA_REG_EXEC, (y1 << 16) | (y2 - y1));
}
@ -139,13 +156,44 @@ mgaPrepareCopy (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, int dx, int
dir |= BLIT_UP;
if (dx < 0)
dir |= BLIT_LEFT;
mgaSetup (pDstDrawable->pScreen, 6);
if (pSrcDrawable->type == DRAWABLE_WINDOW)
{
MGA_OUT32 (mmio, MGA_REG_SRCORG, 0);
src_pitch = pitch;
}
else
{
KdScreenPriv(pSrcDrawable->pScreen);
mgaScreenInfo (pScreenPriv);
PixmapPtr pPixmap = (PixmapPtr)pSrcDrawable;
MGA_OUT32 (mmio, MGA_REG_SRCORG, ((int)pPixmap->devPrivate.ptr - (int)mgas->screen));
src_pitch = pPixmap->devKind / (pPixmap->drawable.bitsPerPixel >> 3);
}
mgaSetup (pDstDrawable->pScreen, 4);
if (pDstDrawable->type == DRAWABLE_WINDOW)
{
MGA_OUT32 (mmio, MGA_REG_DSTORG, 0);
MGA_OUT32 (mmio, MGA_REG_PITCH, pitch);
}
else
{
KdScreenPriv(pDstDrawable->pScreen);
mgaScreenInfo (pScreenPriv);
PixmapPtr pPixmap = (PixmapPtr)pDstDrawable;
MGA_OUT32 (mmio, MGA_REG_DSTORG, ((int)pPixmap->devPrivate.ptr - (int)mgas->screen));
MGA_OUT32 (mmio, MGA_REG_PITCH, pPixmap->devKind / (pPixmap->drawable.bitsPerPixel >> 3));
}
MGA_OUT32 (mmio, MGA_REG_DWGCTL, cmd);
MGA_OUT32 (mmio, MGA_REG_SGN, dir);
MGA_OUT32 (mmio, MGA_REG_PLNWT, pm);
MGA_OUT32 (mmio, MGA_REG_AR5, pitch * (dy < 0 ? -1 : 1) );
MGA_OUT32 (mmio, MGA_REG_AR5, src_pitch * (dy < 0 ? -1 : 1) );
return TRUE;
}
@ -162,7 +210,7 @@ mgaCopy (int srcX, int srcY, int dstX, int dstY, int w, int h)
}
w--;
start = end = srcY * pitch + srcX;
start = end = srcY * src_pitch + srcX;
if (dir & BLIT_LEFT)
start += w;
@ -173,7 +221,6 @@ mgaCopy (int srcX, int srcY, int dstX, int dstY, int w, int h)
MGA_OUT32 (mmio, MGA_REG_AR0, end);
MGA_OUT32 (mmio, MGA_REG_AR3, start);
MGA_OUT32 (mmio, MGA_REG_FXBNDRY, ((dstX + w) << 16) | (dstX & 0xffff));
MGA_OUT32 (mmio, MGA_REG_YDSTLEN | MGA_REG_EXEC, (dstY << 16) | h);
}
@ -182,7 +229,7 @@ mgaDoneCopy (void)
{
}
KaaScreenPrivRec mgaKaa = {
KaaScreenInfoRec mgaKaa = {
mgaPrepareSolid,
mgaSolid,
mgaDoneSolid,
@ -190,13 +237,17 @@ KaaScreenPrivRec mgaKaa = {
mgaPrepareCopy,
mgaCopy,
mgaDoneCopy,
192, /* Offscreen byte alignment */
64, /* Offset pitch */
};
Bool
mgaDrawInit (ScreenPtr pScreen)
{
KdScreenPriv(pScreen);
mgaScreenInfo (pScreenPriv);
if (!kaaDrawInit (pScreen, &mgaKaa))
return FALSE;