frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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@amd.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Acked-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2017-02-14 15:30:51 -05:00
parent 3e1a23281d
commit 5a945f54e7
3 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/xfree86/common/xf86Mode.c
View File

@ -840,8 +840,6 @@ xf86CheckModeSize(ScrnInfoPtr scrp, int w, int x, int y)
* monitor pointer to structure for monitor section * monitor pointer to structure for monitor section
* fbFormat pixel format for the framebuffer * fbFormat pixel format for the framebuffer
* videoRam video memory size (in kB) * videoRam video memory size (in kB)
* maxHValue maximum horizontal timing value
* maxVValue maximum vertical timing value
*/ */
static ModeStatus static ModeStatus
@ -888,12 +886,6 @@ xf86InitialCheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode,
if (virtualY > 0 && mode->VDisplay > virtualY) if (virtualY > 0 && mode->VDisplay > virtualY)
return MODE_VIRTUAL_Y; 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 * 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 * 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 * flags not (currently) used
* *
* In addition, the following fields from the ScrnInfoRec are used: * In addition, the following fields from the ScrnInfoRec are used:
* maxHValue maximum horizontal timing value
* maxVValue maximum vertical timing value
* virtualX virtual width * virtualX virtual width
* virtualY virtual height * virtualY virtual height
* clockRanges allowable clock ranges * clockRanges allowable clock ranges
@ -1021,12 +1011,6 @@ xf86CheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode, int flags)
if (mode->VDisplay > scrp->virtualY) if (mode->VDisplay > scrp->virtualY)
return MODE_VIRTUAL_Y; 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) { for (cp = scrp->clockRanges; cp != NULL; cp = cp->next) {
/* DivFactor and MulFactor must be > 0 */ /* DivFactor and MulFactor must be > 0 */
cp->ClockDivFactor = max(1, cp->ClockDivFactor); cp->ClockDivFactor = max(1, cp->ClockDivFactor);
@ -1333,8 +1317,6 @@ scanLineWidth(unsigned int xsize, /* pixels */
* monitor pointer to structure for monitor section * monitor pointer to structure for monitor section
* fbFormat format of the framebuffer * fbFormat format of the framebuffer
* videoRam video memory size * videoRam video memory size
* maxHValue maximum horizontal timing value
* maxVValue maximum vertical timing value
* xInc horizontal timing increment (defaults to 8 pixels) * xInc horizontal timing increment (defaults to 8 pixels)
* *
* The function fills in the following ScrnInfoRec fields: * The function fills in the following ScrnInfoRec fields:

2
hw/xfree86/common/xf86str.h
View File

@ -604,8 +604,6 @@ typedef struct _ScrnInfoRec {
int rgbBits; /* Number of bits in r/g/b */ int rgbBits; /* Number of bits in r/g/b */
Gamma gamma; /* Gamma of the monitor */ Gamma gamma; /* Gamma of the monitor */
int defaultVisual; /* default visual class */ int defaultVisual; /* default visual class */
int maxHValue; /* max horizontal timing */
int maxVValue; /* max vertical timing value */
int virtualX; /* Virtual width */ int virtualX; /* Virtual width */
int virtualY; /* Virtual height */ int virtualY; /* Virtual height */
int xInc; /* Horizontal timing increment */ int xInc; /* Horizontal timing increment */

12
hw/xfree86/doc/ddxDesign.xml
View File

@ -1190,8 +1190,6 @@ Here is what <function>InitOutput()</function> does:
rgbBits (8bpp only) rgbBits (8bpp only)
gamma gamma
defaultVisual defaultVisual
maxHValue
maxVValue
virtualX virtualX
virtualY virtualY
displayWidth displayWidth
@ -6595,16 +6593,6 @@ be catered for the by the helpers.
<listitem><para> <listitem><para>
total video memory size (in bytes) total video memory size (in bytes)
</para></listitem></varlistentry> </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> <varlistentry>
<term><structfield>xInc</structfield></term> <term><structfield>xInc</structfield></term>
<listitem><para> <listitem><para>