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-input-elographics 1.4.3, xf86-vide...
details: https://anonhg.NetBSD.org/xsrc/rev/71d61bb2f23c
branches: trunk
changeset: 7367:71d61bb2f23c
user: mrg <mrg%NetBSD.org@localhost>
date: Sun Jan 08 21:34:49 2023 +0000
description:
merge xf86-input-elographics 1.4.3, xf86-video-ast 1.1.6,
xf86-video-r128 6.12.1, and xf86-video-vesa 2.6.0.
diffstat:
external/mit/xf86-input-elographics/dist/src/xf86Elo.c | 2 +-
external/mit/xf86-input-elographics/include/config.h | 8 +-
external/mit/xf86-video-ast/dist/README | 20 -
external/mit/xf86-video-ast/dist/src/ast_driver.c | 6 +-
external/mit/xf86-video-ast/dist/src/ast_vgatool.c | 54 +-
external/mit/xf86-video-r128/dist/src/r128.h | 4 +-
external/mit/xf86-video-r128/dist/src/r128_driver.c | 2 +-
external/mit/xf86-video-r128/dist/src/r128_probe.h | 4 +-
external/mit/xf86-video-r128/dist/src/r128_reg.h | 2 +-
external/mit/xf86-video-vesa/dist/Makefile.in | 40 +-
external/mit/xf86-video-vesa/dist/aclocal.m4 | 20350 +++++++-------
external/mit/xf86-video-vesa/dist/config.guess | 1432 +-
external/mit/xf86-video-vesa/dist/config.h.in | 10 +-
external/mit/xf86-video-vesa/dist/config.sub | 700 +-
external/mit/xf86-video-vesa/dist/configure | 13964 +++++----
external/mit/xf86-video-vesa/dist/configure.ac | 6 +-
external/mit/xf86-video-vesa/dist/depcomp | 2 +-
external/mit/xf86-video-vesa/dist/install-sh | 157 +-
external/mit/xf86-video-vesa/dist/ltmain.sh | 875 +-
external/mit/xf86-video-vesa/dist/man/Makefile.in | 11 +-
external/mit/xf86-video-vesa/dist/missing | 2 +-
external/mit/xf86-video-vesa/dist/src/Makefile.in | 13 +-
external/mit/xf86-video-vesa/dist/src/vesa.c | 44 +-
23 files changed, 19656 insertions(+), 18052 deletions(-)
diffs (truncated from 45342 to 300 lines):
diff -r d5719216c5be -r 71d61bb2f23c external/mit/xf86-input-elographics/dist/src/xf86Elo.c
--- a/external/mit/xf86-input-elographics/dist/src/xf86Elo.c Sun Jan 08 21:32:54 2023 +0000
+++ b/external/mit/xf86-input-elographics/dist/src/xf86Elo.c Sun Jan 08 21:34:49 2023 +0000
@@ -139,7 +139,7 @@
/*
***************************************************************************
*
- * Usefull macros.
+ * Useful macros.
*
***************************************************************************
*/
diff -r d5719216c5be -r 71d61bb2f23c external/mit/xf86-input-elographics/include/config.h
--- a/external/mit/xf86-input-elographics/include/config.h Sun Jan 08 21:32:54 2023 +0000
+++ b/external/mit/xf86-input-elographics/include/config.h Sun Jan 08 21:34:49 2023 +0000
@@ -43,13 +43,13 @@
#define PACKAGE_NAME "xf86-input-elographics"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xf86-input-elographics 1.4.2"
+#define PACKAGE_STRING "xf86-input-elographics 1.4.3"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "xf86-input-elographics"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.4.2"
+#define PACKAGE_VERSION "1.4.3"
/* Major version of this package */
#define PACKAGE_VERSION_MAJOR 1
@@ -58,10 +58,10 @@
#define PACKAGE_VERSION_MINOR 4
/* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 2
+#define PACKAGE_VERSION_PATCHLEVEL 3
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "1.4.2"
+#define VERSION "1.4.3"
diff -r d5719216c5be -r 71d61bb2f23c external/mit/xf86-video-ast/dist/README
--- a/external/mit/xf86-video-ast/dist/README Sun Jan 08 21:32:54 2023 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-xf86-video-ast - ASpeed Technologies graphics 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-ast
-
- http://cgit.freedesktop.org/xorg/driver/xf86-video-ast
-
-For more information on the git code manager, see:
-
- http://wiki.x.org/wiki/GitPage
diff -r d5719216c5be -r 71d61bb2f23c external/mit/xf86-video-ast/dist/src/ast_driver.c
--- a/external/mit/xf86-video-ast/dist/src/ast_driver.c Sun Jan 08 21:32:54 2023 +0000
+++ b/external/mit/xf86-video-ast/dist/src/ast_driver.c Sun Jan 08 21:34:49 2023 +0000
@@ -387,7 +387,7 @@
MessageType from;
int maxPitch, maxHeight;
- /* Suport one adapter only now */
+ /* Support one adapter only now */
if (pScrn->numEntities != 1)
return FALSE;
@@ -705,7 +705,7 @@
pScrn->display->virtualX, pScrn->display->virtualY,
pAST->FbMapSize, LOOKUP_BEST_REFRESH);
- /* fixed some monitors can't get propery validate modes using estimated ratio modes */
+ /* fixed some monitors can't get properly validated modes using estimated ratio modes */
if (i < 2) /* validate modes are too few */
{
i = xf86ValidateModes(pScrn, pScrn->monitor->Modes,
@@ -737,7 +737,7 @@
xf86SetDpi(pScrn, 0, 0);
- /* Accelaration Check */
+ /* Acceleration Check */
pAST->noAccel = TRUE;
pAST->pCMDQPtr = NULL;
pAST->CMDQInfo.ulCMDQSize = 0;
diff -r d5719216c5be -r 71d61bb2f23c external/mit/xf86-video-ast/dist/src/ast_vgatool.c
--- a/external/mit/xf86-video-ast/dist/src/ast_vgatool.c Sun Jan 08 21:32:54 2023 +0000
+++ b/external/mit/xf86-video-ast/dist/src/ast_vgatool.c Sun Jan 08 21:34:49 2023 +0000
@@ -432,11 +432,27 @@
*(ULONG *) (pAST->MMIOVirtualAddr + 0xF004) = 0x1e6e0000;
*(ULONG *) (pAST->MMIOVirtualAddr + 0xF000) = 0x1;
+ /* Based on the Linux DRM driver we might not be able to access this
+ * If we can't just use some sane defaults.
+ *
+ * See drm/drivers/gpu/drm/ast/ast_main.c line 295.
+ */
+
*(ULONG *) (pAST->MMIOVirtualAddr + 0x10000) = 0xFC600309;
- do {
- ;
- } while (*(volatile ULONG *) (pAST->MMIOVirtualAddr + 0x10000) != 0x01);
-
+ for (ulData = 10000; ulData > 0; ulData--)
+ if (*(volatile ULONG *) (pAST->MMIOVirtualAddr + 0x10000) == 0x01)
+ break;
+
+ if (ulData == 0) {
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Unable to read DRAM information, using defaults\n");
+ pAST->ulDRAMBusWidth = 16;
+ pAST->jDRAMType = DRAMTYPE_1Gx16;
+ if (pAST->jChipType == AST2500)
+ pAST->ulMCLK = 800;
+ else
+ pAST->ulMCLK = 396;
+ return;
+ }
ulData = *(volatile ULONG *) (pAST->MMIOVirtualAddr + 0x10004);
/* Get BusWidth */
@@ -673,21 +689,21 @@
if ((pAST->jChipType == AST2300) || (pAST->jChipType == AST2400) || (pAST->jChipType == AST2500))
{
GetIndexRegMask(CRTC_PORT, 0xD1, 0x0E, jReg);
- switch (jReg)
- {
- case 0x04:
- pAST->jTxChipType = Tx_Sil164;
- break;
+ switch (jReg)
+ {
+ case 0x04:
+ pAST->jTxChipType = Tx_Sil164;
+ break;
case 0x08:
- pAST->pDP501FWBufferVirtualAddress = (UCHAR*) calloc(1, 32*1024);
- if (pAST->pDP501FWBufferVirtualAddress)
- {
- if (BackupM68KFW(pScrn, pAST->pDP501FWBufferVirtualAddress, 32*1024) == FALSE)
- {
- free(pAST->pDP501FWBufferVirtualAddress);
- pAST->pDP501FWBufferVirtualAddress = NULL;
- }
- } /* Backup DP501 FW */
+ pAST->pDP501FWBufferVirtualAddress = (UCHAR*) calloc(1, 32*1024);
+ if (pAST->pDP501FWBufferVirtualAddress)
+ {
+ if (BackupM68KFW(pScrn, pAST->pDP501FWBufferVirtualAddress, 32*1024) == FALSE)
+ {
+ free(pAST->pDP501FWBufferVirtualAddress);
+ pAST->pDP501FWBufferVirtualAddress = NULL;
+ }
+ } /* Backup DP501 FW */
case 0x0c:
pAST->jTxChipType = Tx_DP501;
break;
@@ -3397,7 +3413,7 @@
} /* vInitAST2500DRAMReg */
-void static vGetDefaultSettings(ScrnInfoPtr pScrn)
+static void vGetDefaultSettings(ScrnInfoPtr pScrn)
{
ASTRecPtr pAST = ASTPTR(pScrn);
ULONG ulData;
diff -r d5719216c5be -r 71d61bb2f23c external/mit/xf86-video-r128/dist/src/r128.h
--- a/external/mit/xf86-video-r128/dist/src/r128.h Sun Jan 08 21:32:54 2023 +0000
+++ b/external/mit/xf86-video-r128/dist/src/r128.h Sun Jan 08 21:34:49 2023 +0000
@@ -155,7 +155,7 @@
int Tr2w; /* Read to Write Delay */
int Rloop; /* Loop Latency */
int Rloop_fudge; /* Add to ML to get Rloop */
- char *name;
+ const char *name;
} R128RAMRec, *R128RAMPtr;
typedef struct {
@@ -449,7 +449,7 @@
drmAddress agpTex; /* Map */
int log2AGPTexGran;
- /* CCE 2D accleration */
+ /* CCE 2D acceleration */
drmBufPtr indirectBuffer;
int indirectStart;
diff -r d5719216c5be -r 71d61bb2f23c external/mit/xf86-video-r128/dist/src/r128_driver.c
--- a/external/mit/xf86-video-r128/dist/src/r128_driver.c Sun Jan 08 21:32:54 2023 +0000
+++ b/external/mit/xf86-video-r128/dist/src/r128_driver.c Sun Jan 08 21:34:49 2023 +0000
@@ -1929,7 +1929,7 @@
#ifdef R128DRI
if (info->directRenderingEnabled)
/*
- * Recalculate the texture offset and size to accomodate any
+ * Recalculate the texture offset and size to accommodate any
* rounding to a whole number of scanlines.
*/
info->textureOffset = scanlines * width_bytes;
diff -r d5719216c5be -r 71d61bb2f23c external/mit/xf86-video-r128/dist/src/r128_probe.h
--- a/external/mit/xf86-video-r128/dist/src/r128_probe.h Sun Jan 08 21:32:54 2023 +0000
+++ b/external/mit/xf86-video-r128/dist/src/r128_probe.h Sun Jan 08 21:34:49 2023 +0000
@@ -97,7 +97,7 @@
#define PCI_CHIP_RAGE128TT 0x5454
#define PCI_CHIP_RAGE128TU 0x5455
-extern DriverRec R128;
+extern _X_EXPORT DriverRec R128;
typedef enum
{
@@ -153,7 +153,7 @@
Bool HasSecondary;
Bool HasCRTC2;
/*These two registers are used to make sure the CRTC2 is
- retored before CRTC_EXT, otherwise it could lead to blank screen.*/
+ restored before CRTC_EXT, otherwise it could lead to blank screen.*/
Bool IsSecondaryRestored;
Bool RestorePrimary;
diff -r d5719216c5be -r 71d61bb2f23c external/mit/xf86-video-r128/dist/src/r128_reg.h
--- a/external/mit/xf86-video-r128/dist/src/r128_reg.h Sun Jan 08 21:32:54 2023 +0000
+++ b/external/mit/xf86-video-r128/dist/src/r128_reg.h Sun Jan 08 21:34:49 2023 +0000
@@ -1524,7 +1524,7 @@
#define R128_CCE_VC_CNTL_PRIM_WALK_RING 0x00000030
#define R128_CCE_VC_CNTL_NUM_SHIFT 16
-/* hmm copyed blindly (no specs) from radeon.h ... */
+/* hmm copied blindly (no specs) from radeon.h ... */
#define R128_RE_TOP_LEFT 0x26c0
# define R128_RE_LEFT_SHIFT 0
# define R128_RE_TOP_SHIFT 16
diff -r d5719216c5be -r 71d61bb2f23c external/mit/xf86-video-vesa/dist/Makefile.in
--- a/external/mit/xf86-video-vesa/dist/Makefile.in Sun Jan 08 21:32:54 2023 +0000
+++ b/external/mit/xf86-video-vesa/dist/Makefile.in Sun Jan 08 21:34:49 2023 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -155,8 +155,8 @@
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
cscope distdir distdir-am dist dist-all distcheck
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
- $(LISP)config.h.in
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
+ config.h.in
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
# *not* preserved.
@@ -173,13 +173,10 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in COPYING \
- ChangeLog INSTALL compile config.guess config.sub install-sh \
- ltmain.sh missing
+ ChangeLog INSTALL README.md compile config.guess config.sub \
+ install-sh ltmain.sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -215,9 +212,11 @@
dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
done; \
reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz
GZIP_ENV = --best
-DIST_TARGETS = dist-bzip2 dist-gzip
+DIST_TARGETS = dist-xz dist-gzip
+# Exists only to be overridden by the user if desired.
+AM_DISTCHECK_DVI_TARGET = dvi
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -239,8 +238,9 @@
CCDEPMODE = @CCDEPMODE@
Home |
Main Index |
Thread Index |
Old Index