Commit 8a0934f2 authored by Antonino A. Daplas's avatar Antonino A. Daplas Committed by Linus Torvalds
Browse files

[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: default avatarAntonino Daplas <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2726bff3
...@@ -146,10 +146,10 @@ pmipal Use the protected mode interface for palette changes. ...@@ -146,10 +146,10 @@ pmipal Use the protected mode interface for palette changes.
mtrr:n setup memory type range registers for the vesafb framebuffer mtrr:n setup memory type range registers for the vesafb framebuffer
where n: where n:
0 - disabled (equivalent to nomtrr) 0 - disabled (equivalent to nomtrr) (default)
1 - uncachable 1 - uncachable
2 - write-back 2 - write-back
3 - write-combining (default) 3 - write-combining
4 - write-through 4 - write-through
If you see the following in dmesg, choose the type that matches the If you see the following in dmesg, choose the type that matches the
......
...@@ -48,7 +48,7 @@ static struct fb_fix_screeninfo vesafb_fix __initdata = { ...@@ -48,7 +48,7 @@ static struct fb_fix_screeninfo vesafb_fix __initdata = {
}; };
static int inverse = 0; 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_remap __initdata = 0; /* Set amount of memory to be used */
static int vram_total __initdata = 0; /* Set total amount of memory */ static int vram_total __initdata = 0; /* Set total amount of memory */
static int pmi_setpal = 0; /* pmi for palette changes ??? */ static int pmi_setpal = 0; /* pmi for palette changes ??? */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment