Patchwork [2/2] UBUNTU: SAUCE: vesafb: enable mtrr WC by default

login
register
mail settings
Submitter Andy Whitcroft
Date May 19, 2011, 1:54 p.m.
Message ID <1305813255-8076-3-git-send-email-apw@canonical.com>
Download mbox | patch
Permalink /patch/96381/
State New
Headers show

Comments

Andy Whitcroft - May 19, 2011, 1:54 p.m.
From: Thomas Schlichter <thomas.schlichter@web.de>

BugLink: http://bugs.launchpad.net/bugs/778043

Move to enabling a write-combining MTRR by default, this then matches
the uvesafb module.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 drivers/video/vesafb.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Leann Ogasawara - May 19, 2011, 2:03 p.m.
On Thu, 2011-05-19 at 14:54 +0100, Andy Whitcroft wrote:
> From: Thomas Schlichter <thomas.schlichter@web.de>
> 
> BugLink: http://bugs.launchpad.net/bugs/778043
> 
> Move to enabling a write-combining MTRR by default, this then matches
> the uvesafb module.
> 
> Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com>

> ---
>  drivers/video/vesafb.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
> index d0db4bb..43d9054 100644
> --- a/drivers/video/vesafb.c
> +++ b/drivers/video/vesafb.c
> @@ -55,7 +55,7 @@ static struct fb_fix_screeninfo vesafb_fix __initdata = {
>  #ifndef MODULE
>  static int   inverse    __read_mostly;
>  #endif
> -static int   mtrr       __read_mostly;		/* disable mtrr */
> +static int   mtrr       __read_mostly = 3;	/* disable mtrr */
>  static int   vram_remap __initdata;		/* Set amount of memory to be used */
>  static int   vram_total __initdata;		/* Set total amount of memory */
>  static int   pmi_setpal __read_mostly = 1;	/* pmi for palette changes ??? */
> -- 
> 1.7.4.1
> 
>
Brad Figg - May 19, 2011, 2:21 p.m.
On 05/19/2011 06:54 AM, Andy Whitcroft wrote:
> From: Thomas Schlichter<thomas.schlichter@web.de>
>
> BugLink: http://bugs.launchpad.net/bugs/778043
>
> Move to enabling a write-combining MTRR by default, this then matches
> the uvesafb module.
>
> Signed-off-by: Andy Whitcroft<apw@canonical.com>
> ---
>   drivers/video/vesafb.c |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
> index d0db4bb..43d9054 100644
> --- a/drivers/video/vesafb.c
> +++ b/drivers/video/vesafb.c
> @@ -55,7 +55,7 @@ static struct fb_fix_screeninfo vesafb_fix __initdata = {
>   #ifndef MODULE
>   static int   inverse    __read_mostly;
>   #endif
> -static int   mtrr       __read_mostly;		/* disable mtrr */
> +static int   mtrr       __read_mostly = 3;	/* disable mtrr */
>   static int   vram_remap __initdata;		/* Set amount of memory to be used */
>   static int   vram_total __initdata;		/* Set total amount of memory */
>   static int   pmi_setpal __read_mostly = 1;	/* pmi for palette changes ??? */

Acked-by: Brad Figg <brad.figg@canonical.com>

Andy,

Don't forget to add the SRU justification text.

Brad
Steve Conklin - May 24, 2011, 4:31 p.m.
Applied

On Thu, 2011-05-19 at 14:54 +0100, Andy Whitcroft wrote:
> From: Thomas Schlichter <thomas.schlichter@web.de>
> 
> BugLink: http://bugs.launchpad.net/bugs/778043
> 
> Move to enabling a write-combining MTRR by default, this then matches
> the uvesafb module.
> 
> Signed-off-by: Andy Whitcroft <apw@canonical.com>
> ---
>  drivers/video/vesafb.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
> index d0db4bb..43d9054 100644
> --- a/drivers/video/vesafb.c
> +++ b/drivers/video/vesafb.c
> @@ -55,7 +55,7 @@ static struct fb_fix_screeninfo vesafb_fix __initdata = {
>  #ifndef MODULE
>  static int   inverse    __read_mostly;
>  #endif
> -static int   mtrr       __read_mostly;		/* disable mtrr */
> +static int   mtrr       __read_mostly = 3;	/* disable mtrr */
>  static int   vram_remap __initdata;		/* Set amount of memory to be used */
>  static int   vram_total __initdata;		/* Set total amount of memory */
>  static int   pmi_setpal __read_mostly = 1;	/* pmi for palette changes ??? */
> -- 
> 1.7.4.1
> 
>

Patch

diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index d0db4bb..43d9054 100644
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -55,7 +55,7 @@  static struct fb_fix_screeninfo vesafb_fix __initdata = {
 #ifndef MODULE
 static int   inverse    __read_mostly;
 #endif
-static int   mtrr       __read_mostly;		/* disable mtrr */
+static int   mtrr       __read_mostly = 3;	/* disable mtrr */
 static int   vram_remap __initdata;		/* Set amount of memory to be used */
 static int   vram_total __initdata;		/* Set total amount of memory */
 static int   pmi_setpal __read_mostly = 1;	/* pmi for palette changes ??? */