diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-03-03 15:43:22 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-03-03 15:52:32 -0500 |
| commit | 71037ebfb426eb9657cbcd3de37ce28d5da34600 (patch) | |
| tree | db6db504f761e9bbfef503816445ba005de429c1 | |
| parent | a9028a492f577798ddea3b5e0cc088baedfad09a (diff) | |
xf86DDCMonitorSet: Honor the DisplaySize from the config file.
We honor sync ranges and pixel clock settings from the config here, no
reason to ignore DisplaySize.
| -rw-r--r-- | hw/xfree86/modes/xf86EdidModes.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c index a9d672265..ea36d0a59 100644 --- a/hw/xfree86/modes/xf86EdidModes.c +++ b/hw/xfree86/modes/xf86EdidModes.c @@ -662,8 +662,10 @@ xf86DDCMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC) Monitor->DDC = DDC; - Monitor->widthmm = 10 * DDC->features.hsize; - Monitor->heightmm = 10 * DDC->features.vsize; + if (Monitor->widthmm <= 0 && Monitor->heightmm <= 0) { + Monitor->widthmm = 10 * DDC->features.hsize; + Monitor->heightmm = 10 * DDC->features.vsize; + } /* * If this is a digital display, then we can use reduced blanking. |