Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit merge xf86-video-ark 0.7.6, xf86-video-s3virg...
details: https://anonhg.NetBSD.org/xsrc/rev/d472a80e6f2b
branches: trunk
changeset: 7430:d472a80e6f2b
user: mrg <mrg%NetBSD.org@localhost>
date: Sun Feb 26 19:59:31 2023 +0000
description:
merge xf86-video-ark 0.7.6, xf86-video-s3virge 1.11.1,
xf86-video-trident 1.4.0, and xf86-video-vmware 13.4.0.
diffstat:
external/mit/xf86-video-ark/dist/README | 20 -
external/mit/xf86-video-ark/dist/src/ark_driver.c | 12 +-
external/mit/xf86-video-s3virge/dist/src/s3v_accel.c | 2 +-
external/mit/xf86-video-s3virge/dist/src/s3v_driver.c | 28 +-
external/mit/xf86-video-trident/dist/README | 20 -
external/mit/xf86-video-trident/dist/src/blade_accel.c | 711 -
external/mit/xf86-video-trident/dist/src/blade_accel_exa.c | 325 -
external/mit/xf86-video-trident/dist/src/image_accel.c | 647 -
external/mit/xf86-video-trident/dist/src/trident.h | 11 +-
external/mit/xf86-video-trident/dist/src/trident_accel.c | 671 -
external/mit/xf86-video-trident/dist/src/trident_driver.c | 6582 ++++-----
external/mit/xf86-video-trident/dist/src/tridenthelper.c | 344 -
external/mit/xf86-video-trident/dist/src/tridentpcirename.h | 122 -
external/mit/xf86-video-trident/dist/src/xp4_accel.c | 564 -
external/mit/xf86-video-trident/dist/src/xp4_accel_exa.c | 273 -
external/mit/xf86-video-trident/dist/src/xp_accel.c | 598 -
external/mit/xf86-video-vmware/dist/src/vmware.c | 45 +-
external/mit/xf86-video-vmware/dist/src/vmwaremodes.c | 3 +-
external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_hosted_priv.h | 40 -
external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_xmir.c | 184 -
external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_xwayland.c | 186 -
21 files changed, 3341 insertions(+), 8047 deletions(-)
diffs (truncated from 11887 to 300 lines):
diff -r 7887e011cf60 -r d472a80e6f2b external/mit/xf86-video-ark/dist/README
--- a/external/mit/xf86-video-ark/dist/README Sun Feb 26 19:47:05 2023 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-xf86-video-ark - Ark Logic video driver for Xorg X server
-
-Please submit bugs & patches to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
- http://lists.freedesktop.org/mailman/listinfo/xorg
-
-The master development code repository can be found at:
-
- git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ark
-
- http://cgit.freedesktop.org/xorg/driver/xf86-video-ark
-
-For more information on the git code manager, see:
-
- http://wiki.x.org/wiki/GitPage
diff -r 7887e011cf60 -r d472a80e6f2b external/mit/xf86-video-ark/dist/src/ark_driver.c
--- a/external/mit/xf86-video-ark/dist/src/ark_driver.c Sun Feb 26 19:47:05 2023 +0000
+++ b/external/mit/xf86-video-ark/dist/src/ark_driver.c Sun Feb 26 19:59:31 2023 +0000
@@ -74,7 +74,7 @@
Bool ARKSaveScreen(ScreenPtr pScreen, int mode);
static void ARKFreeScreen(FREE_SCREEN_ARGS_DECL);
static void ARKLoadPalette(ScrnInfoPtr pScrn, int numColors,
- int *indicies, LOCO *colors,
+ int *indices, LOCO *colors,
VisualPtr pVisual);
static void ARKWriteMode(ScrnInfoPtr pScrn, vgaRegPtr pVga, ARKRegPtr new);
@@ -927,7 +927,7 @@
wrinx(isaIOBase + 0x3c4, 0x16, 0x00);
/* write the extended registers first so that textmode font
- * restoration can suceed
+ * restoration can succeed
*/
wrinx(isaIOBase + 0x3c4, 0x10, new->sr10);
wrinx(isaIOBase + 0x3c4, 0x11, new->sr11);
@@ -1045,7 +1045,7 @@
if (err) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "Cound not map framebuffer: %d\n", err);
+ "Could not map framebuffer: %d\n", err);
return FALSE;
}
}
@@ -1053,7 +1053,7 @@
if (!pARK->FBBase) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "Cound not map framebuffer\n");
+ "Could not map framebuffer\n");
return FALSE;
}
@@ -1113,7 +1113,7 @@
static void ARKLoadPalette(ScrnInfoPtr pScrn, int numColors,
- int *indicies, LOCO *colors,
+ int *indices, LOCO *colors,
VisualPtr pVisual)
{
unsigned long isaIOBase = 0;
@@ -1123,7 +1123,7 @@
int i, index;
for (i=0; i<numColors; i++) {
- index = indicies[i];
+ index = indices[i];
outb(isaIOBase + 0x3c8, index);
outb(isaIOBase + 0x3c9, colors[index].red);
outb(isaIOBase + 0x3c9, colors[index].green);
diff -r 7887e011cf60 -r d472a80e6f2b external/mit/xf86-video-s3virge/dist/src/s3v_accel.c
--- a/external/mit/xf86-video-s3virge/dist/src/s3v_accel.c Sun Feb 26 19:47:05 2023 +0000
+++ b/external/mit/xf86-video-s3virge/dist/src/s3v_accel.c Sun Feb 26 19:59:31 2023 +0000
@@ -280,7 +280,7 @@
}
void
-S3VGEReset(ScrnInfoPtr pScrn, int from_timeout, int line, char *file)
+S3VGEReset(ScrnInfoPtr pScrn, int from_timeout, int line, const char *file)
{
unsigned long gs1, gs2; /* -- debug info for graphics state -- */
unsigned char tmp, sr1, resetidx=0x66; /* FIXME */
diff -r 7887e011cf60 -r d472a80e6f2b external/mit/xf86-video-s3virge/dist/src/s3v_driver.c
--- a/external/mit/xf86-video-s3virge/dist/src/s3v_driver.c Sun Feb 26 19:47:05 2023 +0000
+++ b/external/mit/xf86-video-s3virge/dist/src/s3v_driver.c Sun Feb 26 19:59:31 2023 +0000
@@ -110,7 +110,7 @@
static Bool S3VCloseScreen(CLOSE_SCREEN_ARGS_DECL);
static Bool S3VSaveScreen(ScreenPtr pScreen, int mode);
static void S3VInitSTREAMS(ScrnInfoPtr pScrn, unsigned int *streams, DisplayModePtr mode);
-static void S3VLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indicies, LOCO *colors, VisualPtr pVisual);
+static void S3VLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors, VisualPtr pVisual);
static void S3VDisplayPowerManagementSet(ScrnInfoPtr pScrn,
int PowerManagementMode,
@@ -140,7 +140,7 @@
/*
* This contains the functions needed by the server after loading the
* driver module. It must be supplied, and gets added the driver list by
- * the Module Setup funtion in the dynamic case. In the static case a
+ * the Module Setup function in the dynamic case. In the static case a
* reference to this is compiled in, and this requires that the name of
* this DriverRec be an upper-case version of the driver name.
*/
@@ -314,7 +314,8 @@
#endif /* XFree86LOADER */
-static unsigned char *find_bios_string(S3VPtr ps3v, int BIOSbase, char *match1, char *match2)
+static unsigned char *find_bios_string(S3VPtr ps3v, int BIOSbase,
+ const char *match1, const char *match2)
{
#define BIOS_BSIZE 0x10000
#define BIOS_BASE 0xc0000
@@ -1762,7 +1763,7 @@
vgaHWProtect(pScrn, TRUE);
- /* Are we going to reenable STREAMS in this new mode? */
+ /* Are we going to re-enable STREAMS in this new mode? */
ps3v->STREAMSRunning = restore->CR67 & 0x0c;
/* First reset GE to make sure nothing is going on */
@@ -2100,7 +2101,7 @@
/* And this function disables the STREAMS processor as per databook.
- * This is usefull before we do a mode change
+ * This is useful before we do a mode change
*/
static void
@@ -2143,7 +2144,7 @@
/* S3_NEWMMIO_REGSIZE = 0x1 0000 ( 64KB ) */
/* S3V_MMIO_REGSIZE = 0x8000 ( 32KB ) - above includes */
/* the image transfer area, so this one is used instead.*/
- /* ps3v->IOBase is assinged the virtual address returned*/
+ /* ps3v->IOBase is assigned the virtual address returned*/
/* from MapPciMem, it is the address to base all */
/* register access. (It is a pointer.) */
/* hwp->MemBase is a CARD32, containing the register */
@@ -2552,6 +2553,15 @@
if ((pScrn->bitsPerPixel + 7)/8 * mode->HDisplay > 4095)
return MODE_VIRTUAL_X;
+ /* todo - The virge limit is 2048 vertical & horizontal */
+ /* pixels, not clock register settings. */
+ /* true for all ViRGE? */
+ if (mode->HTotal > 2048)
+ return MODE_BAD_HVALUE;
+
+ if (mode->VTotal > 2048)
+ return MODE_BAD_VVALUE;
+
return MODE_OK;
}
@@ -3473,7 +3483,7 @@
void S3VLoadPalette(
ScrnInfoPtr pScrn,
int numColors,
- int *indicies,
+ int *indices,
LOCO *colors,
VisualPtr pVisual
){
@@ -3481,7 +3491,7 @@
int i, index;
for(i = 0; i < numColors; i++) {
- index = indicies[i];
+ index = indices[i];
VGAOUT8(0x3c8, index);
VGAOUT8(0x3c9, colors[index].red);
VGAOUT8(0x3c9, colors[index].green);
@@ -3521,7 +3531,7 @@
vgaHWSetStdFuncs(hwp);
/*
* any access to the legacy VGA ports is done here.
- * If legacy VGA is inaccessable the MMIO base _has_
+ * If legacy VGA is inaccessible the MMIO base _has_
* to be set correctly already and MMIO _has_ to be
* enabled.
*/
diff -r 7887e011cf60 -r d472a80e6f2b external/mit/xf86-video-trident/dist/README
--- a/external/mit/xf86-video-trident/dist/README Sun Feb 26 19:47:05 2023 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-xf86-video-trident - Trident video driver for the Xorg X server
-
-Please submit bugs & patches to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
- http://lists.freedesktop.org/mailman/listinfo/xorg
-
-The master development code repository can be found at:
-
- git://anongit.freedesktop.org/git/xorg/driver/xf86-video-trident
-
- http://cgit.freedesktop.org/xorg/driver/xf86-video-trident
-
-For more information on the git code manager, see:
-
- http://wiki.x.org/wiki/GitPage
diff -r 7887e011cf60 -r d472a80e6f2b external/mit/xf86-video-trident/dist/src/blade_accel.c
--- a/external/mit/xf86-video-trident/dist/src/blade_accel.c Sun Feb 26 19:47:05 2023 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,711 +0,0 @@
-/*
- * Copyright 1997-2003 by Alan Hourihane, North Wales, UK.
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Alan Hourihane not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Alan Hourihane makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as is" without express or implied warranty.
- *
- * ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- * Authors: Alan Hourihane, <alanh%fairlite.demon.co.uk@localhost>
- *
- * Trident Blade3D accelerated options.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "xf86.h"
-#include "xf86_OSproc.h"
-
-#include "xf86Pci.h"
-
-#include "miline.h"
-
-#include "trident.h"
-#include "trident_regs.h"
-
-#ifdef HAVE_XAA_H
-#include "xaarop.h"
-#include "xaalocal.h"
-
-static void BladeSync(ScrnInfoPtr pScrn);
-#if 0
-static void BladeSetupForSolidLine(ScrnInfoPtr pScrn, int color,
- int rop, unsigned int planemask);
-static void BladeSubsequentSolidBresenhamLine(ScrnInfoPtr pScrn,
- int x, int y, int dmaj, int dmin, int e,
- int len, int octant);
-static void BladeSubsequentSolidTwoPointLine( ScrnInfoPtr pScrn,
- int x1, int y1, int x2, int y2, int flags);
-static void BladeSetupForDashedLine(ScrnInfoPtr pScrn, int fg, int bg,
- int rop, unsigned int planemask, int length,
- unsigned char *pattern);
-static void BladeSubsequentDashedTwoPointLine( ScrnInfoPtr pScrn,
- int x1, int y1, int x2, int y2, int flags,
- int phase);
-#endif
-static void BladeSetupForFillRectSolid(ScrnInfoPtr pScrn, int color,
- int rop, unsigned int planemask);
-static void BladeSubsequentFillRectSolid(ScrnInfoPtr pScrn, int x,
- int y, int w, int h);
-static void BladeSubsequentScreenToScreenCopy(ScrnInfoPtr pScrn,
- int x1, int y1, int x2,
- int y2, int w, int h);
-static void BladeSetupForScreenToScreenCopy(ScrnInfoPtr pScrn,
- int xdir, int ydir, int rop,
- unsigned int planemask,
- int transparency_color);
-#if 0
-static void BladeSetupForScreenToScreenColorExpand(ScrnInfoPtr pScrn,
- int fg, int bg, int rop,
- unsigned int planemask);
-static void BladeSubsequentScreenToScreenColorExpand(ScrnInfoPtr pScrn,
- int x, int y, int w, int h, int srcx, int srcy,
- int offset);
Home |
Main Index |
Thread Index |
Old Index