xf86-video-mach64: Branch 'master' - 2 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Sat Jan 22 20:54:21 UTC 2022
README | 2 +-
configure.ac | 2 +-
src/aticonfig.c | 2 +-
src/atidri.c | 2 +-
src/atidri.h | 2 +-
src/atimach64io.h | 4 ++--
src/atimach64render.c | 6 +++---
src/atimach64xv.c | 2 +-
src/atiscreen.c | 2 +-
src/ativgaio.h | 2 +-
src/atividmem.c | 2 +-
11 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 82129368107c2a0608ad350b812c07ba6e07f498
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Sat Jan 22 12:29:58 2022 -0800
Fix spelling/wording issues
Found by using:
codespell --builtin clear,rare,usage,informal,code,names
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
diff --git a/README b/README
index 94bc164..f7a5037 100644
--- a/README
+++ b/README
@@ -834,7 +834,7 @@ Xorg mailing list:
https://lists.freedesktop.org/mailman/listinfo/xorg
-The master development code repository can be found at:
+The primary development code repository can be found at:
https://gitlab.freedesktop.org/xorg/driver/xf86-video-mach64
diff --git a/src/aticonfig.c b/src/aticonfig.c
index 621e79e..bad6474 100644
--- a/src/aticonfig.c
+++ b/src/aticonfig.c
@@ -442,7 +442,7 @@ ATIProcessOptions
pATI->OptionDMAMode = MACH64_MODE_MMIO;
else {
xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
- "Unkown dma_mode: '%s'\n", DMAMode);
+ "Unknown dma_mode: '%s'\n", DMAMode);
xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
"Valid dma_mode options are: 'async','sync','mmio'\n");
xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
diff --git a/src/atidri.c b/src/atidri.c
index 8c8d81c..a172bfa 100644
--- a/src/atidri.c
+++ b/src/atidri.c
@@ -1321,7 +1321,7 @@ Bool ATIDRIFinishScreenInit( ScreenPtr pScreen )
* an extraction of the hardware-affecting bits from mach64_do_init_drm()
* (see atidrm.c)
* I am assuming here that pATI->pDRIServerInfo doesn't change
- * elsewhere in incomaptible ways.
+ * elsewhere in incompatible ways.
* How will this code react to resuming after a failed resumeor pci based dri ?
*/
void ATIDRIResume( ScreenPtr pScreen )
diff --git a/src/atidri.h b/src/atidri.h
index 52d4b44..bfc4b0f 100644
--- a/src/atidri.h
+++ b/src/atidri.h
@@ -38,7 +38,7 @@
#define ATI_AGP_MAX_MODE 2
-/* Imported from the radeon suspend code writen by cpbotha at ieee.org
+/* Imported from the radeon suspend code written by cpbotha at ieee.org
* to enable suspend/resume support for the mach64 card.
*/
extern void ATIDRIResume(ScreenPtr pScreen);
diff --git a/src/atimach64io.h b/src/atimach64io.h
index d1b14d2..80553f8 100644
--- a/src/atimach64io.h
+++ b/src/atimach64io.h
@@ -76,9 +76,9 @@
* any ordering constraints the engine might impose. Groups larger than 16
* outf()'s should be split up into two or more groups as needed (but not
* necessarily wanted). The outf() groups that result should be immediately
- * preceeded by an ATIMach64WaitForFIFO(n) call, where "n" is the number of
+ * preceded by an ATIMach64WaitForFIFO(n) call, where "n" is the number of
* outf()'s in the group with the exception that groups containing a single
- * outf() should not be thus preceeded. This means "n" should not be less than
+ * outf() should not be thus preceded. This means "n" should not be less than
* 2, nor larger than 16.
*/
diff --git a/src/atimach64render.c b/src/atimach64render.c
index 08c7cc9..dae939e 100644
--- a/src/atimach64render.c
+++ b/src/atimach64render.c
@@ -77,8 +77,8 @@
*
* A texture unit combines the fragment color (VERTEX_?_ARGB) coming in from
* triangle rasterization with the texel from the texture according to the
- * texture environment (TEX_LIGHT_FCN_). "1x1 R" textures may come in as frag-
- * ment colors, eliminating the need for multitexturing in all interesting
+ * texture environment (TEX_LIGHT_FCN_). "1x1 R" textures may come in as
+ * fragment colors, eliminating the need for multitexturing in all interesting
* cases (via also uses this optimization).
*
* Texture registers are saved/restored and cached (see atimach64.c). TEX_CNTL
@@ -88,7 +88,7 @@
*
* Vertex registers are not saved/restored. This shouldn't be a problem though
* either for DRI or VT switch because vertex registers are set and used within
- * a signle acceleration hook. Synchronization between the DDX and DRI is based
+ * a single acceleration hook. Synchronization between the DDX and DRI is based
* on calling ATIDRISync() at the beginning of each DDX acceleration hook,
* which suggests the assumption that individual acceleration hooks are not
* interrupted.
diff --git a/src/atimach64xv.c b/src/atimach64xv.c
index 5e43ab8..6e34594 100644
--- a/src/atimach64xv.c
+++ b/src/atimach64xv.c
@@ -307,7 +307,7 @@ ATIMach64SetDefaultAttributes
}
/*
- * There is a one-to-one correspondance between elements of the following array
+ * There is a one-to-one correspondence between elements of the following array
* and those of ATIMach64Attribute.
*/
static ATIMach64AttributeRec ATIMach64AttributeInfo[nATIMach64Attribute] =
diff --git a/src/atiscreen.c b/src/atiscreen.c
index aa1d1cb..bb7fd4b 100644
--- a/src/atiscreen.c
+++ b/src/atiscreen.c
@@ -240,7 +240,7 @@ ATIMach64SetupMemXAA
scanlines = total / widthBytes;
if (scanlines > ATIMach64MaxY) scanlines = ATIMach64MaxY;
- /* 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.
* FIXME: Is this actually needed?
*/
diff --git a/src/ativgaio.h b/src/ativgaio.h
index c73e8ae..14e3467 100644
--- a/src/ativgaio.h
+++ b/src/ativgaio.h
@@ -38,7 +38,7 @@
extern void ATISetVGAIOBase(ATIPtr, const CARD8);
-/* Odds and ends to ease reading and writting of indexed registers */
+/* Odds and ends to ease reading and writing of indexed registers */
#define GetReg(_Register, _Index) \
( \
outb(_Register, _Index), \
diff --git a/src/atividmem.c b/src/atividmem.c
index 0104a0a..b9df6d7 100644
--- a/src/atividmem.c
+++ b/src/atividmem.c
@@ -47,7 +47,7 @@ const char *ATIMemoryTypeNames_88800CX[] =
"DRAM (256Kx4, x8, x16)",
"EDO DRAM (256Kx4, x8, x16)",
"Unknown video memory type",
- "DRAM (256Kx16 with assymetric RAS/CAS)",
+ "DRAM (256Kx16 with asymmetric RAS/CAS)",
"Unknown video memory type",
"Unknown video memory type",
"Unknown video memory type",
commit 10c2894c7164a959fc79e7844251025c04405059
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Sat Jan 22 12:25:45 2022 -0800
Build xz tarballs instead of bzip2
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
diff --git a/configure.ac b/configure.ac
index 1b31139..9744dbd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.)
# Initialize Automake
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-xz])
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
More information about the xorg-commit
mailing list