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

EDID 1.4: If given a native pixel format, use it when inferring virtual.

This commit is contained in:
Adam Jackson 2007-12-28 17:35:54 -05:00
parent 312b30cb03
commit 85365ddf16
1 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1215,20 +1215,40 @@ inferVirtualSize(ScrnInfoPtr scrp, DisplayModePtr modes, int *vx, int *vy)
{ {
float aspect = 0.0; float aspect = 0.0;
MonPtr mon = scrp->monitor; MonPtr mon = scrp->monitor;
xf86MonPtr DDC;
int x = 0, y = 0; int x = 0, y = 0;
DisplayModePtr mode; DisplayModePtr mode;
if (!mon) return 0; if (!mon) return 0;
DDC = mon->DDC;
if (DDC && DDC->ver.revision >= 4) {
/* For 1.4, we might actually get native pixel format. How novel. */
if (PREFERRED_TIMING_MODE(DDC->features.msc)) {
for (mode = modes; mode; mode = mode->next) {
if (mode->type & (M_T_DRIVER | M_T_PREFERRED)) {
x = mode->HDisplay;
y = mode->VDisplay;
goto found;
}
}
}
/*
* Even if we don't, we might get aspect ratio from extra CVT info
* or from the monitor size fields. TODO.
*/
}
/* /*
* technically this triggers if _either_ is zero, which is not what EDID * Technically this triggers if either is zero. That wasn't legal
* says, but if only one is zero this is best effort. also we don't * before EDID 1.4, but right now we'll get that wrong. TODO.
* know that all projectors are 4:3, but we certainly suspect it.
*/ */
if (!mon->widthmm || !mon->heightmm) if (!aspect) {
aspect = 4.0/3.0; if (!mon->widthmm || !mon->heightmm)
else aspect = 4.0/3.0;
aspect = (float)mon->widthmm / (float)mon->heightmm; else
aspect = (float)mon->widthmm / (float)mon->heightmm;
}
/* find the largest M_T_DRIVER mode with that aspect ratio */ /* find the largest M_T_DRIVER mode with that aspect ratio */
for (mode = modes; mode; mode = mode->next) { for (mode = modes; mode; mode = mode->next) {
@ -1252,6 +1272,7 @@ inferVirtualSize(ScrnInfoPtr scrp, DisplayModePtr modes, int *vx, int *vy)
return 0; return 0;
} }
found:
*vx = x; *vx = x;
*vy = y; *vy = y;