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

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>
This commit is contained in:
Adam Jackson 2017-02-14 15:30:52 -05:00
parent 5a945f54e7
commit 76ef102be3
3 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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. * Initialise virtX and virtY if the values are fixed.
*/ */
@ -1561,7 +1559,6 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
virtX = virtualX; virtX = virtualX;
virtY = virtualY; virtY = virtualY;
scrp->virtualFrom = X_CONFIG;
} }
else if (!modeNames || !*modeNames) { else if (!modeNames || !*modeNames) {
/* No virtual size given in the config, try to infer */ /* No virtual size given in the config, try to infer */
@ -2067,9 +2064,8 @@ xf86PrintModes(ScrnInfoPtr scrp)
if (scrp == NULL) if (scrp == NULL)
return; return;
xf86DrvMsg(scrp->scrnIndex, scrp->virtualFrom, "Virtual size is %dx%d " xf86DrvMsg(scrp->scrnIndex, X_INFO, "Virtual size is %dx%d (pitch %d)\n",
"(pitch %d)\n", scrp->virtualX, scrp->virtualY, scrp->virtualX, scrp->virtualY, scrp->displayWidth);
scrp->displayWidth);
p = scrp->modes; p = scrp->modes;
if (p == NULL) if (p == NULL)

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

@ -607,7 +607,6 @@ typedef struct _ScrnInfoRec {
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 */
MessageType virtualFrom; /* set from config? */
int displayWidth; /* memory pitch */ int displayWidth; /* memory pitch */
int frameX0; /* viewport position */ int frameX0; /* viewport position */
int frameY0; int frameY0;

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

@ -6640,12 +6640,6 @@ be catered for the by the helpers.
The resulting line pitch. The resulting line pitch.
</para></listitem></varlistentry> </para></listitem></varlistentry>
<varlistentry>
<term><structfield>virtualFrom</structfield></term>
<listitem><para>
Where the virtual size was determined from.
</para></listitem></varlistentry>
</variablelist> </variablelist>
</para> </para>