Two diffs attached.
diff -purN xserver-xorg-video-geode-2.11.20/debian/changelog
xserver-xorg-video-geode-2.11.21/debian/changelog
--- xserver-xorg-video-geode-2.11.20/debian/changelog 2022-02-14
04:44:09.000000000 +0200
+++ xserver-xorg-video-geode-2.11.21/debian/changelog 2023-05-20
20:55:53.000000000 +0300
@@ -1,3 +1,18 @@
+xserver-xorg-video-geode (2.11.21-1) unstable; urgency=medium
+
+ * New upstream release.
+ - Drop all patches (merged upstream).
+ * [watch]
+ = Monitor xz instead of gz tarballs.
+ * [upstream]
+ + Import Alan Coopersmith's GPG key.
+ * [control]
+ = Bump Standards-Version to 4.6.2 (no change required).
+ * [patches]
+ + 0001_migrate_ac_prog_libtool_to_lt_init.patch (libtool 2.60 to 2.71).
+
+ -- Martin-Éric Racine <martin-eric.rac...@iki.fi> Sat, 20 May 2023 20:55:53
+0300
+
xserver-xorg-video-geode (2.11.20-9) unstable; urgency=medium
* Merged patches from Git:
diff -purN xserver-xorg-video-geode-2.11.20/debian/control
xserver-xorg-video-geode-2.11.21/debian/control
--- xserver-xorg-video-geode-2.11.20/debian/control 2021-09-20
09:40:24.000000000 +0300
+++ xserver-xorg-video-geode-2.11.21/debian/control 2023-05-20
17:24:52.000000000 +0300
@@ -17,7 +17,7 @@ Build-Depends: debhelper-compat (= 13),
xserver-xorg-dev (>= 2:1.4~),
xutils-dev
Rules-Requires-Root: no
-Standards-Version: 4.6.0.1
+Standards-Version: 4.6.2
Package: xserver-xorg-video-geode
Architecture: any-i386
diff -purN xserver-xorg-video-geode-2.11.20/debian/copyright
xserver-xorg-video-geode-2.11.21/debian/copyright
--- xserver-xorg-video-geode-2.11.20/debian/copyright 2022-02-14
04:44:09.000000000 +0200
+++ xserver-xorg-video-geode-2.11.21/debian/copyright 2023-05-20
20:55:49.000000000 +0300
@@ -29,7 +29,7 @@ License: Expat
DEALINGS IN THE SOFTWARE.
Files: debian/*
-Copyright: © 2007-2022 Martin-Éric Racine <martin-eric.rac...@iki.fi>
+Copyright: © 2007-2023 Martin-Éric Racine <martin-eric.rac...@iki.fi>
License: GPL-2+
On Debian systems, the complete text of the GNU General Public License
can be found in </usr/share/common-licenses/GPL-2>.
diff -purN
xserver-xorg-video-geode-2.11.20/debian/patches/0001_migrate_ac_prog_libtool_to_lt_init.patch
xserver-xorg-video-geode-2.11.21/debian/patches/0001_migrate_ac_prog_libtool_to_lt_init.patch
---
xserver-xorg-video-geode-2.11.20/debian/patches/0001_migrate_ac_prog_libtool_to_lt_init.patch
1970-01-01 02:00:00.000000000 +0200
+++
xserver-xorg-video-geode-2.11.21/debian/patches/0001_migrate_ac_prog_libtool_to_lt_init.patch
2023-05-20 18:50:12.000000000 +0300
@@ -0,0 +1,51 @@
+Description: Migrate libtool from 2.60 to 2.71
+Author: Martin-Éric Racine <martin-eric.rac...@iki.fi>
+Last-Update: 2023-05-20
+
+Migrate configure.ac from libtool 2.60 to 2.71 and remove trailing space.
+
+--- xserver-xorg-video-geode-2.11.21.orig/configure.ac
++++ xserver-xorg-video-geode-2.11.21/configure.ac
+@@ -21,7 +21,7 @@
+ # Process this file with autoconf to produce a configure script
+
+ # Initialize Autoconf
+-AC_PREREQ(2.60)
++AC_PREREQ([2.71])
+ AC_INIT([xf86-video-geode],
+ [2.11.21],
+
[https://gitlab.freedesktop.org/xorg/driver/xf86-video-geode/-/issues],
+@@ -39,17 +39,17 @@ AM_MAINTAINER_MODE
+
+ # Initialize libtool
+ AC_DISABLE_STATIC
+-AC_PROG_LIBTOOL
++LT_INIT
+
+ # Require xorg-macros: XORG_DEFAULT_OPTIONS
+-m4_ifndef([XORG_MACROS_VERSION],
++m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.4 or later before running
autoconf/autogen])])
+ XORG_MACROS_VERSION(1.4)
+ XORG_DEFAULT_OPTIONS
+
+ # Checks for programs.
+ AC_DISABLE_STATIC
+-AC_PROG_LIBTOOL
++LT_INIT
+
+ AH_TOP([#include "xorg-server.h"])
+
+@@ -65,10 +65,10 @@ AC_ARG_WITH(xorg-module-dir,
+ AC_SUBST([moduledir])
+
+ # Define a configure option to enable/disable lcd panel support
+-AC_ARG_ENABLE(geodegx-panel,
++AC_ARG_ENABLE(geodegx-panel,
+ AS_HELP_STRING([--disable-geodegx-panel],
+ [Disable support for flatpanels with the Geode
GX]),
+- [ ],
++ [ ],
+ [ PANEL_CPPFLAGS=-DPNL_SUP ])
+ AC_SUBST(PANEL_CPPFLAGS)
+
diff -purN xserver-xorg-video-geode-2.11.20/debian/patches/01_fno-common.patch
xserver-xorg-video-geode-2.11.21/debian/patches/01_fno-common.patch
--- xserver-xorg-video-geode-2.11.20/debian/patches/01_fno-common.patch
2020-12-03 18:39:09.000000000 +0200
+++ xserver-xorg-video-geode-2.11.21/debian/patches/01_fno-common.patch
1970-01-01 02:00:00.000000000 +0200
@@ -1,93 +0,0 @@
-From 24b27b11b6dcb0946159ad0fb644e30a16f910d6 Mon Sep 17 00:00:00 2001
-From: Christian Gmeiner <christian.gmei...@gmail.com>
-Date: Thu, 3 Dec 2020 14:22:23 +0100
-Subject: [PATCH] fix 'multiple definition of' linker error
-
-Fix for FTBFS due to -fno-common on GCC 10.
-
-Signed-off-by: Christian Gmeiner <christian.gmei...@gmail.com>
----
- src/geode.h | 8 ++++----
- src/gx_driver.c | 2 +-
- src/gx_video.c | 2 +-
- src/lx_driver.c | 2 +-
- 4 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/geode.h b/src/geode.h
-index eb61c28..1b144ff 100644
---- a/src/geode.h
-+++ b/src/geode.h
-@@ -343,7 +343,7 @@ typedef struct _geodeRec {
-
- /* option flags are self-explanatory */
- #ifdef HAVE_LX
--enum {
-+enum LX_GeodeOpts {
- LX_OPTION_SW_CURSOR,
- LX_OPTION_HW_CURSOR,
- LX_OPTION_NOCOMPRESSION,
-@@ -357,11 +357,11 @@ enum {
- LX_OPTION_FBSIZE,
- LX_OPTION_PANEL_MODE,
- LX_OPTION_DONT_PROGRAM
--} LX_GeodeOpts;
-+};
- #endif
-
- #ifdef HAVE_GX
--enum {
-+enum GX_GeodeOpts {
- GX_OPTION_SW_CURSOR,
- GX_OPTION_HW_CURSOR,
- GX_OPTION_NOCOMPRESSION,
-@@ -378,7 +378,7 @@ enum {
- GX_OPTION_FBSIZE,
- GX_OPTION_PANEL_GEOMETRY,
- GX_OPTION_DONT_PROGRAM
--} GX_GeodeOpts;
-+};
- #endif
-
- /* geode_dcon.c */
-diff --git a/src/gx_driver.c b/src/gx_driver.c
-index 4de336e..188828c 100644
---- a/src/gx_driver.c
-+++ b/src/gx_driver.c
-@@ -78,7 +78,7 @@
-
- extern OptionInfoRec GX_GeodeOptions[];
-
--unsigned char *XpressROMPtr;
-+extern unsigned char *XpressROMPtr;
-
- static inline void
- gx_enable_dac_power(void)
-diff --git a/src/gx_video.c b/src/gx_video.c
-index 0d3e1c5..7964d17 100644
---- a/src/gx_video.c
-+++ b/src/gx_video.c
-@@ -112,7 +112,7 @@ void GXSetVideoPosition(int x, int y, int width, int
height,
-
- extern void GXAccelSync(ScrnInfoPtr pScrni);
-
--int DeltaX, DeltaY;
-+extern int DeltaX, DeltaY;
-
- unsigned long graphics_lut[256];
- static int lutflag = 0;
-diff --git a/src/lx_driver.c b/src/lx_driver.c
-index 47f6875..9cb8889 100644
---- a/src/lx_driver.c
-+++ b/src/lx_driver.c
-@@ -74,7 +74,7 @@
-
- extern OptionInfoRec LX_GeodeOptions[];
-
--unsigned char *XpressROMPtr;
-+extern unsigned char *XpressROMPtr;
-
- static Bool
- LXSaveScreen(ScreenPtr pScrn, int mode)
---
-GitLab
-
diff -purN
xserver-xorg-video-geode-2.11.20/debian/patches/02_Updated-the-README.patch
xserver-xorg-video-geode-2.11.21/debian/patches/02_Updated-the-README.patch
--- xserver-xorg-video-geode-2.11.20/debian/patches/02_Updated-the-README.patch
2020-12-15 20:23:37.000000000 +0200
+++ xserver-xorg-video-geode-2.11.21/debian/patches/02_Updated-the-README.patch
1970-01-01 02:00:00.000000000 +0200
@@ -1,55 +0,0 @@
-From 0bb81df318e2dbd093040ba35a51b726b8954cb5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin-=C3=89ric=20Racine?= <martin-eric.rac...@iki.fi>
-Date: Tue, 15 Dec 2020 20:17:25 +0200
-Subject: [PATCH] Updated the README's FAQ for Linux 4.x+ requirements
-
----
- README | 19 ++++++++++++++++++-
- 1 file changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/README b/README
-index cb96f64..e3ec6ee 100644
---- a/README
-+++ b/README
-@@ -1,6 +1,6 @@
- xf86-video-geode -- AMD Geode GX and LX graphics driver for X.org
- =================================================================
--README last updated: 2011-11-24
-+README last updated: 2020-12-15
-
- 1.INTRODUCTION
-
-@@ -45,6 +45,11 @@ LX: 1920x1440 (CRT) and 1600x1200 (TFT)
- GX: 1600x1200 (CRT) and 1280x1024 (TFT)
- SC: 1280x1024 (CRT/TFT) *** Currently unsupported by this driver ***
-
-+Additionally, on the LX, the driver can DCC probe the display and calculate
-+the clockrate for the maximum resolution supported by the display. However,
-+this won't work on LX platforms with GPIO configured for serial console. On
-+such hardware, the resolution must be specified in /etc/X11/xorg.conf.
-+
- 5.CONFIGURATION OPTIONS
-
- You can specify driver options in /etc/X11/xorg.conf in the usual fashion:
-@@ -80,6 +85,18 @@ ExaScratch: Specify the amount of extra EXA scratch buffer
(in bytes)
-
- 6.FREQUENTLY ASKED QUESTIONS (FAQ)
-
-+Q: Why doesn't the GEODE driver work on recent Linux kernels?
-+
-+A: Since kernel 4.x Linux has strong memory protection. If the kernel is
-+ booted with a frame buffer (e.g. vesafb) it reserves the video memory
-+ for itself. Disabling this requires booting the kernel in non-graphic
-+ mode. On GRUB, this is configured by this /etc/default/grub option:
-+
-+ GRUB_GFXPAYLOAD_LINUX=text
-+
-+ Once this option has been added and the GRUB configuration refreshed,
-+ the GEODE driver will launch on recent kernels as previously.
-+
- Q: Why doesn't the GEODE driver work at WXGA (wide screen) resolutions?
-
- A: Make sure that TFT Panel support is disabled in the BIOS settings,
---
-2.20.1
-
diff -purN
xserver-xorg-video-geode-2.11.20/debian/patches/03_Mention-iomem-relaxed.patch
xserver-xorg-video-geode-2.11.21/debian/patches/03_Mention-iomem-relaxed.patch
---
xserver-xorg-video-geode-2.11.20/debian/patches/03_Mention-iomem-relaxed.patch
2021-05-17 21:55:02.000000000 +0300
+++
xserver-xorg-video-geode-2.11.21/debian/patches/03_Mention-iomem-relaxed.patch
1970-01-01 02:00:00.000000000 +0200
@@ -1,37 +0,0 @@
-From ae82f4b2746eb24295389f184bc18a9cb6c8f31c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin-=C3=89ric=20Racine?= <martin-eric.rac...@iki.fi>
-Date: Mon, 17 May 2021 21:50:23 +0300
-Subject: [PATCH] Mention iomem=relaxed in the README FAQ for Linux 4.x+
- requirements
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Thanks to Ben Hutchings for pointing out that vesafb and legacy X
-drivers can peacefully coexist if iomem=relaxed gets added to the
-Linux kernel cmdline options.
-
-Signed-off-by: Martin-Éric Racine <martin-eric.rac...@iki.fi>
----
- README | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/README b/README
-index e3ec6ee..111f9a6 100644
---- a/README
-+++ b/README
-@@ -94,7 +94,10 @@ A: Since kernel 4.x Linux has strong memory protection. If
the kernel is
-
- GRUB_GFXPAYLOAD_LINUX=text
-
-- Once this option has been added and the GRUB configuration refreshed,
-+ Alternately, adding iomem=relaxed to GRUB_CMDLINE_LINUX_DEFAULT will
-+ allow the video memory to be accessed by vesafb and the GEODE driver.
-+
-+ Once either option has been added and the GRUB configuration refreshed,
- the GEODE driver will launch on recent kernels as previously.
-
- Q: Why doesn't the GEODE driver work at WXGA (wide screen) resolutions?
---
-2.20.1
-
diff -purN
xserver-xorg-video-geode-2.11.20/debian/patches/04_xz-tarballs-instead-of-bzip2.patch
xserver-xorg-video-geode-2.11.21/debian/patches/04_xz-tarballs-instead-of-bzip2.patch
---
xserver-xorg-video-geode-2.11.20/debian/patches/04_xz-tarballs-instead-of-bzip2.patch
2022-02-14 04:35:37.000000000 +0200
+++
xserver-xorg-video-geode-2.11.21/debian/patches/04_xz-tarballs-instead-of-bzip2.patch
1970-01-01 02:00:00.000000000 +0200
@@ -1,26 +0,0 @@
-From 2c415eb841c94238cf49c44dea4a83fa83621307 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersm...@oracle.com>
-Date: Sat, 22 Jan 2022 10:47:51 -0800
-Subject: [PATCH 1/2] Build xz tarballs instead of bzip2
-
-Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0082814..ef3cadb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -34,7 +34,7 @@ AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_AUX_DIR([build-aux])
-
- # Initialize Automake
--AM_INIT_AUTOMAKE([foreign dist-bzip2])
-+AM_INIT_AUTOMAKE([foreign dist-xz])
- AM_MAINTAINER_MODE
-
- # Initialize libtool
---
-2.30.2
-
diff -purN
xserver-xorg-video-geode-2.11.20/debian/patches/05_Fix-spelling-wording-issues.patch
xserver-xorg-video-geode-2.11.21/debian/patches/05_Fix-spelling-wording-issues.patch
---
xserver-xorg-video-geode-2.11.20/debian/patches/05_Fix-spelling-wording-issues.patch
2022-02-14 04:35:37.000000000 +0200
+++
xserver-xorg-video-geode-2.11.21/debian/patches/05_Fix-spelling-wording-issues.patch
1970-01-01 02:00:00.000000000 +0200
@@ -1,853 +0,0 @@
-From 27ea30c38994b689d6e27e8fac8c63d69179f9b5 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersm...@oracle.com>
-Date: Sat, 22 Jan 2022 11:04:32 -0800
-Subject: [PATCH 2/2] Fix spelling/wording issues
-
-Found by using:
- codespell --builtin clear,rare,usage,informal,code,names
-
-Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
----
- src/cim/cim_defs.h | 2 +-
- src/cim/cim_df.c | 4 ++--
- src/cim/cim_msr.c | 2 +-
- src/cim/cim_parm.h | 2 +-
- src/cim/cim_regs.h | 2 +-
- src/cim/cim_vg.c | 2 +-
- src/cim/cim_vip.c | 4 ++--
- src/durango.c | 2 +-
- src/geode.h | 4 ++--
- src/geode_driver.c | 4 ++--
- src/gfx/disp_gu1.c | 10 +++++-----
- src/gfx/disp_gu2.c | 12 ++++++------
- src/gfx/gfx_disp.c | 4 ++--
- src/gfx/gfx_init.c | 2 +-
- src/gfx/gfx_priv.h | 2 +-
- src/gfx/gfx_rtns.h | 4 ++--
- src/gfx/gfx_vid.c | 2 +-
- src/gfx/msr_rdcl.c | 4 ++--
- src/gfx/release.txt | 12 ++++++------
- src/gfx/rndr_gu1.c | 2 +-
- src/gfx/rndr_gu2.c | 2 +-
- src/gfx/tv_fs450.c | 14 +++++++-------
- src/gfx/tv_fs450.h | 2 +-
- src/gfx/vid_1200.c | 4 ++--
- src/gfx/vid_5530.c | 2 +-
- src/gfx/vid_rdcl.c | 2 +-
- src/gx_accel.c | 10 +++++-----
- src/gx_cursor.c | 8 ++++----
- src/gx_driver.c | 10 +++++-----
- src/gx_vga.c | 2 +-
- src/gx_video.c | 6 +++---
- src/lx_display.c | 2 +-
- src/lx_driver.c | 2 +-
- src/lx_exa.c | 2 +-
- src/lx_memory.c | 2 +-
- src/panel/pnl_bios.c | 2 +-
- src/panel/pnl_init.c | 2 +-
- src/panel/readme.txt | 6 +++---
- src/z4l.c | 4 ++--
- 39 files changed, 83 insertions(+), 83 deletions(-)
-
-diff --git a/src/cim/cim_defs.h b/src/cim/cim_defs.h
-index 9084a07..a81d5bd 100644
---- a/src/cim/cim_defs.h
-+++ b/src/cim/cim_defs.h
-@@ -315,7 +315,7 @@
- /*-----------------------------------------------------------------*/
- /* STRING MACROS */
- /* These macros are included to facilitate the optimization of */
--/* routines that write or copy large amounts of data. Two vesions */
-+/* routines that write or copy large amounts of data. Two versions */
- /* of these macros are included. One is intended for operating */
- /* systems that allow the use of inline assembly, while the other */
- /* is a pure C implementation for stricter operating systems. */
-diff --git a/src/cim/cim_df.c b/src/cim/cim_df.c
-index d3c1149..61a77d1 100644
---- a/src/cim/cim_df.c
-+++ b/src/cim/cim_df.c
-@@ -138,7 +138,7 @@ df_configure_video_source(DF_VIDEO_SOURCE_PARAMS *
video_source_odd,
- /* STORE THE DESIRED SCALING PROCEDURE */
- /* Cimarron supports two modes when programming the scale and position */
- /* of the video window. The first mode is designed to implicitly apply */
-- /* the graphics scale to any video operations. The second applys the */
-+ /* the graphics scale to any video operations. The second applies the */
- /* video unchanged, allowing complete control by the user. To allow */
- /* visibility between modules, the current mode is stored in a spare */
- /* bit in the DF miscellaneous register. */
-@@ -866,7 +866,7 @@ df_set_video_enable(int enable, unsigned long flags)
- WRITE_REG32(DC3_GENERAL_CFG, (gcfg & ~DC3_GCFG_VIDE));
-
- /* DISABLE COLOR KEY WINDOW WHEN VIDEO IS INACTIVE */
-- /* To mimic legacy functionality, we disble color keying */
-+ /* To mimic legacy functionality, we disable color keying */
- /* when the video window is not active. We will restore */
- /* the enable when video is re-enabled if the appropriate */
- /* bit is set in display config. */
-diff --git a/src/cim/cim_msr.c b/src/cim/cim_msr.c
-index 6dd4183..d43bc4b 100644
---- a/src/cim/cim_msr.c
-+++ b/src/cim/cim_msr.c
-@@ -43,7 +43,7 @@ GEODELINK_NODE msr_dev_lookup[MSR_DEVICE_EMPTY];
- /*---------------------------------------------------------------------------
- * msr_init_table
- *
-- * This routine intializes the internal MSR table in Cimarron. This table is
-+ * This routine initializes the internal MSR table in Cimarron. This table is
- * used for any MSR device accesses.
- *--------------------------------------------------------------------------*/
-
-diff --git a/src/cim/cim_parm.h b/src/cim/cim_parm.h
-index a8fa9b0..de6d2b6 100644
---- a/src/cim/cim_parm.h
-+++ b/src/cim/cim_parm.h
-@@ -109,7 +109,7 @@ typedef struct tagGeodeLinkNode {
-
- /*---------------------------------------------*/
- /* QWORD DATA STRUCTURE */
--/* 64-bit data structure for MSR acess. */
-+/* 64-bit data structure for MSR access. */
- /*---------------------------------------------*/
-
- typedef struct tagQ_WORD {
-diff --git a/src/cim/cim_regs.h b/src/cim/cim_regs.h
-index f0bc95a..a120a52 100644
---- a/src/cim/cim_regs.h
-+++ b/src/cim/cim_regs.h
-@@ -832,7 +832,7 @@ typedef struct tagPLLFrequency {
- /*----------------------------------------------------------------*/
-
- /*----------------------------*/
--/* STATIC GEODELINK ADRESSES */
-+/* STATIC GEODELINK ADDRESSES */
- /*----------------------------*/
-
- #define MSR_ADDRESS_GLIU0 0x10000000
-diff --git a/src/cim/cim_vg.c b/src/cim/cim_vg.c
-index 784519d..46984b5 100644
---- a/src/cim/cim_vg.c
-+++ b/src/cim/cim_vg.c
-@@ -901,7 +901,7 @@ vg_set_custom_mode(VG_DISPLAY_MODE * mode_params, int bpp)
- == VG_MODEFLAG_INT_FLICKER) ||
- (irq_ctl & DC3_IRQFILT_GFX_FILT_EN)) {
- /* HIGH BANDWIDTH */
-- /* Set agressive watermarks and disallow forced low priority */
-+ /* Set aggressive watermarks and disallow forced low priority */
-
- gcfg |= 0x0000BA01;
- dcfg |= 0x000EA000;
-diff --git a/src/cim/cim_vip.c b/src/cim/cim_vip.c
-index a88b65f..f37a394 100644
---- a/src/cim/cim_vip.c
-+++ b/src/cim/cim_vip.c
-@@ -207,7 +207,7 @@ vip_update_601_params(VIP_601PARAMS * buffer)
- *
- * The new buffer addresses are written to the hardware registers although
- * they may not be latched immediately. Calling vip_is_buffer_update_latched
-- * allows the determination of whether the update has occured.
-+ * allows the determination of whether the update has occurred.
- *
- * Review the Cimarron VIP API documentation to determine which buffer
- * addresses are latched immediately.
-@@ -1085,7 +1085,7 @@ vip_restore_state(VIPSTATEBUFFER * restore_buffer)
- *
- * This routine returns the current interrupt state of the system. The
- * rv can be tested with the following flags to determine if the appropriate
-- * event has occured.
-+ * event has occurred.
- *--------------------------------------------------------------------------*/
-
- unsigned long
-diff --git a/src/durango.c b/src/durango.c
-index fbca7b2..be494ed 100644
---- a/src/durango.c
-+++ b/src/durango.c
-@@ -24,7 +24,7 @@
- * */
-
- /* The previous version of this file was way more complex then it should have
-- been - remove the unnessesary #defines and routines, and concentrate on
-+ been - remove the unnecessary #defines and routines, and concentrate on
- Linux for now.
- */
-
-diff --git a/src/geode.h b/src/geode.h
-index 1b144ff..3dd3e15 100644
---- a/src/geode.h
-+++ b/src/geode.h
-@@ -215,7 +215,7 @@ typedef struct _geodeRec {
- unsigned long CursorStartOffset;
-
- int Pitch; /* display FB pitch */
-- int displaySize; /* The size of the visibile area */
-+ int displaySize; /* The size of the visible area */
-
- ExaOffscreenArea *shadowArea;
-
-@@ -285,7 +285,7 @@ typedef struct _geodeRec {
- int PanelX;
- int PanelY;
-
-- int displayPitch; /* The pitch ofthe visible area */
-+ int displayPitch; /* The pitch of the visible area */
- int displayOffset; /* The offset of the visible area */
-
- DisplayModePtr curMode;
-diff --git a/src/geode_driver.c b/src/geode_driver.c
-index 9cd0af9..e16ea72 100644
---- a/src/geode_driver.c
-+++ b/src/geode_driver.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2006 Avanced Micro Devices, Inc.
-+ * Copyright (c) 2006 Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
-@@ -414,7 +414,7 @@ AmdPciProbe(DriverPtr driver,
- *
- * Comments :This should be minimal probe and it should under no
- * circumstances change the state of the hardware.Don't do
-- * any intiallizations other than the required
-+ * any initializations other than the required
- * ScreenInforec.
- *----------------------------------------------------------------------------
- */
-diff --git a/src/gfx/disp_gu1.c b/src/gfx/disp_gu1.c
-index 2cb1ed5..a03c754 100644
---- a/src/gfx/disp_gu1.c
-+++ b/src/gfx/disp_gu1.c
-@@ -789,11 +789,11 @@ gfx_set_display_offset(unsigned long offset)
- WRITE_REG32(DC_UNLOCK, DC_UNLOCK_VALUE);
-
- /* START ADDRESS EFFECTS DISPLAY COMPRESSION */
-- /* Disable compression for non-zero start addresss values. */
-- /* Enable compression if offset is zero and comression is intended to */
-- /* be enabled from a previous call to "gfx_set_compression_enable". */
-- /* Compression should be disabled BEFORE the offset is changed */
-- /* and enabled AFTER the offset is changed. */
-+ /* Disable compression for non-zero start address values. */
-+ /* Enable compression if offset is zero and compression is intended to */
-+ /* be enabled from a previous call to "gfx_set_compression_enable". */
-+ /* Compression should be disabled BEFORE the offset is changed */
-+ /* and enabled AFTER the offset is changed. */
- if (offset == 0) {
- WRITE_REG32(DC_FB_ST_OFFSET, offset);
- if (gfx_compression_enabled) {
-diff --git a/src/gfx/disp_gu2.c b/src/gfx/disp_gu2.c
-index f105cc1..1f0bbb6 100644
---- a/src/gfx/disp_gu2.c
-+++ b/src/gfx/disp_gu2.c
-@@ -613,11 +613,11 @@ gfx_set_display_offset(unsigned long offset)
- WRITE_REG32(MDC_UNLOCK, MDC_UNLOCK_VALUE);
-
- /* START ADDRESS EFFECTS DISPLAY COMPRESSION */
-- /* Disable compression for non-zero start addresss values. */
-- /* Enable compression if offset is zero and comression is intended to */
-- /* be enabled from a previous call to "gfx_set_compression_enable". */
-- /* Compression should be disabled BEFORE the offset is changed */
-- /* and enabled AFTER the offset is changed. */
-+ /* Disable compression for non-zero start address values. */
-+ /* Enable compression if offset is zero and compression is intended to */
-+ /* be enabled from a previous call to "gfx_set_compression_enable". */
-+ /* Compression should be disabled BEFORE the offset is changed */
-+ /* and enabled AFTER the offset is changed. */
- if (offset == 0) {
- WRITE_REG32(MDC_FB_ST_OFFSET, offset);
- if (gfx_compression_enabled) {
-@@ -1100,7 +1100,7 @@ int
- gfx_set_compression_enable(int enable)
- #endif
- {
-- /* SET GLOBAL VARIABLE FOR INDENDED STATE */
-+ /* SET GLOBAL VARIABLE FOR INTENDED STATE */
- /* Compression can only be enabled for non-zero start address values. */
- /* Keep state to enable compression on start address changes. */
-
-diff --git a/src/gfx/gfx_disp.c b/src/gfx/gfx_disp.c
-index 62238b2..5124d76 100644
---- a/src/gfx/gfx_disp.c
-+++ b/src/gfx/gfx_disp.c
-@@ -1802,7 +1802,7 @@ gfx_get_frame_buffer_line_size(void)
-
- /*---------------------------------------------------------------------------
- * gfx_get_display_mode
-- * get the curent mode set,
-+ * get the current mode set,
- * return the supported mode on success, -1 on fail
- *---------------------------------------------------------------------------
- */
-@@ -1824,7 +1824,7 @@ gfx_get_display_mode(int *xres, int *yres, int *bpp, int
*hz)
-
- /*---------------------------------------------------------------------------
- * gfx_get_display_details
-- * given the mode get's the resoultion details, width, height, freq
-+ * given the mode gets the resolution details, width, height, freq
- *---------------------------------------------------------------------------
- */
- int
-diff --git a/src/gfx/gfx_init.c b/src/gfx/gfx_init.c
-index 648d9cb..597eccf 100644
---- a/src/gfx/gfx_init.c
-+++ b/src/gfx/gfx_init.c
-@@ -149,7 +149,7 @@ gfx_detect_chip(void)
- /*----------------------------------------------------------------------------
- * gfx_detect_cpu
- *
-- * This routine returns the type and revison of the CPU. If a Geode
-+ * This routine returns the type and revision of the CPU. If a Geode
- * processor is not present, the routine returns zero.
- *
- * The return value is as follows:
-diff --git a/src/gfx/gfx_priv.h b/src/gfx/gfx_priv.h
-index 6a2218e..4f63f62 100644
---- a/src/gfx/gfx_priv.h
-+++ b/src/gfx/gfx_priv.h
-@@ -1011,7 +1011,7 @@ int fs450_set_color(int color);
- int fs450_get_brightness(int *p_brightness);
- int fs450_set_brightness(int brightness);
- int fs450_get_contrast(int *p_contrast);
--int fs450_set_contrast(int constrast);
-+int fs450_set_contrast(int contrast);
- int fs450_get_yc_filter(unsigned int *p_yc_filter);
- int fs450_set_yc_filter(unsigned int yc_filter);
- int fs450_get_aps_trigger_bits(unsigned int *p_trigger_bits);
-diff --git a/src/gfx/gfx_rtns.h b/src/gfx/gfx_rtns.h
-index bfcfe9f..2087f21 100644
---- a/src/gfx/gfx_rtns.h
-+++ b/src/gfx/gfx_rtns.h
-@@ -63,7 +63,7 @@ extern "C" {
- extern unsigned char *gfx_phys_spptr;
- extern unsigned char *gfx_phys_gpptr;
-
--/* DURANGO VARIBLES FOR RUNTIME SELECTION AND POSSIBLE VALUES */
-+/* DURANGO VARIABLES FOR RUNTIME SELECTION AND POSSIBLE VALUES */
-
- extern int gfx_display_type;
- #define GFX_DISPLAY_TYPE_GU1 0x0001
-@@ -603,7 +603,7 @@ extern "C" {
- int gfx_get_brightness(int *p_brightness);
- int gfx_set_brightness(int brightness);
- int gfx_get_contrast(int *p_contrast);
-- int gfx_set_contrast(int constrast);
-+ int gfx_set_contrast(int contrast);
- int gfx_get_yc_filter(unsigned int *p_yc_filter);
- int gfx_set_yc_filter(unsigned int yc_filter);
- int gfx_get_aps_trigger_bits(unsigned int *p_trigger_bits);
-diff --git a/src/gfx/gfx_vid.c b/src/gfx/gfx_vid.c
-index 15f0048..0dd7847 100644
---- a/src/gfx/gfx_vid.c
-+++ b/src/gfx/gfx_vid.c
-@@ -159,7 +159,7 @@ int gfx_set_screen_enable(int enable); /* forward
declaration
- #include "vid_1200.c"
- #endif
-
--/* INLUDE SUPPORT FOR REDCLOUD, IF SPECIFIED. */
-+/* INCLUDE SUPPORT FOR REDCLOUD, IF SPECIFIED. */
-
- #if GFX_VIDEO_REDCLOUD
- #include "vid_rdcl.c"
-diff --git a/src/gfx/msr_rdcl.c b/src/gfx/msr_rdcl.c
-index 2f85e6a..1a01be7 100644
---- a/src/gfx/msr_rdcl.c
-+++ b/src/gfx/msr_rdcl.c
-@@ -437,8 +437,8 @@ redcloud_find_msr_device(MSR * pDev)
- /*--------------------------------------------------------------------
- * gfx_id_msr_device
- *
-- * This routine handles reading the capabilities MSR register (typically
-- * 0x2000) and checking if the 'id' field matchs pDev.Id. This routine is
-+ * This routine handles reading the capabilities MSR register (typically
-+ * 0x2000) and checking if the 'id' field matches pDev.Id. This routine is
- * used by applications/drivers that need to extend the list of known
- * MBUS devices beyond those known by Durango.
- *
-diff --git a/src/gfx/release.txt b/src/gfx/release.txt
-index 805b847..25f6803 100644
---- a/src/gfx/release.txt
-+++ b/src/gfx/release.txt
-@@ -333,7 +333,7 @@ FUNCTIONAL CHANGES
- * Added support for 1152x864 desktop resolution on a flat panel.
- * Added 24BPP support for large display modes.
- * Modified gfx_set_video_scale such that an identity scale is now default.
--* Modifed flat panel modeset code to dynamically determine the size of the
mode table.
-+* Modified flat panel modeset code to dynamically determine the size of the
mode table.
- * Added support for Carmel Rev D2.
-
- =============================================================================
-@@ -462,7 +462,7 @@ FUNCTIONAL CHANGES
- * Added functions gfx_enable_softvga, dfx_disable_softvga.
- * Added code optimization in rendering loops to use 32 bit writes where
possible.
- * Added gfx_is_mode_supported to query if given mode supported by the h/w.
--* Added Flat panel support, realy testing with panel done only for 800x600.
-+* Added Flat panel support, really testing with panel done only for 800x600.
- * Removed subtraction of 16 from gfx_set_compression_size.
- * Added version.h file to reflect the version of the durango used.
-
-@@ -475,7 +475,7 @@ FUNCTIONAL CHANGES
- -----------------------------------------------------------------------------
- * Verified Xfree86 driver version 1.1 under FreeBSD and Linux.
- * Added automatic detection of BLT buffer bases in "gfx_set_bpp" routine.
--* Fixed improper setting of VGA attrubute controller index register.
-+* Fixed improper setting of VGA attribute controller index register.
- * Moved "gfx_get_display_bpp" to always be included.
- * Moved "gfx_get_hactive" and "gfx_get_vactive" to always be included.
- * Clipped video source size if off bottom or right side.
-@@ -503,7 +503,7 @@ FUNCTIONAL CHANGES
- -----------------------------------------------------------------------------
- * Verified display modes and graphics rendering on SC1200.
- * Updated PLL table for SC1200 to set modes.
--* DURANGO.C FILE CHANGE!: Modifed and added compiler definitions.
-+* DURANGO.C FILE CHANGE!: Modified and added compiler definitions.
- * Split gfx_disp.c file into gu1_disp.c and gu2_disp.c
- * Split gfx_rndr.c file into gu1_rndr.c and gu2_rndr.c
- * Split gfx_vid.c file into vid_5530.c, vid_1400.c, and vid_1200.c
-@@ -567,7 +567,7 @@ FUNCTIONAL CHANGES
- -----------------------------------------------------------------------------
- FUNCTIONAL CHANGES
- -----------------------------------------------------------------------------
--* Added video port, video decoder, I2C, and hardware query rouines.
-+* Added video port, video decoder, I2C, and hardware query routines.
- * New files: gfx_vip.c, gfx_dcdr.c, gfx_i2c.c, gfx_read.c.
-
- =============================================================================
-@@ -581,7 +581,7 @@ FUNCTIONAL CHANGES
- * Added "gfx_get_vid_register_base" and "gfx_get_vip_register_base".
- * Added initial PLL table for SC1400.
- * Verified mode set and video overlay routines work correctly on SC1400.
--* Updated initilization routines.
-+* Updated initialization routines.
- * Added update of graphics engine in "gfx_set_display_pitch".
-
- =============================================================================
-diff --git a/src/gfx/rndr_gu1.c b/src/gfx/rndr_gu1.c
-index 57fe9b1..6c16c93 100644
---- a/src/gfx/rndr_gu1.c
-+++ b/src/gfx/rndr_gu1.c
-@@ -407,7 +407,7 @@ gfx_set_raster_operation(unsigned char rop)
- GFXsavedRop = rop16;
-
- /* SET FLAG INDICATING ROP REQUIRES DESTINATION DATA */
-- /* True if even bits (0:2:4:6) do not equal the correspinding */
-+ /* True if even bits (0:2:4:6) do not equal the corresponding */
- /* even bits (1:3:5:7). */
-
- GFXusesDstData = ((rop & 0x55) ^ ((rop >> 1) & 0x55));
-diff --git a/src/gfx/rndr_gu2.c b/src/gfx/rndr_gu2.c
-index a8126fb..ed327b3 100644
---- a/src/gfx/rndr_gu2.c
-+++ b/src/gfx/rndr_gu2.c
-@@ -137,7 +137,7 @@ gfx_set_bpp(unsigned short bpp)
- {
- GFXbpp = bpp;
-
-- /* COVERT TO BPP/FORMAT VALUE */
-+ /* CONVERT TO BPP/FORMAT VALUE */
- /* Save in global to combine with ROP later. */
- /* Could write register here and then use byte access for */
- /* the ROP, but would need to set other 24 bits to make */
-diff --git a/src/gfx/tv_fs450.c b/src/gfx/tv_fs450.c
-index 24e7446..99194b2 100644
---- a/src/gfx/tv_fs450.c
-+++ b/src/gfx/tv_fs450.c
-@@ -78,8 +78,8 @@ const S_SET_DESCRIP *gcc_regs(void);
- #define HOUSTON_IHO 0x00 /* Input
Horizontal Offset */
- #define HOUSTON_IVO 0x02 /* Input
Vertical Offset */
- #define HOUSTON_IHA 0x04 /* Input
Horizontal Active Width */
--#define HOUSTON_VSC 0x06 /* Vertical
Scaling Coeficient */
--#define HOUSTON_HSC 0x08 /* Horizontal
Scaling Coeficient */
-+#define HOUSTON_VSC 0x06 /* Vertical
Scaling Coefficient */
-+#define HOUSTON_HSC 0x08 /* Horizontal
Scaling Coefficient */
- #define HOUSTON_BYP 0x0A /* Bypass
Register */
- #define HOUSTON_CR 0x0C /* Control
Register */
- #define HOUSTON_SP 0x0E /* Status
*/
-@@ -1027,7 +1027,7 @@ gfx_set_tv_enable(int on)
-
- /*if turning off... */
- if (!on) {
-- /*reenable vga. */
-+ /*re-enable vga. */
- PLAL_EnableVga();
-
- /*power down houston */
-@@ -1477,13 +1477,13 @@ gfx_get_contrast(int *p_contrast)
-
- #if GFX_TV_DYNAMIC
- int
--fs450_set_contrast(int constrast)
-+fs450_set_contrast(int contrast)
- #else
- int
--gfx_set_contrast(int constrast)
-+gfx_set_contrast(int contrast)
- #endif
- {
-- d.contrast = range_limit(constrast, 0, 100);
-+ d.contrast = range_limit(contrast, 0, 100);
-
- return write_config(REQ_BRIGHTNESS_CONTRAST);
- }
-@@ -3239,7 +3239,7 @@ PLAL_SetTVTimingRegisters(const S_TIMING_SPECS * p_specs)
- reg = ((p_specs->v_sync - 1) << 16) | (p_specs->v_sync - 2);
- WriteGx(DC_FP_V_TIMING, reg);
-
-- /*timing config, reenable all dclk stuff. */
-+ /*timing config, re-enable all dclk stuff. */
- reg = ReadGx(DC_TIMING_CFG);
- reg |= GX_TGEN;
- WriteGx(DC_TIMING_CFG, reg);
-diff --git a/src/gfx/tv_fs450.h b/src/gfx/tv_fs450.h
-index 4da7a21..1d01cff 100644
---- a/src/gfx/tv_fs450.h
-+++ b/src/gfx/tv_fs450.h
-@@ -131,7 +131,7 @@ extern "C" {
- /* brightness is a percentage, 0 to 100 */
-
- int FS450_get_contrast(int *p_contrast);
-- int FS450_set_contrast(int constrast);
-+ int FS450_set_contrast(int contrast);
- /* contrast is a percentage, 0 to 100 */
-
- /*==========================================================================*/
-diff --git a/src/gfx/vid_1200.c b/src/gfx/vid_1200.c
-index abc1b54..3e6c023 100644
---- a/src/gfx/vid_1200.c
-+++ b/src/gfx/vid_1200.c
-@@ -1044,7 +1044,7 @@ gfx_set_video_palette_entry(unsigned long index,
unsigned long palette)
- /*---------------------------------------------------------------------------
- * gfx_set_video_palette_bypass
- *
-- * This routine enables/disables the pallete RAM bypass.
-+ * This routine enables/disables the palette RAM bypass.
- *---------------------------------------------------------------------------
- */
- #if GFX_VIDEO_DYNAMIC
-@@ -2045,7 +2045,7 @@ gfx_get_video_src_size(void)
-
- if (width) {
- /* DETERMINE HEIGHT BY DIVIDING TOTAL SIZE BY WIDTH */
-- /* Get total size from display controller - abtracted. */
-+ /* Get total size from display controller - abstracted. */
-
- height = gfx_get_display_video_size() / (width << 1);
- }
-diff --git a/src/gfx/vid_5530.c b/src/gfx/vid_5530.c
-index f524300..8442dfb 100644
---- a/src/gfx/vid_5530.c
-+++ b/src/gfx/vid_5530.c
-@@ -1086,7 +1086,7 @@ gfx_get_video_src_size(void)
-
- if (width) {
- /* DETERMINE HEIGHT BY DIVIDING TOTAL SIZE BY WIDTH */
-- /* Get total size from display controller - abtracted. */
-+ /* Get total size from display controller - abstracted. */
-
- height = gfx_get_display_video_size() / (width << 1);
- }
-diff --git a/src/gfx/vid_rdcl.c b/src/gfx/vid_rdcl.c
-index 3ccc57a..72f45d4 100644
---- a/src/gfx/vid_rdcl.c
-+++ b/src/gfx/vid_rdcl.c
-@@ -1251,7 +1251,7 @@ gfx_set_video_palette_entry(unsigned long index,
unsigned long palette)
- /*---------------------------------------------------------------------------
- * gfx_set_video_palette_bypass
- *
-- * This routine enables/disables the pallete RAM bypass.
-+ * This routine enables/disables the palette RAM bypass.
- *---------------------------------------------------------------------------
- */
- #if GFX_VIDEO_DYNAMIC
-diff --git a/src/gx_accel.c b/src/gx_accel.c
-index 41fb7ec..1bc9a4c 100644
---- a/src/gx_accel.c
-+++ b/src/gx_accel.c
-@@ -1158,7 +1158,7 @@ GXSubsequentSolidBresenhamLine(ScrnInfoPtr pScrni, int
x1, int y1,
- * y0 int destination y start offset
- * x1 int destination x end offset
- * y1 int destination y end offset
-- * flags int OMIT_LAST, dont draw last pixel (not used)
-+ * flags int OMIT_LAST, don't draw last pixel (not used)
- *
- * Returns :none
-
*---------------------------------------------------------------------------*/
-@@ -1319,9 +1319,9 @@ GXSetupForDashedLine(ScrnInfoPtr pScrn, int fg, int bg,
int rop,
- * Parameters:
- * pScrni: Screen handler pointer having screen
information.
- * x1: Specifies the starting x position
-- * y1: Specifies starting y possition
-- * absmaj: Specfies the Bresenman absolute major.
-- * absmin: Specfies the Bresenman absolute minor.
-+ * y1: Specifies starting y position
-+ * absmaj: Specifies the Bresenman absolute major.
-+ * absmin: Specifies the Bresenman absolute minor.
- * err: Specifies the bresenham err term.
- * len: Specifies the length of the vector interms of
pixels.
- * octant: not used in this function,may be added for
standard
-@@ -1376,7 +1376,7 @@ GXSubsequentDashedBresenhamLine(ScrnInfoPtr pScrni,
- * y0 int destination y start offset
- * x1 int destination x end offset
- * y1 int destination y end offset
-- * flags int OMIT_LAST, dont draw last pixel (not used)
-+ * flags int OMIT_LAST, don't draw last pixel (not used)
- * phase int initial pattern offset at x1,y1
- *
- * Returns :none
-diff --git a/src/gx_cursor.c b/src/gx_cursor.c
-index 5a8f335..54a1bf1 100644
---- a/src/gx_cursor.c
-+++ b/src/gx_cursor.c
-@@ -74,15 +74,15 @@ GXHWCursorInit(ScreenPtr pScrn)
- infoPtr = xf86CreateCursorInfoRec();
- if (!infoPtr)
- return FALSE;
-- /* the geode structure is intiallized with the cursor infoRec */
-+ /* the geode structure is initialized with the cursor infoRec */
- pGeode->CursorInfo = infoPtr;
- infoPtr->MaxWidth = 32;
- infoPtr->MaxHeight = 32;
-- /* seeting up the cursor flags */
-+ /* setting up the cursor flags */
- infoPtr->Flags = HARDWARE_CURSOR_BIT_ORDER_MSBFIRST |
- HARDWARE_CURSOR_TRUECOLOR_AT_8BPP |
- HARDWARE_CURSOR_SOURCE_MASK_NOT_INTERLEAVED;
-- /* cursor info ptr is intiallized with the values obtained from
-+ /* cursor info ptr is initialized with the values obtained from
- * * durnago calls
- */
- infoPtr->SetCursorColors = GXSetCursorColors;
-@@ -125,7 +125,7 @@ GXSetCursorColors(ScrnInfoPtr pScrni, int bg, int fg)
- * Parameters:
- * pScrn: Screeen pointer structure.
- * x: Specifies the x-cordinates of the cursor.
-- * y: Specifies the y co-ordinate of the cursor.
-+ * y: Specifies the y coordinate of the cursor.
- *
- * Returns: none.
- *
-diff --git a/src/gx_driver.c b/src/gx_driver.c
-index 188828c..0471389 100644
---- a/src/gx_driver.c
-+++ b/src/gx_driver.c
-@@ -269,7 +269,7 @@ GXAllocateMemory(ScreenPtr pScrn, ScrnInfoPtr pScrni, int
rotate)
- RegionRec OffscreenRegion;
- BoxRec AvailBox;
-
-- /* Assume the shadow FB exists even if it doesnt */
-+ /* Assume the shadow FB exists even if it doesn't */
-
- if (pGeode->shadowSize == 0) {
- size = (pScrn->width * bytpp) * pScrni->virtualX;
-@@ -564,7 +564,7 @@ GXPreInit(ScrnInfoPtr pScrni, int flags)
- (int *) &(pGeode->FBAvail)))
- pGeode->FBAvail = 0;
-
-- /* For compatability - allow SWCursor too */
-+ /* For compatibility - allow SWCursor too */
-
- if (xf86ReturnOptValBool(GeodeOptions, GX_OPTION_SW_CURSOR, FALSE))
- pGeode->tryHWCursor = FALSE;
-@@ -620,7 +620,7 @@ GXPreInit(ScrnInfoPtr pScrni, int flags)
- pGeode->useEXA = FALSE;
- else if (xf86NameCmp(s, "EXA"))
- xf86DrvMsg(pScrni->scrnIndex, X_ERROR,
-- "Unknown accleration method %s. Defaulting to XAA.\n",
-+ "Unknown acceleration method %s. Defaulting to
XAA.\n",
- s);
- #elif defined(XF86EXA)
- pGeode->useEXA = TRUE;
-@@ -1135,7 +1135,7 @@ GXEnterGraphics(ScreenPtr pScrn, ScrnInfoPtr pScrni)
- }
-
- /* Set up the memory */
-- /* XXX - FIXME - when we alow inital rotation, it should be here */
-+ /* XXX - FIXME - when we allow initial rotation, it should be here */
- GXAllocateMemory(pScrn, pScrni, pGeode->rotation);
-
- /* Clear the framebuffer */
-@@ -1635,7 +1635,7 @@ GeodeCalculatePitchBytes(unsigned int width, unsigned
int bpp)
- if (width < 640)
- delta <<= 1;
-
-- /* Calculate the pitch (compression rquires a power of 2) */
-+ /* Calculate the pitch (compression requires a power of 2) */
-
- if (delta > 4096)
- delta = 8192;
-diff --git a/src/gx_vga.c b/src/gx_vga.c
-index 48d08d5..9482a3f 100644
---- a/src/gx_vga.c
-+++ b/src/gx_vga.c
-@@ -174,7 +174,7 @@ gu2_gfx_to_vga(int vga_mode)
- /*restart the sequencer */
- gfx_outw(0x3C4, 0x300);
-
-- /* turn on the attribute controler */
-+ /* turn on the attribute controller */
- tmp = gfx_inb(0x3DA);
- gfx_outb(0x3C0, 0x20);
- tmp = gfx_inb(0x3DA);
-diff --git a/src/gx_video.c b/src/gx_video.c
-index 7964d17..cc69dc2 100644
---- a/src/gx_video.c
-+++ b/src/gx_video.c
-@@ -271,7 +271,7 @@ typedef struct {
- /*----------------------------------------------------------------------------
- * GXSetColorKey
- *
-- * Description :This function reads the color key for the pallete and
-+ * Description :This function reads the color key for the palette and
- * sets the video color key register.
- *
- * Parameters.
-@@ -514,7 +514,7 @@ GXStopVideo(ScrnInfoPtr pScrni, pointer data, Bool exit)
- * attribute :The port attribute to be set
- * value :Value of the attribute to be set.
- *
-- * Returns :Sucess if the attribute is supported, else
BadMatch
-+ * Returns :Success if the attribute is supported, else
BadMatch
- *
- * Comments :none
- *----------------------------------------------------------------------------
-@@ -564,7 +564,7 @@ GXSetPortAttribute(ScrnInfoPtr pScrni,
- * attribute :The port attribute to be read
- * value :Pointer to the value of the attribute to be
read.
- *
-- * Returns :Sucess if the attribute is supported, else
BadMatch
-+ * Returns :Success if the attribute is supported, else
BadMatch
- *
- * Comments :none
- *----------------------------------------------------------------------------
-diff --git a/src/lx_display.c b/src/lx_display.c
-index 6315f9f..2aeb3b4 100644
---- a/src/lx_display.c
-+++ b/src/lx_display.c
-@@ -297,7 +297,7 @@ lx_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
- else
- vg_set_display_offset(0);
-
-- /* FIXME: Whats up with X and Y? Does that come into play
-+ /* FIXME: What's up with X and Y? Does that come into play
- * here? */
-
- df_configure_video_source(&vs_odd, &vs_even);
-diff --git a/src/lx_driver.c b/src/lx_driver.c
-index 9cb8889..0f04579 100644
---- a/src/lx_driver.c
-+++ b/src/lx_driver.c
-@@ -425,7 +425,7 @@ LXPreInit(ScrnInfoPtr pScrni, int flags)
- (int *) &(pGeode->FBAvail)))
- pGeode->FBAvail = 0;
-
-- /* For compatability - allow SWCursor too */
-+ /* For compatibility - allow SWCursor too */
-
- if (xf86ReturnOptValBool(GeodeOptions, LX_OPTION_SW_CURSOR, FALSE))
- pGeode->tryHWCursor = FALSE;
-diff --git a/src/lx_exa.c b/src/lx_exa.c
-index 60edd1b..fb26bee 100644
---- a/src/lx_exa.c
-+++ b/src/lx_exa.c
-@@ -1136,7 +1136,7 @@ lx_do_composite_mask_two_pass(PixmapPtr pxDst, unsigned
long dstOffset,
- /* The rendering region should not be bigger than off-screen memory size
- * which equals to DEFAULT_EXA_SCRATCH_BFRSZ. If that happens, we split
- * the PictOpOver rendering region into several 256KB chunks. And because
-- * of the Pitch(stride) parameter, so we use maximun width of mask
picture.
-+ * of the Pitch(stride) parameter, so we use maximum width of mask
picture.
- * that is to say it is a scanline rendering process */
- if (width * height * 4 > DEFAULT_EXA_SCRATCH_BFRSZ) {
- opWidth = width;
-diff --git a/src/lx_memory.c b/src/lx_memory.c
-index 992446f..9e14926 100644
---- a/src/lx_memory.c
-+++ b/src/lx_memory.c
-@@ -261,7 +261,7 @@ LXInitOffscreen(ScrnInfoPtr pScrni)
-
- if (ptr == NULL) {
- /* If we couldn't allocate what we wanted,
-- * then allocate whats left */
-+ * then allocate what's left */
-
- ptr = GeodeAllocRemainder(pGeode);
- }
-diff --git a/src/panel/pnl_bios.c b/src/panel/pnl_bios.c
-index 56b13b9..73f1e5c 100644
---- a/src/panel/pnl_bios.c
-+++ b/src/panel/pnl_bios.c
-@@ -25,7 +25,7 @@
-
- /*
- * File Contents: This file panel functions which query for the BIOS for
-- * current FP Paramters.
-+ * current FP Parameters.
- *
- * SubModule: Geode FlatPanel library
- * */
-diff --git a/src/panel/pnl_init.c b/src/panel/pnl_init.c
-index 3c58014..ae28ecb 100644
---- a/src/panel/pnl_init.c
-+++ b/src/panel/pnl_init.c
-@@ -25,7 +25,7 @@
-
- /*
- * File Contents: This file contains the Geode frame buffer panel
-- * intialization functions.
-+ * initialization functions.
- *
- * SubModule: Geode FlatPanel library
- * */
-diff --git a/src/panel/readme.txt b/src/panel/readme.txt
-index c8ca986..3dc2ecf 100644
---- a/src/panel/readme.txt
-+++ b/src/panel/readme.txt
-@@ -22,7 +22,7 @@ subdirectory needs to be copied in the driver directory.
- -----------------------------------------------------------------------------
- INSTALLATION INSTRUCTIONS
- -----------------------------------------------------------------------------
--These is no instalation and to be treaded as a driver source code extension.
-+There is no installation and to be treated as a driver source code extension.
- -----------------------------------------------------------------------------
- UNIT TEST
- Panel library when compiled is a part of the driver and cannot be unit tested.
-@@ -153,7 +153,7 @@ Dependencies:
- -----------------------------------------------------------------------------
- FUNCTIONAL CHANGES
- -----------------------------------------------------------------------------
--- Added function protoype.
-+- Added function prototype.
- -----------------------------------------------------------------------------
- DEFECTS CORRECTED
- -----------------------------------------------------------------------------
-@@ -224,7 +224,7 @@ Dependencies:
- -----------------------------------------------------------------------------
- FUNCTIONAL CHANGES
- -----------------------------------------------------------------------------
--Added the protoype for gfx_detect_video.
-+Added the prototype for gfx_detect_video.
- Durango dependency removed.
- -----------------------------------------------------------------------------
- DEFECTS CORRECTED
-diff --git a/src/z4l.c b/src/z4l.c
-index be0d345..c7b33e8 100644
---- a/src/z4l.c
-+++ b/src/z4l.c
-@@ -305,7 +305,7 @@ z4l_open_device(Z4lPortPrivRec * pPriv)
- enable = 1;
- #ifdef NONBLK_IO
- if (IoCtl(pPriv->fd, FIONBIO, &enable, 1) != 0) {
-- DBLOG(1, "open cant enable nonblocking\n");
-+ DBLOG(1, "open can't enable nonblocking\n");
- close(pPriv->fd);
- pPriv->fd = -1;
- }
-@@ -1363,7 +1363,7 @@ Z4lInit(ScrnInfoPtr pScrni, XF86VideoAdaptorPtr **
adaptors)
- msg = "no streaming";
- #ifdef NONBLK_IO
- else if (IoCtl(fd, FIONBIO, &enable, 1) != 0)
-- msg = "cant enable non-blocking io";
-+ msg = "can't enable non-blocking io";
- #endif
- if (msg == NULL) {
- memset(&format, 0, sizeof(format));
---
-2.30.2
-
diff -purN xserver-xorg-video-geode-2.11.20/debian/patches/series
xserver-xorg-video-geode-2.11.21/debian/patches/series
--- xserver-xorg-video-geode-2.11.20/debian/patches/series 2022-02-14
04:43:49.000000000 +0200
+++ xserver-xorg-video-geode-2.11.21/debian/patches/series 2023-05-20
18:55:42.000000000 +0300
@@ -1,5 +1 @@
-01_fno-common.patch
-02_Updated-the-README.patch
-03_Mention-iomem-relaxed.patch
-04_xz-tarballs-instead-of-bzip2.patch
-05_Fix-spelling-wording-issues.patch
+0001_migrate_ac_prog_libtool_to_lt_init.patch
diff -purN xserver-xorg-video-geode-2.11.20/debian/upstream/signing-key.asc
xserver-xorg-video-geode-2.11.21/debian/upstream/signing-key.asc
--- xserver-xorg-video-geode-2.11.20/debian/upstream/signing-key.asc
2019-09-20 11:54:31.000000000 +0300
+++ xserver-xorg-video-geode-2.11.21/debian/upstream/signing-key.asc
2023-05-20 17:17:48.000000000 +0300
@@ -49,3 +49,61 @@ xkDiU/nn+zRY9HVZ6UlvAungdQctlIASjWvMm0Py
yudxRk3V904H5cPkRA==
=IDbt
-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=rX43
+-----END PGP PUBLIC KEY BLOCK-----
diff -purN xserver-xorg-video-geode-2.11.20/debian/watch
xserver-xorg-video-geode-2.11.21/debian/watch
--- xserver-xorg-video-geode-2.11.20/debian/watch 2021-09-04
14:54:07.000000000 +0300
+++ xserver-xorg-video-geode-2.11.21/debian/watch 2023-05-20
17:09:36.000000000 +0300
@@ -1,4 +1,4 @@
version=4
opts=passive,pgpsigurlmangle=s/$/.sig/ \
-https://xorg.freedesktop.org/releases/individual/driver/
xf86-video-geode-(.+)\.tar\.gz \
+https://xorg.freedesktop.org/releases/individual/driver/
xf86-video-geode-(.+)\.tar\.xz \
debian uupdate --no-symlink
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..fe0a22c
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,102 @@
+# 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 8ced685153983b7e36b65e9cb5f8881bf8704f0f # see
https://docs.gitlab.com/ee/ci/yaml/#includefile
+
+
+include:
+ # Arch container builder template
+ - project: 'freedesktop/ci-templates'
+ ref: *template_sha
+ file: '/templates/debian.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-geode'
+ # Force a 32-bit image, since Geode GPUs were part of 32-bit CPUs
+ # and src/cim/cim_defs.h has 32-bit assembly code in.
+ FDO_BASE_IMAGE: 'i386/debian:bullseye-slim'
+ FDO_DISTRIBUTION_VERSION: 'bullseye'
+ # 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-08-03.0'
+ FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake libtool make
xutils-dev x11proto-dev xserver-xorg-dev libpixman-1-dev'
+
+
+#
+# Verify that commit messages are as expected
+#
+check-commits:
+ extends:
+ - .fdo.ci-fairy
+ stage: prep
+ script:
+ - ci-fairy check-commits --junit-xml=results.xml
+ except:
+ - master@xorg/driver/xf86-video-geode
+ 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@debian
+ stage: prep
+ variables:
+ GIT_STRATEGY: none
+
+
+#
+# The default build, runs on the image built above.
+#
+build:
+ stage: build
+ extends:
+ - .fdo.distribution-image@debian
+ script:
+ - autoreconf -ivf
+ - mkdir _builddir
+ - pushd _builddir > /dev/null
+ - ../configure --disable-silent-rules CFLAGS='-m32'
+ - make
+ - make check
+ - make distcheck
+ - popd > /dev/null
diff --git a/Makefile.am b/Makefile.am
index 44afe70..5dffe92 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
SUBDIRS = src
diff --git a/configure.ac b/configure.ac
index ef3cadb..6a1c8c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,8 +23,8 @@
# Initialize Autoconf
AC_PREREQ(2.60)
AC_INIT([xf86-video-geode],
- [2.11.20],
- [https://gitlab.freedesktop.org/xorg/driver/xf86-video-geode/issues],
+ [2.11.21],
+ [https://gitlab.freedesktop.org/xorg/driver/xf86-video-geode/-/issues],
[xf86-video-geode],
[http://www.x.org/wiki/GeodeDriver])
diff --git a/src/gfx/i2c_acc.c b/src/gfx/i2c_acc.c
index f6a0b2f..90aac13 100644
--- a/src/gfx/i2c_acc.c
+++ b/src/gfx/i2c_acc.c
@@ -187,9 +187,9 @@ sio_read_reg(unsigned char reg)
* gfx_i2c_reset
*
* This routine resets the I2C bus as follows :
- * � Sets the base address of the ACCESS.bus
- * � Sets the frequency of the ACCESS.bus
- * � Resets the ACCESS.bus
+ * · Sets the base address of the ACCESS.bus
+ * · Sets the frequency of the ACCESS.bus
+ * · Resets the ACCESS.bus
*
* If 'adr' is -1 the address is read from the hardware.
* If 'freq' is -1 the frequency is set to 56 clock cycles.
