xorg-x11-server/edid_data_sanity_check.diff
Stefan Dirsch 548e4d5cc8 Accepting request 76024 from home:eeich:branches:X11:XOrg
- update:
  * randr1_1-sig11.diff
    removed accidentally forgotten debugging code.
  * u_OS-acpi-Reconnect-to-acpid-when-it-gets-restarted.patch
    made socket non-blocking. Idea taken from a pach for SLES11.

- don't look for 10-evdev.conf for anything older than 11.3
  (this includes SLE-11).

- remove use-last-screen.patch:
  This patch has been rejected upstream. We will try to resolve
  this issue differently by not providing any screen, monitor or
  device section.

- remove disable-fbblt-opt.diff:
  We are unable to reproduce this issue any more.
  So let's remove the workaround and start from scratch
  when issue resurfaces and find a proper fix. 

- fixed bug-197858_dpms.diff:
  removed pieces that have been solved differently today.

- remove moblin-use_preferred_mode_for_all_outputs.diff:
  remove moblin specific patches.

- rename edit_data_sanity_check.diff -> edid_data_sanity_check.diff

- remove p_xkills_wrong_client.diff:
  made obsolete by commit b7f3618f.

OBS-URL: https://build.opensuse.org/request/show/76024
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=347
2011-07-11 10:25:51 +00:00

22 lines
945 B
Diff

Index: xorg-server-1.6.3.901/hw/xfree86/modes/xf86Crtc.c
================================================================================
--- xorg-server-1.7.99/hw/xfree86/modes/xf86Crtc.c
+++ xorg-server-1.7.99/hw/xfree86/modes/xf86Crtc.c
@@ -2916,8 +2916,14 @@
p->output->MonInfo->features.vsize);
if (det_mon->type == DT &&
det_mon->section.d_timings.h_size != 0 &&
- det_mon->section.d_timings.v_size != 0) {
-
+ det_mon->section.d_timings.v_size != 0 &&
+ det_mon->section.d_timings.v_size != 0 &&
+ /* some sanity checking for aspect ration */
+ ((det_mon->section.d_timings.h_size /
+ det_mon->section.d_timings.v_size) < 2) &&
+ ((det_mon->section.d_timings.v_size /
+ det_mon->section.d_timings.h_size) < 2)
+ ) {
p->output->mm_width = det_mon->section.d_timings.h_size;
p->output->mm_height = det_mon->section.d_timings.v_size;
p->ret = TRUE;