xserver: Branch 'master' - 7 commits
Adam Jackson
ajax at kemper.freedesktop.org
Thu Feb 16 16:45:08 UTC 2017
hw/xfree86/common/xf86Config.c | 1
hw/xfree86/common/xf86Configure.c | 1
hw/xfree86/common/xf86Mode.c | 26 +-------------------
hw/xfree86/common/xf86str.h | 42 ++++++---------------------------
hw/xfree86/doc/ddxDesign.xml | 48 --------------------------------------
hw/xfree86/man/xorg.conf.man | 6 ----
hw/xfree86/parser/Device.c | 4 ---
hw/xfree86/parser/xf86Parser.h | 1
8 files changed, 11 insertions(+), 118 deletions(-)
New commits:
commit 5d29b493666f728eccd8dd91992ea020bd4be9f9
Author: Adam Jackson <ajax at redhat.com>
Date: Tue Feb 14 15:30:56 2017 -0500
xfree86: Reorganize the reserved ScrnInfoRec slots
First, move them to the end of the struct, for marginally better cache
locality for the struct members that actually have meaning; move the
existing slots at the end of the struct up near some others with similar
meanings. Second, only keep four slots each of integer, data pointer,
and function pointer; we've rarely used this escape hatch so this is
still plenty.
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
Reviewed-by: Aaron Plattner <aplattner at nvidia.com>
Acked-by: Keith Packard <keithp at keithp.com>
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
index 7f126b0..01d12ab 100644
--- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h
@@ -410,10 +410,9 @@ typedef struct _confdrirec {
confDRIBufferRec *bufs;
} confDRIRec, *confDRIPtr;
-/* These values should be adjusted when new fields are added to ScrnInfoRec */
-#define NUM_RESERVED_INTS 16
-#define NUM_RESERVED_POINTERS 14
-#define NUM_RESERVED_FUNCS 10
+#define NUM_RESERVED_INTS 4
+#define NUM_RESERVED_POINTERS 4
+#define NUM_RESERVED_FUNCS 4
/* let clients know they can use this */
#define XF86_SCRN_HAS_PREFER_CLONE 1
@@ -665,18 +664,12 @@ typedef struct _ScrnInfoRec {
/* initial rightof support disable */
int preferClone;
- /*
- * These can be used when the minor ABI version is incremented.
- * The NUM_* parameters must be reduced appropriately to keep the
- * structure size and alignment unchanged.
- */
- int reservedInt[NUM_RESERVED_INTS];
+ Bool is_gpu;
+ uint32_t capabilities;
int *entityInstanceList;
struct pci_device *vgaDev;
- void *reservedPtr[NUM_RESERVED_POINTERS];
-
/*
* Driver entry points.
*
@@ -702,15 +695,9 @@ typedef struct _ScrnInfoRec {
xorgDriverFuncProc *DriverFunc;
xf86ModeSetProc *ModeSet;
- /*
- * This can be used when the minor ABI version is incremented.
- * The NUM_* parameter must be reduced appropriately to keep the
- * structure size and alignment unchanged.
- */
+ int reservedInt[NUM_RESERVED_INTS];
+ void *reservedPtr[NUM_RESERVED_POINTERS];
funcPointer reservedFuncs[NUM_RESERVED_FUNCS];
-
- Bool is_gpu;
- uint32_t capabilities;
} ScrnInfoRec;
typedef struct {
commit 47db92473f7da2b7d6775ff681ec747009f8cf3f
Author: Adam Jackson <ajax at redhat.com>
Date: Tue Feb 14 15:30:55 2017 -0500
xfree86: Remove unused chipID/Rev from ScrnInfoRec
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
Reviewed-by: Aaron Plattner <aplattner at nvidia.com>
Acked-by: Keith Packard <keithp at keithp.com>
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
index 295a1ae..7f126b0 100644
--- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h
@@ -652,9 +652,6 @@ typedef struct _ScrnInfoRec {
Bool flipPixels; /* swap default black/white */
void *options;
- int chipID;
- int chipRev;
-
/* Allow screens to be enabled/disabled individually */
Bool vtSema;
commit 4dcf68e41857cdf78387a6232160cba5cb467fb0
Author: Adam Jackson <ajax at redhat.com>
Date: Tue Feb 14 15:30:54 2017 -0500
xfree86: Remove memClk from ScrnInfoRec
Never set by the core, not used in any modern driver.
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
Reviewed-by: Aaron Plattner <aplattner at nvidia.com>
Acked-by: Keith Packard <keithp at keithp.com>
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
index b060575..295a1ae 100644
--- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h
@@ -649,7 +649,6 @@ typedef struct _ScrnInfoRec {
int videoRam; /* amount of video ram (kb) */
unsigned long memPhysBase; /* Physical address of FB */
unsigned long fbOffset; /* Offset of FB in the above */
- int memClk; /* memory clock */
Bool flipPixels; /* swap default black/white */
void *options;
diff --git a/hw/xfree86/doc/ddxDesign.xml b/hw/xfree86/doc/ddxDesign.xml
index 0a14139..ac56e08 100644
--- a/hw/xfree86/doc/ddxDesign.xml
+++ b/hw/xfree86/doc/ddxDesign.xml
@@ -1209,7 +1209,6 @@ Here is what <function>InitOutput()</function> does:
clock[] (if not programmable)
videoRam
memBase
- memClk
driverPrivate
chipID
chipRev
commit 0b6f2806029493afa246b4472ee88fc173976c5a
Author: Adam Jackson <ajax at redhat.com>
Date: Tue Feb 14 15:30:53 2017 -0500
xfree86: Remove Option "BiosBase" (v2)
Just no.
The ddxDesign chunk removes the whole para about xf86FixPciResource,
since it turns out that function doesn't exist at all anymore.
The only drivers that reference this at all are i128 and mga, and even
then only in the non-pciaccess path.
v2:
- Update commentary about i128/mga
- Don't remove the BiosBase keyword from the config parser since that
would turn a no-op into a fatal error (Aaron Plattner)
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
Reviewed-by: Aaron Plattner <aplattner at nvidia.com>
Acked-by: Keith Packard <keithp at keithp.com>
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index f03acf3..89861e0 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -2105,7 +2105,6 @@ configDevice(GDevPtr devicep, XF86ConfDevicePtr conf_device, Bool active, Bool g
devicep->driver = conf_device->dev_driver;
devicep->active = active;
devicep->videoRam = conf_device->dev_videoram;
- devicep->BiosBase = conf_device->dev_bios_base;
devicep->MemBase = conf_device->dev_mem_base;
devicep->IOBase = conf_device->dev_io_base;
devicep->clockchip = conf_device->dev_clockchip;
diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c
index f975b98..668a551 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -268,7 +268,6 @@ configureDeviceSection(int screennum)
for (i = 0; i < MAXDACSPEEDS; i++)
ptr->dev_dacSpeeds[i] = DevToConfig[screennum].GDev.dacSpeeds[i];
ptr->dev_videoram = DevToConfig[screennum].GDev.videoRam;
- ptr->dev_bios_base = DevToConfig[screennum].GDev.BiosBase;
ptr->dev_mem_base = DevToConfig[screennum].GDev.MemBase;
ptr->dev_io_base = DevToConfig[screennum].GDev.IOBase;
ptr->dev_clockchip = DevToConfig[screennum].GDev.clockchip;
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
index 4df10a5..b060575 100644
--- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h
@@ -303,7 +303,6 @@ typedef struct {
Bool active;
Bool inUse;
int videoRam;
- unsigned long BiosBase; /* Base address of video BIOS */
unsigned long MemBase; /* Frame buffer base address */
unsigned long IOBase;
int chipID;
@@ -648,7 +647,6 @@ typedef struct _ScrnInfoRec {
int numClocks; /* number of clocks */
int clock[MAXCLOCKS]; /* list of clock frequencies */
int videoRam; /* amount of video ram (kb) */
- unsigned long biosBase; /* Base address of video BIOS */
unsigned long memPhysBase; /* Physical address of FB */
unsigned long fbOffset; /* Offset of FB in the above */
int memClk; /* memory clock */
diff --git a/hw/xfree86/doc/ddxDesign.xml b/hw/xfree86/doc/ddxDesign.xml
index df5f64b..0a14139 100644
--- a/hw/xfree86/doc/ddxDesign.xml
+++ b/hw/xfree86/doc/ddxDesign.xml
@@ -1208,7 +1208,6 @@ Here is what <function>InitOutput()</function> does:
numClocks (if not programmable)
clock[] (if not programmable)
videoRam
- biosBase
memBase
memClk
driverPrivate
@@ -2920,34 +2919,6 @@ Two functions are provided to obtain a resource range of a given type:
</para>
<para>
-Some PCI devices are broken in the sense that they return invalid size
-information for a certain resource. In this case the driver can supply
-the correct size and make sure that the resource range allocated for
-the card is large enough to hold the address range decoded by the card.
-The function <function>xf86FixPciResource()</function> can be used to do this:
- <blockquote><para>
- <programlisting>
- Bool xf86FixPciResource(int entityIndex, unsigned int prt,
- CARD32 alignment, long type);
- </programlisting>
- <blockquote><para>
- This function fixes a PCI resource allocation. The
- <parameter>prt</parameter> parameter contains the number of the PCI base
- register that needs to be fixed (<constant>0-5</constant>, and
- <constant>6</constant> for the BIOS base register). The size is
- specified by the alignment. Since PCI resources need to span an
- integral range of size <literal remap="tt">2ˆn</literal>, the alignm ent also
- specifies the number of addresses that will be decoded. If the
- driver specifies a type mask it can override the default type for
- PCI resources which is <constant>ResShared</constant>. The resource
- broker needs to know that to find a matching resource range. This
- function should be called before calling
- <function>xf86RegisterResources()</function>. The return value is
- <constant>TRUE</constant> when the function succeeds.
- </para>
-
- </blockquote></para></blockquote>
-
<blockquote><para>
<programlisting>
Bool xf86CheckPciMemBase(pciVideoPtr pPci, memType base);
diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
index 00ebf56..25af3aa 100644
--- a/hw/xfree86/man/xorg.conf.man
+++ b/hw/xfree86/man/xorg.conf.man
@@ -1470,12 +1470,6 @@ In most cases this is not required because the Xorg server probes
the graphics board to determine this quantity.
The driver-specific documentation should indicate when it might be needed.
.TP 7
-.BI "BiosBase " "baseaddress"
-This optional entry specifies the base address of the video BIOS for
-the VGA board.
-This address is normally auto-detected, and should only be specified if the
-driver-specific documentation recommends it.
-.TP 7
.BI "MemBase " "baseaddress"
This optional entry specifies the memory base address of a graphics
board's linear frame buffer.
diff --git a/hw/xfree86/parser/Device.c b/hw/xfree86/parser/Device.c
index 353d48c..34b7f65 100644
--- a/hw/xfree86/parser/Device.c
+++ b/hw/xfree86/parser/Device.c
@@ -172,7 +172,7 @@ xf86parseDeviceSection(void)
case BIOSBASE:
if (xf86getSubToken(&(ptr->dev_comment)) != NUMBER)
Error(NUMBER_MSG, "BIOSBase");
- ptr->dev_bios_base = xf86_lex_val.num;
+ /* ignored */
break;
case MEMBASE:
if (xf86getSubToken(&(ptr->dev_comment)) != NUMBER)
@@ -285,8 +285,6 @@ xf86printDeviceSection(FILE * cf, XF86ConfDevicePtr ptr)
}
if (ptr->dev_videoram)
fprintf(cf, "\tVideoRam %d\n", ptr->dev_videoram);
- if (ptr->dev_bios_base)
- fprintf(cf, "\tBiosBase 0x%lx\n", ptr->dev_bios_base);
if (ptr->dev_mem_base)
fprintf(cf, "\tMemBase 0x%lx\n", ptr->dev_mem_base);
if (ptr->dev_io_base)
diff --git a/hw/xfree86/parser/xf86Parser.h b/hw/xfree86/parser/xf86Parser.h
index e014048..6762edb 100644
--- a/hw/xfree86/parser/xf86Parser.h
+++ b/hw/xfree86/parser/xf86Parser.h
@@ -211,7 +211,6 @@ typedef struct {
const char *dev_ramdac;
int dev_dacSpeeds[CONF_MAXDACSPEEDS];
int dev_videoram;
- unsigned long dev_bios_base;
unsigned long dev_mem_base;
unsigned long dev_io_base;
const char *dev_clockchip;
commit 76ef102be3b47d23ebfaaaa04fb5cfc0511d43f1
Author: Adam Jackson <ajax at redhat.com>
Date: Tue Feb 14 15:30:52 2017 -0500
xfree86: Drop virtualFrom from ScrnInfoRec
Seriously not worth the effort of tracking this, especially now that
competent drivers don't have a limit. The sis driver does inspect this
member, but hilariously does so only so it can print the same information
as the core does.
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
Reviewed-by: Aaron Plattner <aplattner at nvidia.com>
Acked-by: Keith Packard <keithp at keithp.com>
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c
index 3aae17f..3053e53 100644
--- a/hw/xfree86/common/xf86Mode.c
+++ b/hw/xfree86/common/xf86Mode.c
@@ -1508,8 +1508,6 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
}
}
- /* Initial check of virtual size against other constraints */
- scrp->virtualFrom = X_PROBED;
/*
* Initialise virtX and virtY if the values are fixed.
*/
@@ -1561,7 +1559,6 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
virtX = virtualX;
virtY = virtualY;
- scrp->virtualFrom = X_CONFIG;
}
else if (!modeNames || !*modeNames) {
/* No virtual size given in the config, try to infer */
@@ -2067,9 +2064,8 @@ xf86PrintModes(ScrnInfoPtr scrp)
if (scrp == NULL)
return;
- xf86DrvMsg(scrp->scrnIndex, scrp->virtualFrom, "Virtual size is %dx%d "
- "(pitch %d)\n", scrp->virtualX, scrp->virtualY,
- scrp->displayWidth);
+ xf86DrvMsg(scrp->scrnIndex, X_INFO, "Virtual size is %dx%d (pitch %d)\n",
+ scrp->virtualX, scrp->virtualY, scrp->displayWidth);
p = scrp->modes;
if (p == NULL)
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
index 9b1633a..4df10a5 100644
--- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h
@@ -607,7 +607,6 @@ typedef struct _ScrnInfoRec {
int virtualX; /* Virtual width */
int virtualY; /* Virtual height */
int xInc; /* Horizontal timing increment */
- MessageType virtualFrom; /* set from config? */
int displayWidth; /* memory pitch */
int frameX0; /* viewport position */
int frameY0;
diff --git a/hw/xfree86/doc/ddxDesign.xml b/hw/xfree86/doc/ddxDesign.xml
index 3c0dc86..df5f64b 100644
--- a/hw/xfree86/doc/ddxDesign.xml
+++ b/hw/xfree86/doc/ddxDesign.xml
@@ -6640,12 +6640,6 @@ be catered for the by the helpers.
The resulting line pitch.
</para></listitem></varlistentry>
- <varlistentry>
- <term><structfield>virtualFrom</structfield></term>
- <listitem><para>
- Where the virtual size was determined from.
- </para></listitem></varlistentry>
-
</variablelist>
</para>
commit 5a945f54e738f6e9c5a489febdd8b87cd8a41210
Author: Adam Jackson <ajax at redhat.com>
Date: Tue Feb 14 15:30:51 2017 -0500
xfree86: Remove max[HV]Value from ScrnInfoRec
Only mach64 and rendition actually use this feature. Everyone else just
checks it in their ValidMode hook, they can too.
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
Reviewed-by: Aaron Plattner <aplattner at nvidia.com>
Acked-by: Keith Packard <keithp at keithp.com>
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c
index 3f446ae..3aae17f 100644
--- a/hw/xfree86/common/xf86Mode.c
+++ b/hw/xfree86/common/xf86Mode.c
@@ -840,8 +840,6 @@ xf86CheckModeSize(ScrnInfoPtr scrp, int w, int x, int y)
* monitor pointer to structure for monitor section
* fbFormat pixel format for the framebuffer
* videoRam video memory size (in kB)
- * maxHValue maximum horizontal timing value
- * maxVValue maximum vertical timing value
*/
static ModeStatus
@@ -888,12 +886,6 @@ xf86InitialCheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode,
if (virtualY > 0 && mode->VDisplay > virtualY)
return MODE_VIRTUAL_Y;
- if (scrp->maxHValue > 0 && mode->HTotal > scrp->maxHValue)
- return MODE_BAD_HVALUE;
-
- if (scrp->maxVValue > 0 && mode->VTotal > scrp->maxVValue)
- return MODE_BAD_VVALUE;
-
/*
* The use of the DisplayModeRec's Crtc* and SynthClock elements below is
* provisional, in that they are later reused by the driver at mode-set
@@ -985,8 +977,6 @@ xf86InitialCheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode,
* flags not (currently) used
*
* In addition, the following fields from the ScrnInfoRec are used:
- * maxHValue maximum horizontal timing value
- * maxVValue maximum vertical timing value
* virtualX virtual width
* virtualY virtual height
* clockRanges allowable clock ranges
@@ -1021,12 +1011,6 @@ xf86CheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode, int flags)
if (mode->VDisplay > scrp->virtualY)
return MODE_VIRTUAL_Y;
- if (scrp->maxHValue > 0 && mode->HTotal > scrp->maxHValue)
- return MODE_BAD_HVALUE;
-
- if (scrp->maxVValue > 0 && mode->VTotal > scrp->maxVValue)
- return MODE_BAD_VVALUE;
-
for (cp = scrp->clockRanges; cp != NULL; cp = cp->next) {
/* DivFactor and MulFactor must be > 0 */
cp->ClockDivFactor = max(1, cp->ClockDivFactor);
@@ -1333,8 +1317,6 @@ scanLineWidth(unsigned int xsize, /* pixels */
* monitor pointer to structure for monitor section
* fbFormat format of the framebuffer
* videoRam video memory size
- * maxHValue maximum horizontal timing value
- * maxVValue maximum vertical timing value
* xInc horizontal timing increment (defaults to 8 pixels)
*
* The function fills in the following ScrnInfoRec fields:
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
index 121632f..9b1633a 100644
--- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h
@@ -604,8 +604,6 @@ typedef struct _ScrnInfoRec {
int rgbBits; /* Number of bits in r/g/b */
Gamma gamma; /* Gamma of the monitor */
int defaultVisual; /* default visual class */
- int maxHValue; /* max horizontal timing */
- int maxVValue; /* max vertical timing value */
int virtualX; /* Virtual width */
int virtualY; /* Virtual height */
int xInc; /* Horizontal timing increment */
diff --git a/hw/xfree86/doc/ddxDesign.xml b/hw/xfree86/doc/ddxDesign.xml
index 89a85a4..3c0dc86 100644
--- a/hw/xfree86/doc/ddxDesign.xml
+++ b/hw/xfree86/doc/ddxDesign.xml
@@ -1190,8 +1190,6 @@ Here is what <function>InitOutput()</function> does:
rgbBits (8bpp only)
gamma
defaultVisual
- maxHValue
- maxVValue
virtualX
virtualY
displayWidth
@@ -6596,16 +6594,6 @@ be catered for the by the helpers.
total video memory size (in bytes)
</para></listitem></varlistentry>
<varlistentry>
- <term><structfield>maxHValue</structfield></term>
- <listitem><para>
- Maximum horizontal timing value allowed
- </para></listitem></varlistentry>
- <varlistentry>
- <term><structfield>maxVValue</structfield></term>
- <listitem><para>
- Maximum vertical timing value allowed
- </para></listitem></varlistentry>
- <varlistentry>
<term><structfield>xInc</structfield></term>
<listitem><para>
Horizontal timing increment in pixels (defaults to 8)
commit 3e1a23281dd64ee7457f36208cac77c01846a28f
Author: Adam Jackson <ajax at redhat.com>
Date: Tue Feb 14 15:30:50 2017 -0500
xfree86: Fix a comment about ScrnInfoRec
We don't actually need (or intend) to keep this struct the same across
revisions.
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
Reviewed-by: Aaron Plattner <aplattner at nvidia.com>
Acked-by: Keith Packard <keithp at keithp.com>
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
index 74c65ba..121632f 100644
--- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h
@@ -569,11 +569,7 @@ typedef void xf86ModeSetProc(ScrnInfoPtr);
* ScrnInfoRec
*
* There is one of these for each screen, and it holds all the screen-specific
- * information.
- *
- * Note: the size and layout must be kept the same across versions. New
- * fields are to be added in place of the "reserved*" fields. No fields
- * are to be dependent on compile-time defines.
+ * information. Note: No fields are to be dependent on compile-time defines.
*/
typedef struct _ScrnInfoRec {
More information about the xorg-commit
mailing list