Fix spelling/wording issues

Found by using:
    codespell --builtin clear,rare,usage,informal,code,names

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

11 files changed, 27 insertions, 27 deletions

diff --git a/README.md b/README.md
index 959564f..b6731f8 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,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-savage
 
diff --git a/src/savage_accel.c b/src/savage_accel.c
index 1bcb5fa..fb594f3 100644
--- a/src/savage_accel.c
+++ b/src/savage_accel.c
@@ -199,7 +199,7 @@ SavageInitialize2DEngine(ScrnInfoPtr pScrn)
 	OUTREG(0x48C18, (psav->cobOffset >> 7) | (psav->cobIndex));
 	if( psav->ShadowStatus )
 	{
-	    /* Set shadow update threshholds. */
+	    /* Set shadow update thresholds. */
 	    /*OUTREG(0x48C10, 0x6090 );
 	      OUTREG(0x48C14, 0x70A8 );*/
 	    OUTREG(0x48C10, psav->bciThresholdLo >> 2);
@@ -420,7 +420,7 @@ void SavageSetGBD_Twister(ScrnInfoPtr pScrn)
      *          01: destination tiling format
      *          10: texture tiling format
      *          11: reserved
-     *   bit 28: block write disble/enable
+     *   bit 28: block write disable/enable
      *          0: disable
      *          1: enable
      */
@@ -836,7 +836,7 @@ void SavageSetGBD_M7(ScrnInfoPtr pScrn)
      *          01: reserved
      *          10: 16 bit
      *          11: 32 bit
-     *   bit 28: block write disble/enable
+     *   bit 28: block write disable/enable
      *          0: enable
      *          1: disable
      */
@@ -1455,9 +1455,9 @@ SavageInitAccel(ScreenPtr pScreen)
         /*if ( scanlines > maxlines ) scanlines = maxlines;*/
         /* CR47983, XvMC do not work on system with frame buffer less than 32MB.
          * VBE reports frame buffer size a little less than 16MB, this makes the condition
-         *   truns out FALSE.
+         *   turns out FALSE.
          * Now just reduce the level to 14.5MB, things should be OK, while the hwmc frame buffer layout
-         *    caculation need more understanding and should be fixed.
+         *    calculation need more understanding and should be fixed.
          */
         /*if total memory is less than 16M, there is no HWMC support */
         if((psav->videoRambytes < /*16*/(14*1024+512)*1024L) || psav->bDisableXvMC)
diff --git a/src/savage_cursor.c b/src/savage_cursor.c
index 9f6dcc9..8ef9753 100644
--- a/src/savage_cursor.c
+++ b/src/savage_cursor.c
@@ -267,7 +267,7 @@ SavageSetCursorPosition(
 	yoff = 0;
     }
 
-    /* This is the recomended order to move the cursor */
+    /* This is the recommended order to move the cursor */
         if (psav->IsSecondary) {
 	SelectIGA2();
     	outCRReg( 0x46, (x & 0xff00)>>8 );
diff --git a/src/savage_dga.c b/src/savage_dga.c
index 413e0e7..d0184ef 100644
--- a/src/savage_dga.c
+++ b/src/savage_dga.c
@@ -301,7 +301,7 @@ Savage_SetMode(
 
 	if( psav->hwcursor && psav->hwc_on) {
 	    SavageHideCursor(pScrn);
-	    psav->hwc_on = TRUE;    /* save for later restauration */
+	    psav->hwc_on = TRUE;    /* save for later restoration */
 	}
 	
 
diff --git a/src/savage_driver.c b/src/savage_driver.c
index 01fc0bc..9692974 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -110,10 +110,10 @@ static Bool SavageModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
 static Bool SavageCloseScreen(CLOSE_SCREEN_ARGS_DECL);
 static Bool SavageSaveScreen(ScreenPtr pScreen, int mode);
 static void SavageLoadPalette(ScrnInfoPtr pScrn, int numColors,
-			      int *indicies, LOCO *colors,
+			      int *indices, LOCO *colors,
 			      VisualPtr pVisual);
 static void SavageLoadPaletteSavage4(ScrnInfoPtr pScrn, int numColors,
-			      int *indicies, LOCO *colors,
+			      int *indices, LOCO *colors,
 			      VisualPtr pVisual);
 static void SavageUpdateKey(ScrnInfoPtr pScrn, int r, int g, int b);
 static void SavageCalcClock(long freq, int min_m, int min_n1, int max_n1,
@@ -712,7 +712,7 @@ static Bool SavagePciProbe(DriverPtr drv, int entity_num,
 	pEnt = xf86GetEntityInfo(entity_num);
 
 	/* MX, IX, SuperSavage cards support Dual-Head, mark the entity as
-	 * sharable.
+	 * shareable.
 	 */
 	if (pEnt->chipset == S3_SAVAGE_MX || pEnt->chipset == S3_SUPERSAVAGE) {
 	    DevUnion   *pPriv;
@@ -820,7 +820,7 @@ static Bool SavageProbe(DriverPtr drv, int flags)
 
             pEnt = xf86GetEntityInfo(usedChips[i]);
 
-            /* MX, IX, SuperSavage cards support Dual-Head, mark the entity as sharable*/
+            /* MX, IX, SuperSavage cards support Dual-Head, mark the entity as shareable*/
             if(pEnt->chipset == S3_SAVAGE_MX || pEnt->chipset == S3_SUPERSAVAGE)
             {
 		DevUnion   *pPriv;
@@ -1302,7 +1302,7 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
 		    pScrn->overlayFlags = OVERLAY_8_32_DUALFB;
 		} else {
 		    xf86DrvMsg(pScrn->scrnIndex,X_WARNING,"Wrong argument: "
-			       "\"%s\" Ingnoring\n",s);
+			       "\"%s\" Ignoring\n",s);
 		}
 	    } else if (pScrn->depth != 15) {
 		psav->overlayDepth = 8;
@@ -1465,7 +1465,7 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
     /* We support 1X 2X and 4X  */
 #ifdef SAVAGEDRI
 #ifdef XSERVER_LIBPCIACCESS
-    /* Try to read the AGP capabilty block from the device.  If there is
+    /* Try to read the AGP capability block from the device.  If there is
      * no AGP info, the device is PCI.
      */
 
@@ -1479,7 +1479,7 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
      * capability is present.  The procedure is outlined as follows:
      *
      * 1) Test bit 4 (CAP_LIST) of the PCI status register of the device
-     *    to determine wether or not this device implements any extended
+     *    to determine whether or not this device implements any extended
      *    capabilities.  If this bit is zero, then the device is a PCI 2.1
      *    or earlier device and is not AGP capable, and we can conclude it
      *    to be a PCI device.
@@ -4209,7 +4209,7 @@ void SavageDisableMMIO(ScrnInfoPtr pScrn)
     return;
 }
 
-void SavageLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indicies,
+void SavageLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
 		       LOCO *colors, VisualPtr pVisual)
 {
     SavagePtr psav = SAVPTR(pScrn);
@@ -4239,7 +4239,7 @@ void SavageLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indicies,
     }
     
     for (i=0; i<numColors; i++) {
-	index = indicies[i];
+	index = indices[i];
 	if (index == pScrn->colorKey) updateKey = index;
 	VGAOUT8(0x3c8, index);
 	VGAOUT8(0x3c9, colors[index].red);
@@ -4292,7 +4292,7 @@ SavageUpdateKey(ScrnInfoPtr pScrn, int r, int g, int b)
 #define inStatus1() (hwp->readST01( hwp ))
 #endif
 
-void SavageLoadPaletteSavage4(ScrnInfoPtr pScrn, int numColors, int *indicies,
+void SavageLoadPaletteSavage4(ScrnInfoPtr pScrn, int numColors, int *indices,
 		       LOCO *colors, VisualPtr pVisual)
 {
     SavagePtr psav = SAVPTR(pScrn);
@@ -4304,7 +4304,7 @@ void SavageLoadPaletteSavage4(ScrnInfoPtr pScrn, int numColors, int *indicies,
     for (i=0; i<numColors; i++) {
           if (!(inStatus1() & 0x08))
   	    VerticalRetraceWait(); 
-	index = indicies[i];
+	index = indices[i];
 	VGAOUT8(0x3c8, index);
 	VGAOUT8(0x3c9, colors[index].red);
 	VGAOUT8(0x3c9, colors[index].green);
diff --git a/src/savage_drm.h b/src/savage_drm.h
index 7d624b5..277afec 100644
--- a/src/savage_drm.h
+++ b/src/savage_drm.h
@@ -83,7 +83,7 @@ typedef struct drm_savage_get_physcis_address
  */
 #define SAVAGE_NR_SAREA_CLIPRECTS	8
 
-/* 2 heaps (1 for card, 1 for agp), each divided into upto 128
+/* 2 heaps (1 for card, 1 for agp), each divided into up to 128
  * regions, subject to a minimum region size of (1<<16) == 64k.
  *
  * Clients may subdivide regions internally, but when sharing between
diff --git a/src/savage_hwmc.c b/src/savage_hwmc.c
index d1e5553..5c085c3 100644
--- a/src/savage_hwmc.c
+++ b/src/savage_hwmc.c
@@ -128,7 +128,7 @@ static XF86ImagePtr savage_subpicture_list[1] =
 
 /* Fill in the device dependent adaptor record. 
  * This is named "SAVAGE Video Overlay" because this code falls under the
- * XV extenstion, the name must match or it won't be used.
+ * XV extension, the name must match or it won't be used.
  *
  * Surface and Subpicture - see above
  * Function pointers to functions below
@@ -157,7 +157,7 @@ static XF86MCAdaptorPtr ppAdapt[1] =
  *
  *  SAVAGEInitMC
  *
- *  Initialize the hardware motion compenstation extention for this 
+ *  Initialize the hardware motion compensation extension for this
  *  hardware. The initialization routines want the address of the pointers
  *  to the structures, not the address of the structures. This means we
  *  allocate (or create static?) the pointer memory and pass that 
diff --git a/src/savage_regs.h b/src/savage_regs.h
index 1a71c4e..f2c4c72 100644
--- a/src/savage_regs.h
+++ b/src/savage_regs.h
@@ -255,7 +255,7 @@ do {                                    \
 
 /*
  * Jiayo Hsu, Mar 21, 2002             
- * modify this to scalable schema,because different chips have differnt regs,          
+ * modify this to scalable schema, because different chips have different regs,
  * besides add in patch code for  Paramount(SuperSavage) from 2K
  */
 #define InI2CREG(a,reg)                                 \
diff --git a/src/savage_sarea.h b/src/savage_sarea.h
index e2ea3e5..7f1a34c 100644
--- a/src/savage_sarea.h
+++ b/src/savage_sarea.h
@@ -29,7 +29,7 @@
 #ifndef SAVAGE_SAREA_DEFINES
 #define SAVAGE_SAREA_DEFINES
 
-/* 2 heaps (1 for card, 1 for agp), each divided into upto 128
+/* 2 heaps (1 for card, 1 for agp), each divided into up to 128
  * regions, subject to a minimum region size of (1<<16) == 64k.
  *
  * Clients may subdivide regions internally, but when sharing between
diff --git a/src/savage_video.c b/src/savage_video.c
index c88317c..e155138 100644
--- a/src/savage_video.c
+++ b/src/savage_video.c
@@ -1520,7 +1520,7 @@ SavageDisplayVideoOld(
 
     /*
      * Process horizontal scaling
-     *  upscaling and downscaling smaller than 2:1 controled by MM8198
+     *  upscaling and downscaling smaller than 2:1 controlled by MM8198
      *  MM8190 controls downscaling mode larger than 2:1
      *  Together MM8190 and MM8198 can set arbitrary downscale up to 64:1
      */
diff --git a/src/savage_xaa.c b/src/savage_xaa.c
index 858cb97..361a0bb 100644
--- a/src/savage_xaa.c
+++ b/src/savage_xaa.c
@@ -679,12 +679,12 @@ SavageSubsequentColorExpandScanline(
 
 
 /*
- * The meaning of the two pattern paremeters to Setup & Subsequent for
+ * The meaning of the two pattern parameters to Setup & Subsequent for
  * Mono8x8Patterns varies depending on the flag bits.  We specify
  * HW_PROGRAMMED_BITS, which means our hardware can handle 8x8 patterns
  * without caching in the frame buffer.  Thus, Setup gets the pattern bits.
  * There is no way with BCI to rotate an 8x8 pattern, so we do NOT specify
- * HW_PROGRAMMED_ORIGIN.  XAA wil rotate it for us and pass the rotated
+ * HW_PROGRAMMED_ORIGIN.  XAA will rotate it for us and pass the rotated
  * pattern to both Setup and Subsequent.  If we DID specify PROGRAMMED_ORIGIN,
  * then Setup would get the unrotated pattern, and Subsequent gets the
  * origin values.