xf86-video-r128: Branch 'master' - 3 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Jan 28 01:20:10 UTC 2022
.gitlab-ci.yml | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
README | 2 -
configure.ac | 2 -
src/r128.h | 2 -
src/r128_accel.c | 2 -
src/r128_crtc.c | 4 +-
src/r128_driver.c | 2 -
src/r128_probe.c | 2 -
src/r128_probe.h | 2 -
src/r128_reg.h | 2 -
src/r128_sarea.h | 2 -
11 files changed, 109 insertions(+), 11 deletions(-)
New commits:
commit 7b0941d1213222fc5f6afaa813acb6092e9eb1e6
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Thu Jan 27 17:12:07 2022 -0800
gitlab CI: add a basic build test
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..a0ee305
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,98 @@
+# vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0 filetype=yaml:
+#
+# This CI uses the freedesktop.org ci-templates.
+# Please see the ci-templates documentation for details:
+# https://freedesktop.pages.freedesktop.org/ci-templates/
+
+.templates_sha: &template_sha 34f4ade99434043f88e164933f570301fd18b125 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+
+
+include:
+ # Arch container builder template
+ - project: 'freedesktop/ci-templates'
+ ref: *template_sha
+ file: '/templates/arch.yml'
+ - project: 'freedesktop/ci-templates'
+ ref: *template_sha
+ file: '/templates/ci-fairy.yml'
+ - template: Security/SAST.gitlab-ci.yml
+
+
+stages:
+ - prep # prep work like rebuilding the container images if there is a change
+ - build # for actually building and testing things in a container
+ - test
+ - deploy
+
+
+variables:
+ FDO_UPSTREAM_REPO: 'xorg/driver/xf86-video-r128'
+ # The tag should be updated each time the list of packages is updated.
+ # Changing a tag forces the associated image to be rebuilt.
+ # Note: the tag has no meaning, we use a date format purely for readability
+ FDO_DISTRIBUTION_TAG: '2022-01-27.0'
+ FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake make xorg-util-macros xorgproto xorg-server-devel pixman libdrm libpciaccess'
+
+
+#
+# Verify that commit messages are as expected, signed-off, etc.
+#
+check-commits:
+ extends:
+ - .fdo.ci-fairy
+ stage: prep
+ script:
+ - ci-fairy check-commits --signed-off-by --junit-xml=results.xml
+ except:
+ - master at xorg/driver/xf86-video-r128
+ variables:
+ GIT_DEPTH: 100
+ artifacts:
+ reports:
+ junit: results.xml
+
+#
+# Verify that the merge request has the allow-collaboration checkbox ticked
+#
+check-merge-request:
+ extends:
+ - .fdo.ci-fairy
+ stage: deploy
+ script:
+ - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml
+ artifacts:
+ when: on_failure
+ reports:
+ junit: results.xml
+ allow_failure: true
+
+
+#
+# Build a container with the given tag and the packages pre-installed.
+# This only happens if the tag changes, otherwise the existing image is
+# re-used.
+#
+container-prep:
+ extends:
+ - .fdo.container-build at arch
+ stage: prep
+ variables:
+ GIT_STRATEGY: none
+
+
+#
+# The default build, runs on the image built above.
+#
+build:
+ stage: build
+ extends:
+ - .fdo.distribution-image at arch
+ script:
+ - autoreconf -ivf
+ - mkdir _builddir
+ - pushd _builddir > /dev/null
+ - ../configure --disable-silent-rules
+ - make
+ - make check
+ - make distcheck
+ - popd > /dev/null
commit b5529f9602bd25d0d042995a349edaba3e6f315a
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Thu Jan 27 17:09:09 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 28aad68..65a571e 100644
--- a/README
+++ b/README
@@ -163,7 +163,7 @@ Xorg mailing list:
https://lists.x.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-r128
diff --git a/src/r128.h b/src/r128.h
index 5e6502b..ebe95dc 100644
--- a/src/r128.h
+++ b/src/r128.h
@@ -442,7 +442,7 @@ typedef struct {
drmAddress agpTex; /* Map */
int log2AGPTexGran;
- /* CCE 2D accleration */
+ /* CCE 2D acceleration */
drmBufPtr indirectBuffer;
int indirectStart;
diff --git a/src/r128_accel.c b/src/r128_accel.c
index 589f49b..30d9f70 100644
--- a/src/r128_accel.c
+++ b/src/r128_accel.c
@@ -964,7 +964,7 @@ static void R128SubsequentScanlineImageWriteRect(ScrnInfoPtr pScrn,
OUTREG(R128_DST_HEIGHT_WIDTH, (h << 16) | ((w + shift) & ~shift));
}
-/* Subsequent XAA indirect iamge write. This is called once for each
+/* Subsequent XAA indirect image write. This is called once for each
scanline. */
static void R128SubsequentImageWriteScanline(ScrnInfoPtr pScrn, int bufno)
{
diff --git a/src/r128_crtc.c b/src/r128_crtc.c
index 5dc8e18..09d0860 100644
--- a/src/r128_crtc.c
+++ b/src/r128_crtc.c
@@ -699,7 +699,7 @@ Bool R128InitDDARegisters(xf86CrtcPtr crtc, R128SavePtr save,
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"XclkFreq = %d; VclkFreq = %d; "
- "per = %d, %d (useable = %d)\n",
+ "per = %d, %d (usable = %d)\n",
XclkFreq,
VclkFreq,
XclksPerTransfer,
@@ -778,7 +778,7 @@ Bool R128InitDDA2Registers(xf86CrtcPtr crtc, R128SavePtr save,
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"XclkFreq = %d; VclkFreq = %d; "
- "per = %d, %d (useable = %d)\n",
+ "per = %d, %d (usable = %d)\n",
XclkFreq,
VclkFreq,
XclksPerTransfer,
diff --git a/src/r128_driver.c b/src/r128_driver.c
index 18ff57f..6791290 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -1846,7 +1846,7 @@ Bool R128ScreenInit(SCREEN_INIT_ARGS_DECL)
#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 --git a/src/r128_probe.c b/src/r128_probe.c
index 363904e..20546c3 100644
--- a/src/r128_probe.c
+++ b/src/r128_probe.c
@@ -276,7 +276,7 @@ r128_get_scrninfo(int entity_num)
}
}
- /* mobility cards support Dual-Head, mark the entity as sharable*/
+ /* mobility cards support Dual-Head, mark the entity as shareable*/
if (pEnt->chipset == PCI_CHIP_RAGE128LE ||
pEnt->chipset == PCI_CHIP_RAGE128LF ||
pEnt->chipset == PCI_CHIP_RAGE128MF ||
diff --git a/src/r128_probe.h b/src/r128_probe.h
index 0b54d21..8c4bfbd 100644
--- a/src/r128_probe.h
+++ b/src/r128_probe.h
@@ -153,7 +153,7 @@ typedef struct
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 --git a/src/r128_reg.h b/src/r128_reg.h
index b147e00..912aca7 100644
--- a/src/r128_reg.h
+++ b/src/r128_reg.h
@@ -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 --git a/src/r128_sarea.h b/src/r128_sarea.h
index 70f9122..c10f05c 100644
--- a/src/r128_sarea.h
+++ b/src/r128_sarea.h
@@ -181,7 +181,7 @@ typedef struct {
* no need to choose whether to kick out your own texture or someone
* else's - simply eject them all in LRU order.
*/
- /* Last elt is sentinal */
+ /* Last elt is sentinel */
drmTextureRegion texList[R128_NR_TEX_HEAPS][R128_NR_TEX_REGIONS+1];
/* last time texture was uploaded */
unsigned int texAge[R128_NR_TEX_HEAPS];
commit 097c8e4f91e22cbeb8778febd1fc0ab8f2b58d3f
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Thu Jan 27 17:07:12 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 d8e6f88..e849d02 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