summaryrefslogtreecommitdiff
path: root/drivers/video/vesafb.c
diff options
context:
space:
mode:
authorAntonino A. Daplas <adaplas@gmail.com>2005-11-07 01:00:49 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 07:53:52 -0800
commit8a0934f2969df4cdea81cf48fde4c8626b32325d (patch)
treecba3aa7d1367d4916a39b2113e1c9805e49b80ca /drivers/video/vesafb.c
parent2726bff34441dce3854c62c3748bac2e7879e791 (diff)
[PATCH] vesafb: Disable mtrr as the default
vesafb occassionally gets the size wrong when setting the mtrr. When X or DRI attempts to set the mtrr, it will fail due to range overlap significantly affecting their performance. Disable mtrr and let the user explicitly enable it with the mtrr:n option. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/vesafb.c')
-rw-r--r--drivers/video/vesafb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index 67e215443953..e25eae1a78c1 100644
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -48,7 +48,7 @@ static struct fb_fix_screeninfo vesafb_fix __initdata = {
};
static int inverse = 0;
-static int mtrr = 3; /* default to write-combining */
+static int mtrr = 0; /* disable mtrr */
static int vram_remap __initdata = 0; /* Set amount of memory to be used */
static int vram_total __initdata = 0; /* Set total amount of memory */
static int pmi_setpal = 0; /* pmi for palette changes ??? */