From 372e55c5dbd4f16c040c5983052fd3a1bfb4e9ea Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@fedoraproject.org>
Date: May 11 2007 19:52:05 +0000
Subject: * Fri May 11 2007 Adam Jackson <ajax@redhat.com> 1.3.0.0-5

- xserver-1.3.0-fbdevhw-magic-numbers.patch: If the fbdev driver claims to
  have a zero pixel clock, believe it.  Fixes Xen paravirt. (#238451)

---

diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 494418f..d230c4a 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -9,7 +9,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.3.0.0
-Release:   4%{?dist}
+Release:   5%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -31,6 +31,7 @@ Patch18:   xorg-x11-server-1.1.1-glcore-visual-matching.patch
 Patch19:   xserver-1.3.0-xnest-exposures.patch
 Patch20:   xserver-1.3.0-x86emu-imul-int64.patch
 Patch21:   xserver-1.3.0-xkb-and-loathing.patch
+Patch22:   xserver-1.3.0-fbdevhw-magic-numbers.patch
 
 # OpenGL compositing manager feature/optimization patches.
 Patch100:  xorg-x11-server-1.1.0-no-move-damage.patch
@@ -277,6 +278,7 @@ Xserver source code needed to build VNC server (Xvnc)
 %patch19 -p1 -b .xnest-expose
 %patch20 -p1 -b .x86emu-imul
 %patch21 -p1 -b .xkb-signal-loathing
+%patch22 -p1 -b .magic-numbers
 
 %patch100 -p0 -b .no-move-damage
 %patch101 -p0 -b .dont-backfill-bg-none
@@ -568,6 +570,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri May 11 2007 Adam Jackson <ajax@redhat.com> 1.3.0.0-5
+- xserver-1.3.0-fbdevhw-magic-numbers.patch: If the fbdev driver claims to
+  have a zero pixel clock, believe it.  Fixes Xen paravirt. (#238451)
+
 * Mon May 07 2007 Adam Jackson <ajax@redhat.com> 1.3.0.0-4
 - xorg-x11-server-1.1.1-offscreen-pixmaps.patch: Fix a crash when activating
   GLX_EXT_texture_from_pixmap without XAA.
diff --git a/xserver-1.3.0-fbdevhw-magic-numbers.patch b/xserver-1.3.0-fbdevhw-magic-numbers.patch
new file mode 100644
index 0000000..8e93e7d
--- /dev/null
+++ b/xserver-1.3.0-fbdevhw-magic-numbers.patch
@@ -0,0 +1,11 @@
+--- xorg-server-1.3.0.0/./hw/xfree86/fbdevhw/fbdevhw.c.jx	2007-03-26 23:32:36.000000000 -0400
++++ xorg-server-1.3.0.0/./hw/xfree86/fbdevhw/fbdevhw.c	2007-05-11 15:10:05.000000000 -0400
+@@ -258,7 +258,7 @@
+ static void
+ fbdev2xfree_timing(struct fb_var_screeninfo *var, DisplayModePtr mode)
+ {
+-	mode->Clock = var->pixclock ? 1000000000/var->pixclock : 28000000;
++	mode->Clock = var->pixclock ? 1000000000/var->pixclock : 0;
+ 	mode->HDisplay = var->xres;
+ 	mode->HSyncStart = mode->HDisplay+var->right_margin;
+ 	mode->HSyncEnd = mode->HSyncStart+var->hsync_len;