Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit merge xf86-video-geode 2.11.21, xf86-video-i1...
details: https://anonhg.NetBSD.org/xsrc/rev/99faf7796747
branches: trunk
changeset: 7558:99faf7796747
user: mrg <mrg%NetBSD.org@localhost>
date: Mon Jun 19 09:06:01 2023 +0000
description:
merge xf86-video-geode 2.11.21, xf86-video-i128 1.4.1,
xf86-video-neomagic 1.3.1, and xf86-video-savage 2.4.0.
diffstat:
external/mit/xf86-video-geode/dist/src/geode.h | 8 +-
external/mit/xf86-video-geode/dist/src/geode_driver.c | 4 +-
external/mit/xf86-video-geode/dist/src/gx_accel.c | 10 +-
external/mit/xf86-video-geode/dist/src/gx_cursor.c | 8 +-
external/mit/xf86-video-geode/dist/src/gx_driver.c | 12 +-
external/mit/xf86-video-geode/dist/src/gx_video.c | 6 +-
external/mit/xf86-video-geode/dist/src/lx_display.c | 2 +-
external/mit/xf86-video-geode/dist/src/lx_driver.c | 2 +-
external/mit/xf86-video-geode/dist/src/lx_exa.c | 2 +-
external/mit/xf86-video-geode/dist/src/lx_memory.c | 2 +-
external/mit/xf86-video-i128/dist/src/i128_driver.c | 6 +-
external/mit/xf86-video-savage/dist/README | 20 -
external/mit/xf86-video-savage/dist/src/savage_dga.c | 2 +-
external/mit/xf86-video-savage/dist/src/savage_dri.c | 178 +---------------
external/mit/xf86-video-savage/dist/src/savage_driver.c | 42 ++-
external/mit/xf86-video-savage/dist/src/savage_driver.h | 4 -
16 files changed, 61 insertions(+), 247 deletions(-)
diffs (truncated from 733 to 300 lines):
diff -r 99588ad50a1e -r 99faf7796747 external/mit/xf86-video-geode/dist/src/geode.h
--- a/external/mit/xf86-video-geode/dist/src/geode.h Mon Jun 19 09:02:20 2023 +0000
+++ b/external/mit/xf86-video-geode/dist/src/geode.h Mon Jun 19 09:06:01 2023 +0000
@@ -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;
@@ -361,7 +361,7 @@ enum LX_GeodeOpts {
#endif
#ifdef HAVE_GX
-typedef enum {
+enum GX_GeodeOpts {
GX_OPTION_SW_CURSOR,
GX_OPTION_HW_CURSOR,
GX_OPTION_NOCOMPRESSION,
@@ -378,7 +378,7 @@ typedef enum {
GX_OPTION_FBSIZE,
GX_OPTION_PANEL_GEOMETRY,
GX_OPTION_DONT_PROGRAM
-} GX_GeodeOpts;
+};
#endif
/* geode_dcon.c */
diff -r 99588ad50a1e -r 99faf7796747 external/mit/xf86-video-geode/dist/src/geode_driver.c
--- a/external/mit/xf86-video-geode/dist/src/geode_driver.c Mon Jun 19 09:02:20 2023 +0000
+++ b/external/mit/xf86-video-geode/dist/src/geode_driver.c Mon Jun 19 09:06:01 2023 +0000
@@ -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"),
@@ -416,7 +416,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 -r 99588ad50a1e -r 99faf7796747 external/mit/xf86-video-geode/dist/src/gx_accel.c
--- a/external/mit/xf86-video-geode/dist/src/gx_accel.c Mon Jun 19 09:02:20 2023 +0000
+++ b/external/mit/xf86-video-geode/dist/src/gx_accel.c Mon Jun 19 09:06:01 2023 +0000
@@ -1160,7 +1160,7 @@ GXSubsequentSolidBresenhamLine(ScrnInfoP
* 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
*---------------------------------------------------------------------------*/
@@ -1321,9 +1321,9 @@ GXSetupForDashedLine(ScrnInfoPtr pScrn,
* 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
@@ -1378,7 +1378,7 @@ GXSubsequentDashedBresenhamLine(ScrnInfo
* 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 -r 99588ad50a1e -r 99faf7796747 external/mit/xf86-video-geode/dist/src/gx_cursor.c
--- a/external/mit/xf86-video-geode/dist/src/gx_cursor.c Mon Jun 19 09:02:20 2023 +0000
+++ b/external/mit/xf86-video-geode/dist/src/gx_cursor.c Mon Jun 19 09:06:01 2023 +0000
@@ -76,15 +76,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;
@@ -127,7 +127,7 @@ GXSetCursorColors(ScrnInfoPtr pScrni, in
* 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 -r 99588ad50a1e -r 99faf7796747 external/mit/xf86-video-geode/dist/src/gx_driver.c
--- a/external/mit/xf86-video-geode/dist/src/gx_driver.c Mon Jun 19 09:02:20 2023 +0000
+++ b/external/mit/xf86-video-geode/dist/src/gx_driver.c Mon Jun 19 09:06:01 2023 +0000
@@ -80,7 +80,7 @@
extern OptionInfoRec GX_GeodeOptions[];
-unsigned char *XpressROMPtr;
+extern unsigned char *XpressROMPtr;
static inline void
gx_enable_dac_power(void)
@@ -271,7 +271,7 @@ GXAllocateMemory(ScreenPtr pScrn, ScrnIn
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;
@@ -566,7 +566,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;
@@ -622,7 +622,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;
@@ -1137,7 +1137,7 @@ GXEnterGraphics(ScreenPtr pScrn, ScrnInf
}
/* 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 */
@@ -1637,7 +1637,7 @@ GeodeCalculatePitchBytes(unsigned int wi
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 -r 99588ad50a1e -r 99faf7796747 external/mit/xf86-video-geode/dist/src/gx_video.c
--- a/external/mit/xf86-video-geode/dist/src/gx_video.c Mon Jun 19 09:02:20 2023 +0000
+++ b/external/mit/xf86-video-geode/dist/src/gx_video.c Mon Jun 19 09:06:01 2023 +0000
@@ -273,7 +273,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.
@@ -516,7 +516,7 @@ GXStopVideo(ScrnInfoPtr pScrni, pointer
* 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
*----------------------------------------------------------------------------
@@ -566,7 +566,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 -r 99588ad50a1e -r 99faf7796747 external/mit/xf86-video-geode/dist/src/lx_display.c
--- a/external/mit/xf86-video-geode/dist/src/lx_display.c Mon Jun 19 09:02:20 2023 +0000
+++ b/external/mit/xf86-video-geode/dist/src/lx_display.c Mon Jun 19 09:06:01 2023 +0000
@@ -299,7 +299,7 @@ lx_crtc_mode_set(xf86CrtcPtr crtc, Displ
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 -r 99588ad50a1e -r 99faf7796747 external/mit/xf86-video-geode/dist/src/lx_driver.c
--- a/external/mit/xf86-video-geode/dist/src/lx_driver.c Mon Jun 19 09:02:20 2023 +0000
+++ b/external/mit/xf86-video-geode/dist/src/lx_driver.c Mon Jun 19 09:06:01 2023 +0000
@@ -427,7 +427,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 -r 99588ad50a1e -r 99faf7796747 external/mit/xf86-video-geode/dist/src/lx_exa.c
--- a/external/mit/xf86-video-geode/dist/src/lx_exa.c Mon Jun 19 09:02:20 2023 +0000
+++ b/external/mit/xf86-video-geode/dist/src/lx_exa.c Mon Jun 19 09:06:01 2023 +0000
@@ -1138,7 +1138,7 @@ lx_do_composite_mask_two_pass(PixmapPtr
/* 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 -r 99588ad50a1e -r 99faf7796747 external/mit/xf86-video-geode/dist/src/lx_memory.c
--- a/external/mit/xf86-video-geode/dist/src/lx_memory.c Mon Jun 19 09:02:20 2023 +0000
+++ b/external/mit/xf86-video-geode/dist/src/lx_memory.c Mon Jun 19 09:06:01 2023 +0000
@@ -263,7 +263,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 -r 99588ad50a1e -r 99faf7796747 external/mit/xf86-video-i128/dist/src/i128_driver.c
--- a/external/mit/xf86-video-i128/dist/src/i128_driver.c Mon Jun 19 09:02:20 2023 +0000
+++ b/external/mit/xf86-video-i128/dist/src/i128_driver.c Mon Jun 19 09:06:01 2023 +0000
@@ -115,7 +115,7 @@ static unsigned int I128DDC1Read(ScrnInf
/*
* 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 funtion in the dynamic case. In the static case a
+ * the Module Setup function in the dynamic case. In the static case a
* reference to this is compiled in, and this requires that the name of
* this DriverRec be an upper-case version of the driver name.
*/
@@ -151,7 +151,7 @@ static XF86ModuleVersionInfo i128VersRec
/*
* XF86ModuleData structure is the first part of the driver that is used
* by the module loader. It provides the XF86ModuleVersionInfo structure
- * used to verify that the module version is compatable with the loader
+ * used to verify that the module version is compatible with the loader
* version. It also provides a pointer to the module specific
* ModuleSetupProc() and ModuleTearDownProc() functions.
*/
@@ -439,7 +439,7 @@ I128PreInit(ScrnInfoPtr pScrn, int flags
ClockRangePtr clockRanges;
MessageType from;
unsigned long iobase;
- char *ramdac = NULL;
+ const char *ramdac = NULL;
CARD32 tmpl, tmph, tmp;
unsigned char n, m, p, mdc, df;
float mclk;
diff -r 99588ad50a1e -r 99faf7796747 external/mit/xf86-video-savage/dist/README
--- a/external/mit/xf86-video-savage/dist/README Mon Jun 19 09:02:20 2023 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-xf86-video-savage - S3 Savage video driver for the Xorg X server
-
-Please submit bugs & patches to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
Home |
Main Index |
Thread Index |
Old Index