summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@fairlite.demon.co.uk>2007-05-17 19:32:46 +0100
committerAlan Hourihane <alanh@fairlite.demon.co.uk>2007-05-17 19:32:46 +0100
commitc0479dad8e34a51efebfaa05b0d329aa7d2b95d1 (patch)
tree9c5c4d86f5996ea7f606eab7f1bcb245a225c369 /linux-core
parent07a5fbaa612a777de37b5dc0112f6f3f3f84c486 (diff)
bring in change from drm_fb.c
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/intel_fb.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/linux-core/intel_fb.c b/linux-core/intel_fb.c
index 7126c16c..9d7b7327 100644
--- a/linux-core/intel_fb.c
+++ b/linux-core/intel_fb.c
@@ -504,7 +504,9 @@ int intelfb_probe(struct drm_device *dev, struct drm_crtc *crtc)
info->var.vsync_len = mode->vsync_end - mode->vsync_start;
info->var.upper_margin = mode->vtotal - mode->vsync_end;
info->var.pixclock = 10000000 / mode->htotal * 1000 /
- mode->vtotal * 100000 / mode->vrefresh;
+ mode->vtotal * 100;
+ /* avoid overflow */
+ info->var.pixclock = info->var.pixclock * 1000 / mode->vrefresh;
info->pixmap.size = 64*1024;
info->pixmap.buf_align = 8;