diff options
| author | Adam Jackson <ajax@redhat.com> | 2017-02-14 15:30:51 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2017-02-16 11:30:05 -0500 |
| commit | 5a945f54e738f6e9c5a489febdd8b87cd8a41210 (patch) | |
| tree | 696cf617a881bf0de06ae242481c670aa3c12193 | |
| parent | 3e1a23281dd64ee7457f36208cac77c01846a28f (diff) | |
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>
| -rw-r--r-- | hw/xfree86/common/xf86Mode.c | 18 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86str.h | 2 | ||||
| -rw-r--r-- | hw/xfree86/doc/ddxDesign.xml | 12 |
3 files changed, 0 insertions, 32 deletions
diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c index 3f446ae3b..3aae17f32 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 121632f43..9b1633aa7 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 89a85a4b8..3c0dc8658 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) |