diff options
| author | Adam Jackson <ajax@redhat.com> | 2017-02-14 15:30:52 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2017-02-16 11:30:08 -0500 |
| commit | 76ef102be3b47d23ebfaaaa04fb5cfc0511d43f1 (patch) | |
| tree | ebc96a1d45d9e445fd79af9be321076fadde9ba8 | |
| parent | 5a945f54e738f6e9c5a489febdd8b87cd8a41210 (diff) | |
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@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 | 8 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86str.h | 1 | ||||
| -rw-r--r-- | hw/xfree86/doc/ddxDesign.xml | 6 |
3 files changed, 2 insertions, 13 deletions
diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c index 3aae17f32..3053e53f1 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 9b1633aa7..4df10a56a 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 3c0dc8658..df5f64bde 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> |