summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel@tungstengraphics.com>2007-01-19 18:28:05 +0100
committerKeith Packard <keithp@neko.keithp.com>2007-03-26 20:32:31 -0700
commit7679b2c6139ee7345b4f65ab84384162bbd796ae (patch)
treefcf4e8ca5bb3b81f0c19e7c32a89bd547df1be26
parent1c2793d3ec4c82c7205abb10a1f4d093864425ea (diff)
downloadxserver-7679b2c6139ee7345b4f65ab84384162bbd796ae.tar.gz
fbdevhw: Consider mode set equal to mode requested if virtual width is larger.
(cherry picked from commit 27a01e100bff21ac0b70c6d72071d7226fc91264)
-rw-r--r--hw/xfree86/fbdevhw/fbdevhw.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c
index 8f78b85af..8b163beba 100644
--- a/hw/xfree86/fbdevhw/fbdevhw.c
+++ b/hw/xfree86/fbdevhw/fbdevhw.c
@@ -229,23 +229,23 @@ xfree2fbdev_timing(DisplayModePtr mode, struct fb_var_screeninfo *var)
}
static Bool
-fbdev_modes_equal(struct fb_var_screeninfo *one, struct fb_var_screeninfo *two)
-{
- return (one->xres_virtual == two->xres_virtual &&
- one->yres_virtual == two->yres_virtual &&
- one->bits_per_pixel == two->bits_per_pixel &&
- one->red.length == two->red.length &&
- one->green.length == two->green.length &&
- one->blue.length == two->blue.length &&
- one->xres == two->xres && one->yres == two->yres &&
- one->pixclock == two->pixclock &&
- one->right_margin == two->right_margin &&
- one->hsync_len == two->hsync_len &&
- one->left_margin == two->left_margin &&
- one->lower_margin == two->lower_margin &&
- one->vsync_len == two->vsync_len &&
- one->upper_margin == two->upper_margin &&
- one->sync == two->sync && one->vmode == two->vmode);
+fbdev_modes_equal(struct fb_var_screeninfo *set, struct fb_var_screeninfo *req)
+{
+ return (set->xres_virtual >= req->xres_virtual &&
+ set->yres_virtual == req->yres_virtual &&
+ set->bits_per_pixel == req->bits_per_pixel &&
+ set->red.length == req->red.length &&
+ 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 &&
+ set->lower_margin == req->lower_margin &&
+ set->vsync_len == req->vsync_len &&
+ set->upper_margin == req->upper_margin &&
+ set->sync == req->sync && set->vmode == req->vmode);
}
static void