summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2009-01-30 14:16:12 -0800
committerKeith Packard <keithp@keithp.com>2009-01-30 14:16:12 -0800
commitfff00df94d7ebd18a8e24537ec96073717375a3f (patch)
tree1fd76b6187671a8c58356eef65c039abb3820eca
parent4e7bc2d7a9879297aff0924febeca9bd3b6c336d (diff)
Ignore EDID-supplied monitor physical sizes for core screen size
We report the EDID values in RandR, and we let people configure whatever they like for the screen in xorg.conf. Reporting the EDID values in the core means applications get inconsistent font sizes in the default configuration. Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--hw/xfree86/modes/xf86RandR12.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index 13f6310a9..83a4f4f38 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -600,17 +600,6 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
mmWidth = output->conf_monitor->mon_width;
mmHeight = output->conf_monitor->mon_height;
}
- else if (crtc && crtc->mode.HDisplay &&
- output->mm_width && output->mm_height)
- {
- /*
- * If the output has a mode and a declared size, use that
- * to scale the screen size
- */
- DisplayModePtr mode = &crtc->mode;
- mmWidth = output->mm_width * width / mode->HDisplay;
- mmHeight = output->mm_height * height / mode->VDisplay;
- }
else
{
/*