Commit fa1bf4af authored by Daniel Strnad's avatar Daniel Strnad
Browse files

hw/xfree86: Propagate physical dimensions from DRM connector

Physical dimmension of display can be obtained not just by configuration or
DDC, but also directly from kernel via drmModeGetConnector(). Until now
xserver silently discarded these values even when no configuration nor EDID
were present and fallbacked to default DPI.
parent 421ce458
Pipeline #148580 passed with stages
in 8 minutes and 1 second
......@@ -54,6 +54,7 @@
#include "xf86Xinput.h"
#include "xf86InPriv.h"
#include "mivalidate.h"
#include "xf86Crtc.h"
/* For xf86GetClocks */
#if defined(CSRG_BASED) || defined(__GNU__)
......@@ -849,8 +850,9 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y)
{
MessageType from = X_DEFAULT;
xf86MonPtr DDC = (xf86MonPtr) (pScrn->monitor->DDC);
int ddcWidthmm, ddcHeightmm;
int probedWidthmm, probedHeightmm;
int widthErr, heightErr;
xf86OutputPtr compat = xf86CompatOutput(pScrn);
/* XXX Maybe there is no need for widthmm/heightmm in ScrnInfoRec */
pScrn->widthmm = pScrn->monitor->widthmm;
......@@ -860,11 +862,15 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y)
/* DDC gives display size in mm for individual modes,
* but cm for monitor
*/
ddcWidthmm = DDC->features.hsize * 10; /* 10mm in 1cm */
ddcHeightmm = DDC->features.vsize * 10; /* 10mm in 1cm */
probedWidthmm = DDC->features.hsize * 10; /* 10mm in 1cm */
probedHeightmm = DDC->features.vsize * 10; /* 10mm in 1cm */
}
else if (compat && compat->mm_width > 0 && compat->mm_height > 0) {
probedWidthmm = compat->mm_width;
probedHeightmm = compat->mm_height;
}
else {
ddcWidthmm = ddcHeightmm = 0;
probedWidthmm = probedHeightmm = 0;
}
if (monitorResolution > 0) {
......@@ -890,15 +896,15 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y)
pScrn->widthmm, pScrn->heightmm);
/* Warn if config and probe disagree about display size */
if (ddcWidthmm && ddcHeightmm) {
if (probedWidthmm && probedHeightmm) {
if (pScrn->widthmm > 0) {
widthErr = abs(ddcWidthmm - pScrn->widthmm);
widthErr = abs(probedWidthmm - pScrn->widthmm);
}
else {
widthErr = 0;
}
if (pScrn->heightmm > 0) {
heightErr = abs(ddcHeightmm - pScrn->heightmm);
heightErr = abs(probedHeightmm - pScrn->heightmm);
}
else {
heightErr = 0;
......@@ -907,17 +913,17 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y)
/* Should include config file name for monitor here */
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"Probed monitor is %dx%d mm, using Displaysize %dx%d mm\n",
ddcWidthmm, ddcHeightmm, pScrn->widthmm,
probedWidthmm, probedHeightmm, pScrn->widthmm,
pScrn->heightmm);
}
}
}
else if (ddcWidthmm && ddcHeightmm) {
else if (probedWidthmm && probedHeightmm) {
from = X_PROBED;
xf86DrvMsg(pScrn->scrnIndex, from, "Display dimensions: (%d, %d) mm\n",
ddcWidthmm, ddcHeightmm);
pScrn->widthmm = ddcWidthmm;
pScrn->heightmm = ddcHeightmm;
probedWidthmm, probedHeightmm);
pScrn->widthmm = probedWidthmm;
pScrn->heightmm = probedHeightmm;
if (pScrn->widthmm > 0) {
pScrn->xDpi =
(int) ((double) pScrn->virtualX * MMPERINCH / pScrn->widthmm);
......
......@@ -3257,8 +3257,10 @@ xf86OutputSetEDID(xf86OutputPtr output, xf86MonPtr edid_mon)
free(output->MonInfo);
output->MonInfo = edid_mon;
output->mm_width = 0;
output->mm_height = 0;
if (edid_mon) {
output->mm_width = 0;
output->mm_height = 0;
}
if (debug_modes) {
xf86DrvMsg(scrn->scrnIndex, X_INFO, "EDID for output %s\n",
......
......@@ -806,6 +806,12 @@ xf86RandR12CreateScreenResources(ScreenPtr pScreen)
mmWidth = output->conf_monitor->mon_width;
mmHeight = output->conf_monitor->mon_height;
}
else if (output &&
(output->mm_width > 0 &&
output->mm_height > 0)) {
mmWidth = output->mm_width;
mmHeight = output->mm_height;
}
else {
/*
* Otherwise, just set the screen to DEFAULT_DPI
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment