From 60a6bb4ee2af7fc203e2c89647d15d92379244ac Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Fri, 24 Feb 2006 17:05:26 -0800 Subject: [PATCH] fix FB_GBE_MEM Kconfig to not break SGI O2, fwd from akpm --- ...fb-set-default-of-fb_gbe_mem-to-4-mb.patch | 36 +++++++++++++++++++ queue/series | 1 + 2 files changed, 37 insertions(+) create mode 100644 queue/gbefb-set-default-of-fb_gbe_mem-to-4-mb.patch diff --git a/queue/gbefb-set-default-of-fb_gbe_mem-to-4-mb.patch b/queue/gbefb-set-default-of-fb_gbe_mem-to-4-mb.patch new file mode 100644 index 00000000000..eb56c0a1430 --- /dev/null +++ b/queue/gbefb-set-default-of-fb_gbe_mem-to-4-mb.patch @@ -0,0 +1,36 @@ +From stable-bounces@linux.kernel.org Fri Feb 24 13:09:10 2006 +Date: Fri, 24 Feb 2006 13:04:16 -0800 +From: akpm@osdl.org +To: torvalds@osdl.org +Cc: adaplas@pol.net, tbm@cyrius.com, stable@kernel.org +Subject: [PATCH] gbefb: Set default of FB_GBE_MEM to 4 MB + + +From: Martin Michlmayr + +Allocating more than 4 MB memory for the GBE (SGI O2) framebuffer completely +breakfs gbefb support at the moment. According to comments on #mipslinux, +more than 4 MB has never worked correctly in Linux. Therefore, the default +should be 4 MB. + +Signed-off-by: Martin Michlmayr +Signed-off-by: Antonino Daplas +Cc: +Signed-off-by: Andrew Morton +Signed-off-by: Chris Wright +--- + + drivers/video/Kconfig | 2 +- + 1 files changed, 1 insertion(+), 1 deletion(-) + +--- linux-2.6.15.4.orig/drivers/video/Kconfig ++++ linux-2.6.15.4/drivers/video/Kconfig +@@ -520,7 +520,7 @@ config FB_GBE + config FB_GBE_MEM + int "Video memory size in MB" + depends on FB_GBE +- default 8 ++ default 4 + help + This is the amount of memory reserved for the framebuffer, + which can be any value between 1MB and 8MB. diff --git a/queue/series b/queue/series index c797575de69..95321ba9fad 100644 --- a/queue/series +++ b/queue/series @@ -21,3 +21,4 @@ hwmon-it87-probe-i2c-0x2d-only.patch fix-snd-usb-audio-in-32-bit-compat-environment.patch alsa-fix-bogus-snd_device_free-in-opl3-oss.c.patch cfi-init-wait-queue-in-chip-struct.patch +gbefb-set-default-of-fb_gbe_mem-to-4-mb.patch -- 2.47.3