xserver: Branch 'master'

[Michel Dänzer]

 hw/xfree86/fbdevhw/fbdevhw.c |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit bf333c2f9833a178887e7bdd7fc338f1e09c387f
Author: John Tapsell <john.tapsell at john-desktop.(none)>
Date:   Wed Sep 3 12:20:17 2008 +0100

    fbdevhw: Remove pixclock check.
    
    The check can fail because the output from FBIOGET_VSCREENINFO is used to set
    Clock in fbdev2xfree_timing().  Then in fbdevHWSetMode(), xfree2fbdev_timing()
    is called which sets the pixclock based on Clock.  The resulting circle results
    in slight rounding errors, causing the comparision check in fbdev_modes_equal
    to fail.

diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c
index 4d51422..5269277 100644
--- a/hw/xfree86/fbdevhw/fbdevhw.c
+++ b/hw/xfree86/fbdevhw/fbdevhw.c
@@ -245,7 +245,6 @@ fbdev_modes_equal(struct fb_var_screeninfo *set, struct fb_var_screeninfo *req)
 		set->green.length == req->green.length &&
 		set->blue.length == req->blue.length &&
 		set->xres == req->xres && set->yres == req->yres &&
-		set->pixclock == req->pixclock &&
 		set->right_margin == req->right_margin &&
 		set->hsync_len == req->hsync_len &&
 		set->left_margin == req->left_margin &&