diff options
author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2025-08-19 16:34:07 -0700 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2025-08-19 16:34:07 -0700 |
commit | d20eb30c61e80aade17f43d21b3fb47a9c57acb5 (patch) | |
tree | 2a2546d2c5fb027cf41103d4cc75a459652947d1 | |
parent | 7c5cf4b4ebabda19dbb6cdd29dc311a45d8ebca3 (diff) |
Performed with: `git ls-files | xargs perl -i -p -e 's{[ \t]+$}{}'`
`git diff -w` & `git diff -b` show no diffs from this change
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-i128/-/merge_requests/11>
-rw-r--r-- | .gitignore | 4 | ||||
-rw-r--r-- | man/Makefile.am | 2 | ||||
-rw-r--r-- | src/i128.h | 4 | ||||
-rw-r--r-- | src/i128IBMDAC.c | 10 | ||||
-rw-r--r-- | src/i128_driver.c | 82 | ||||
-rw-r--r-- | src/i128dga.c | 34 | ||||
-rw-r--r-- | src/i128exa.c | 18 | ||||
-rw-r--r-- | src/i128init.c | 4 | ||||
-rw-r--r-- | src/i128pcirename.h | 2 |
9 files changed, 80 insertions, 80 deletions
@@ -71,8 +71,8 @@ core *.tar.bz2 *.tar.gz # -# Add & Override patterns for xf86-video-i128 +# Add & Override patterns for xf86-video-i128 # # Edit the following section as needed # For example, !report.pc overrides *.pc. See 'man gitignore' -# +# diff --git a/man/Makefile.am b/man/Makefile.am index b3688ce..907544f 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -19,7 +19,7 @@ # LIABILITY, WHETHER 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. -# +# drivermandir = $(DRIVER_MAN_DIR) @@ -92,7 +92,7 @@ typedef struct { CARD32 acntrl; struct source_format *source; /* struct dest_format *dest; */ - + Bool NoAccel; Bool exa; Bool FlatPanel; @@ -167,5 +167,5 @@ Bool I128ProgramSilverHammer(ScrnInfoPtr pScrn, DisplayModePtr mode); /* void I128DumpBaseRegisters(ScrnInfoPtr pScrn); */ void I128DumpActiveRegisters(ScrnInfoPtr pScrn); /* void I128DumpIBMDACRegisters(ScrnInfoPtr pScrn, volatile CARD32 *vrbg); */ - + #endif diff --git a/src/i128IBMDAC.c b/src/i128IBMDAC.c index d313c9d..3795905 100644 --- a/src/i128IBMDAC.c +++ b/src/i128IBMDAC.c @@ -79,7 +79,7 @@ I128IBMHWCursorInit(ScrnInfoPtr pScrn) } -static void +static void I128IBMShowCursor(ScrnInfoPtr pScrn) { CARD32 tmpl, tmph; @@ -180,7 +180,7 @@ I128IBMSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg) return; } -static void +static void I128IBMLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src) { I128Ptr pI128 = I128PTR(pScrn); @@ -213,7 +213,7 @@ I128IBMLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src) pI128->mem.rbase_g[IDXCTL_I] = 1; /* enable auto-inc */ MB; - /* + /* * Output the cursor data. The realize function has put the planes into * their correct order, so we can just blast this out. */ @@ -233,11 +233,11 @@ I128IBMLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src) static Bool I128IBMUseHWCursor(ScreenPtr pScrn, CursorPtr pCurs) -{ +{ if( XF86SCRNINFO(pScrn)->currentMode->Flags & V_DBLSCAN ) return FALSE; return TRUE; -} +} Bool I128TIHWCursorInit(ScrnInfoPtr pScrn) { return FALSE; } diff --git a/src/i128_driver.c b/src/i128_driver.c index 8af58d4..1763b2e 100644 --- a/src/i128_driver.c +++ b/src/i128_driver.c @@ -1,7 +1,7 @@ /* * Copyright 1995-2000 by Robin Cutshaw <robin@XFree86.Org> * Copyright 1998 by Number Nine Visual Technology, Inc. - * + * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that * the above copyright notice appear in all copies and that both that @@ -108,7 +108,7 @@ static unsigned int I128DDC1Read(ScrnInfoPtr pScrn); #define I128_MINOR_VERSION PACKAGE_VERSION_MINOR #define I128_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL -/* +/* * This contains the functions needed by the server after loading the * driver module. It must be supplied, and gets added the driver list by * the Module Setup function in the dynamic case. In the static case a @@ -304,14 +304,14 @@ I128Probe(DriverPtr drv, int flags) for (i = 0; i < numUsed; i++) { ScrnInfoPtr pScrn = NULL; - + /* Allocate a ScrnInfoRec and claim the slot */ if ((pScrn = xf86ConfigPciEntity(pScrn, 0,usedChips[i], I128PciChipsets, NULL, NULL, NULL, NULL, NULL)) == NULL) continue; - + /* Fill in what we can of the ScrnInfoRec */ pScrn->driverVersion = I128_VERSION; pScrn->driverName = I128_DRIVER_NAME; @@ -419,7 +419,7 @@ I128AvailableOptions(int chipid, int busid) * for per-generation data. * * Arguments: - * ScrnInfoPtr pScrn - + * ScrnInfoPtr pScrn - * int flags - PROBE_DEFAULT for normal function * PROBE_DETECT for use with "-config" and "-probe" * Returns: @@ -472,13 +472,13 @@ I128PreInit(ScrnInfoPtr pScrn, int flags) /* The vgahw module should be allocated here when needed */ if (!xf86LoadSubModule(pScrn, "vgahw")) return FALSE; - + /* * Allocate a vgaHWRec */ if (!vgaHWGetHWRec(pScrn)) return FALSE; - + hwp = VGAHWPTR(pScrn); vgaHWSetStdFuncs(hwp); vgaHWGetIOBase(hwp); @@ -737,7 +737,7 @@ I128PreInit(ScrnInfoPtr pScrn, int flags) xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "VideoRAM: %d kByte\n", pScrn->videoRam); - + /* * If the driver can do gamma correction, it should call xf86SetGamma() * here. @@ -1022,9 +1022,9 @@ I128PreInit(ScrnInfoPtr pScrn, int flags) { int *linePitches = NULL; int minPitch = 256; - int maxPitch = 2048; - int pitchAlignment = 256; - + int maxPitch = 2048; + int pitchAlignment = 256; + if (pI128->MemoryType == I128_MEMORY_WRAM) pitchAlignment = (128 * 8); pitchAlignment /= pI128->bitsPerPixel; @@ -1172,7 +1172,7 @@ I128SoftReset(ScrnInfoPtr pScrn) /* * I128CountRAM -- * - * Counts amount of installed RAM + * Counts amount of installed RAM */ static int I128CountRam(ScrnInfoPtr pScrn) @@ -1256,7 +1256,7 @@ I128MapMem(ScrnInfoPtr pScrn) /* * Map IO registers to virtual address space - */ + */ #ifndef XSERVER_LIBPCIACCESS pI128->mem.mw0_ad = (unsigned char *)xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER, @@ -1328,7 +1328,7 @@ I128UnmapMem(ScrnInfoPtr pScrn) /* * Unmap IO registers to virtual address space - */ + */ #ifndef XSERVER_LIBPCIACCESS xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pI128->mem.mw0_ad, pI128->MemorySize*1024); @@ -1372,7 +1372,7 @@ I128Save(ScrnInfoPtr pScrn) /* * Restore the initial (text) mode. */ -static void +static void I128Restore(ScrnInfoPtr pScrn) { I128Ptr pI128 = I128PTR(pScrn); @@ -1434,7 +1434,7 @@ I128ScreenInit(ScreenPtr pScreen, int argc, char **argv) unsigned char *FBStart; int width, height, displayWidth; - /* + /* * First get the ScrnInfoRec */ pScrn = xf86ScreenToScrn(pScreen); @@ -1540,17 +1540,17 @@ I128ScreenInit(ScreenPtr pScreen, int argc, char **argv) xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Acceleration setup failed\n"); return FALSE; } - + xf86SetBackingStore(pScreen); xf86SetSilkenMouse(pScreen); - /* Initialize software cursor. + /* Initialize software cursor. Must precede creation of the default colormap */ miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); - /* Initialize HW cursor layer. + /* Initialize HW cursor layer. Must follow software cursor initialization*/ - if (pI128->HWCursor) { + if (pI128->HWCursor) { ret = TRUE; switch(pI128->RamdacType) { case TI3025_DAC: @@ -1565,7 +1565,7 @@ I128ScreenInit(ScreenPtr pScreen, int argc, char **argv) break; } if(!ret) - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Hardware cursor initialization failed\n"); } @@ -1573,11 +1573,11 @@ I128ScreenInit(ScreenPtr pScreen, int argc, char **argv) if (!miCreateDefColormap(pScreen)) return FALSE; - /* Initialize colormap layer. + /* Initialize colormap layer. Must follow initialization of the default colormap */ - if(!xf86HandleColormaps(pScreen, 256, 8, + if(!xf86HandleColormaps(pScreen, 256, 8, I128LoadPalette, NULL, - CMAP_PALETTED_TRUECOLOR | CMAP_RELOAD_ON_MODE_SWITCH)) + CMAP_PALETTED_TRUECOLOR | CMAP_RELOAD_ON_MODE_SWITCH)) return FALSE; xf86DPMSInit(pScreen, I128DisplayPowerManagementSet, 0); @@ -1708,7 +1708,7 @@ I128FreeScreen(ScrnInfoPtr pScrn) */ if (xf86LoaderCheckSymbol("vgaHWFreeHWRec")) vgaHWFreeHWRec(pScrn); - + I128FreeRec(pScrn); } @@ -1724,8 +1724,8 @@ I128ValidMode(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool verbose, int flags) lace = 1 + ((mode->Flags & V_INTERLACE) != 0); if ((mode->CrtcHDisplay <= 2048) && - (mode->CrtcHSyncStart <= 4096) && - (mode->CrtcHSyncEnd <= 4096) && + (mode->CrtcHSyncStart <= 4096) && + (mode->CrtcHSyncEnd <= 4096) && (mode->CrtcHTotal <= 4096) && (mode->CrtcVDisplay <= 2048 * lace) && (mode->CrtcVSyncStart <= 4096 * lace) && @@ -1837,11 +1837,11 @@ I128I2CGetBits(I2CBusPtr b, int *clock, int *data) lastdata = *data; } #endif -} +} static void I128I2CPutBits(I2CBusPtr b, int clock, int data) -{ +{ I128Ptr pI128 = I128PTR(xf86Screens[b->scrnIndex]); unsigned char drv, val; unsigned long ddc; @@ -1860,25 +1860,25 @@ I128I2CPutBits(I2CBusPtr b, int clock, int data) if (pI128->Debug) xf86DrvMsg(b->scrnIndex, X_INFO, "i2c> 0x%x\n", tmp); #endif -} +} -static Bool +static Bool I128I2CInit(ScrnInfoPtr pScrn) -{ +{ I128Ptr pI128 = I128PTR(pScrn); I2CBusPtr I2CPtr; unsigned long iobase; unsigned long soft_sw, ddc; - + I2CPtr = xf86CreateI2CBusRec(); if(!I2CPtr) return FALSE; - + pI128->I2C = I2CPtr; - + I2CPtr->BusName = "DDC"; - I2CPtr->scrnIndex = pScrn->scrnIndex; - I2CPtr->I2CPutBits = I128I2CPutBits; + I2CPtr->scrnIndex = pScrn->scrnIndex; + I2CPtr->I2CPutBits = I128I2CPutBits; I2CPtr->I2CGetBits = I128I2CGetBits; I2CPtr->BitTimeout = 4; I2CPtr->ByteTimeout = 4; @@ -1904,7 +1904,7 @@ I128I2CInit(ScrnInfoPtr pScrn) return FALSE; } return TRUE; -} +} static xf86MonPtr @@ -2204,12 +2204,12 @@ I128DumpActiveRegisters(ScrnInfoPtr pScrn) vrbg[0x58/4]&1UL, (vrbg[0x58/4]>>1)&1UL, (vrbg[0x58/4]>>2)&1UL, (vrbg[0x58/4]>>3)&1UL, (vrbg[0x58/4]>>4)&1UL, (vrbg[0x58/4]>>5)&1UL, (vrbg[0x58/4]>>6)&1UL, (vrbg[0x58/4]>>8)&1UL); - + xf86DrvMsg(pScrn->scrnIndex, X_PROBED, " CRT_2CON 0x%08lx MEM %ld RFR %ld TRD %ld SPL %ld\n", (unsigned long)vrbg[0x5C/4], vrbg[0x5C/4]&7UL, (vrbg[0x5C/4]>>8)&1UL, (vrbg[0x5C/4]>>16)&7UL, (vrbg[0x5C/4]>>24)&1UL); - + xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Memory Windows Registers\n"); xf86DrvMsg(pScrn->scrnIndex, X_PROBED, " MW0_CTRL 0x%08lx\n", (unsigned long)vrbw[0x00]); @@ -2245,7 +2245,7 @@ I128DumpActiveRegisters(ScrnInfoPtr pScrn) xf86DrvMsg(pScrn->scrnIndex, X_PROBED, " MW1_WKEY 0x%08lx MW1_KYDAT 0x%08lx MW1_MASK 0x%08lx\n", (unsigned long)vrbw[0x44/4], vrbw[0x48/4]&0x000F000FUL, (unsigned long)vrbw[0x4C/4]); - + xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Engine A Registers\n"); xf86DrvMsg(pScrn->scrnIndex, X_PROBED, " INTP 0x%08lx\n", vrba[0x00/4]&0x03UL); diff --git a/src/i128dga.c b/src/i128dga.c index 8d01969..f88279e 100644 --- a/src/i128dga.c +++ b/src/i128dga.c @@ -10,7 +10,7 @@ #include "dgaproc.h" -static Bool I128_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **, +static Bool I128_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **, int *, int *, int *); static Bool I128_SetMode(ScrnInfoPtr, DGAModePtr); static int I128_GetViewport(ScrnInfoPtr); @@ -31,7 +31,7 @@ DGAFunctionRec I128_DGAFuncs = { Bool I128DGAInit(ScreenPtr pScreen) -{ +{ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); I128Ptr pI128 = I128PTR(pScrn); DGAModePtr modes = NULL, newmodes = NULL, currentMode; @@ -91,7 +91,7 @@ SECOND_PASS: currentMode->imageHeight = pMode->VDisplay; currentMode->pixmapWidth = currentMode->imageWidth; currentMode->pixmapHeight = currentMode->imageHeight; - currentMode->maxViewportX = currentMode->imageWidth - + currentMode->maxViewportX = currentMode->imageWidth - currentMode->viewportWidth; /* this might need to get clamped to some maximum */ currentMode->maxViewportY = currentMode->imageHeight - @@ -99,18 +99,18 @@ SECOND_PASS: oneMore = FALSE; goto SECOND_PASS; } else { - currentMode->bytesPerScanline = + currentMode->bytesPerScanline = ((pScrn->displayWidth * Bpp) + 3) & ~3L; currentMode->imageWidth = pScrn->displayWidth; currentMode->imageHeight = pMode->VDisplay; currentMode->pixmapWidth = currentMode->imageWidth; currentMode->pixmapHeight = currentMode->imageHeight; - currentMode->maxViewportX = currentMode->imageWidth - + currentMode->maxViewportX = currentMode->imageWidth - currentMode->viewportWidth; /* this might need to get clamped to some maximum */ currentMode->maxViewportY = currentMode->imageHeight - currentMode->viewportHeight; - } + } pMode = pMode->next; if(pMode == firstMode) @@ -120,7 +120,7 @@ SECOND_PASS: pI128->numDGAModes = num; pI128->DGAModes = modes; - return DGAInit(pScreen, &I128_DGAFuncs, modes, num); + return DGAInit(pScreen, &I128_DGAFuncs, modes, num); } @@ -136,9 +136,9 @@ I128_SetMode( if(!pMode) { /* restore the original mode */ /* put the ScreenParameters back */ - + pScrn->displayWidth = OldDisplayWidth[index]; - + I128SwitchMode(pScrn, pScrn->currentMode); pI128->DGAactive = FALSE; } else { @@ -148,18 +148,18 @@ I128_SetMode( pI128->DGAactive = TRUE; } - pScrn->displayWidth = pMode->bytesPerScanline / + pScrn->displayWidth = pMode->bytesPerScanline / (pMode->bitsPerPixel >> 3); I128SwitchMode(pScrn, pMode->mode); } - + return TRUE; } -static int +static int I128_GetViewport( ScrnInfoPtr pScrn ){ @@ -168,10 +168,10 @@ I128_GetViewport( return pI128->DGAViewportStatus; } -static void +static void I128_SetViewport( - ScrnInfoPtr pScrn, - int x, int y, + ScrnInfoPtr pScrn, + int x, int y, int flags ){ I128Ptr pI128 = I128PTR(pScrn); @@ -180,9 +180,9 @@ I128_SetViewport( pI128->DGAViewportStatus = 0; /* I128AdjustFrame loops until finished */ } -static Bool +static Bool I128_OpenFramebuffer( - ScrnInfoPtr pScrn, + ScrnInfoPtr pScrn, char **name, unsigned char **mem, int *size, diff --git a/src/i128exa.c b/src/i128exa.c index 3b3e424..c96aa3c 100644 --- a/src/i128exa.c +++ b/src/i128exa.c @@ -234,7 +234,7 @@ i128SetBlitDirection(I128Ptr pI128, int dx, int dy) int blitdir; I128_EXA_DEBUG(("SetBlitDirection: %d %d\n", dx, dy)); - + if (dx < 0) { if (dy < 0) blitdir = DIR_RL_BT; else blitdir = DIR_RL_TB; @@ -275,9 +275,9 @@ i128SetDestPixmap(I128Ptr pI128, PixmapPtr dst) { unsigned int dorg = exaGetPixmapOffset(dst); unsigned int dptch = exaGetPixmapPitch(dst); - + I128_EXA_DEBUG(("SetDestPixmap: %x, %d\n", dorg, dptch)); - + CACHED_UPDATE(dorg, DE_DORG); CACHED_UPDATE(dptch, DE_DPTCH); } @@ -359,7 +359,7 @@ i128PrepareSolid(PixmapPtr pPixmap, int alu, Pixel planemask, Pixel fg) /* no need to set the source, the chip ignores it */ i128SetDestPixmap(pI128, pPixmap); - + return TRUE; } @@ -388,7 +388,7 @@ i128PrepareCopy(PixmapPtr pSrcPixmap, PixmapPtr pDstPixmap, int dx, int dy, i128SetSourcePixmap(pI128, pSrcPixmap); i128SetDestPixmap(pI128, pDstPixmap); - + return TRUE; } @@ -517,11 +517,11 @@ i128PrepareComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture, /* 3D setup */ i128SetTexture(pI128, pSrc); - + i128SetAlphaForOp(pI128, op, 1); /* it looks pointless to cache these, but we'll need it for DRI */ - + tex_ctl |= TEX_TM; /* enable texture mapping */ tex_ctl |= TEX_NMG | TEX_NMN; /* nearest interpolation */ tex_ctl |= 0; /* TEX_RM; / * modulate RGB */ @@ -532,7 +532,7 @@ i128PrepareComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture, threedctl |= TCTL_TBS; /* enable texture blend */ threedctl |= TCTL_RT; /* draw textured rectangle */ CACHED_UPDATE(threedctl, THREEDCTL); - + return TRUE; } @@ -673,7 +673,7 @@ I128ExaInit(ScreenPtr pScreen) /* need this as a float * for vertex setup */ pI128->mem.rbase_af = (float *)pI128->mem.rbase_a; - + if (pI128->Debug) { xf86DrvMsg(pScrn->scrnIndex, X_INFO, "I128ExaInit done\n"); I128DumpActiveRegisters(pScrn); diff --git a/src/i128init.c b/src/i128init.c index 9d4f410..265acc5 100644 --- a/src/i128init.c +++ b/src/i128init.c @@ -1,7 +1,7 @@ /* * Copyright 1995-2000 by Robin Cutshaw <robin@XFree86.Org> * Copyright 1998 by Number Nine Visual Technology, Inc. - * + * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that * the above copyright notice appear in all copies and that both that @@ -547,7 +547,7 @@ I128SavePalette(I128Ptr pI128) } pI128->LUTSaved = TRUE; } - + } diff --git a/src/i128pcirename.h b/src/i128pcirename.h index 3e04b2d..83a1c23 100644 --- a/src/i128pcirename.h +++ b/src/i128pcirename.h @@ -31,7 +31,7 @@ enum region_type { REGION_MEM, - REGION_IO + REGION_IO }; #ifndef XSERVER_LIBPCIACCESS |