Merge remote-tracking branch 'origin/master' into obsd

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));