Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8a0934f2969df4cdea81cf48fde4c8626b32325d

Authored by Antonino A. Daplas
Committed by Linus Torvalds
1 parent 2726bff344
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 2 changed files with 3 additions and 3 deletions Side-by-side Diff

Documentation/fb/vesafb.txt
Diff comments   View file @ 8a0934f
... ... @@ -146,10 +146,10 @@
146 146  
147 147 mtrr:n setup memory type range registers for the vesafb framebuffer
148 148 where n:
149   - 0 - disabled (equivalent to nomtrr)
  149 + 0 - disabled (equivalent to nomtrr) (default)
150 150 1 - uncachable
151 151 2 - write-back
152   - 3 - write-combining (default)
  152 + 3 - write-combining
153 153 4 - write-through
154 154  
155 155 If you see the following in dmesg, choose the type that matches the
drivers/video/vesafb.c
Diff comments   View file @ 8a0934f
... ... @@ -48,7 +48,7 @@
48 48 };
49 49  
50 50 static int inverse = 0;
51   -static int mtrr = 3; /* default to write-combining */
  51 +static int mtrr = 0; /* disable mtrr */
52 52 static int vram_remap __initdata = 0; /* Set amount of memory to be used */
53 53 static int vram_total __initdata = 0; /* Set total amount of memory */
54 54 static int pmi_setpal = 0; /* pmi for palette changes ??? */