Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-07-14 17:52:45 +0200
committerTakashi Iwai <tiwai@suse.de>2011-07-14 17:52:45 +0200
commit27de2982bbaa5f07c66e6b527fef77ca4822972f (patch)
treeab51ccecbf134b6625454b3cd9a8b1d7465f6db2
parent40c7644df0e4477515e0280168d9412480404537 (diff)
Refresh patches.suse/SUSE-bootsplash. Fix for nouveau.
-rw-r--r--patches.suse/SUSE-bootsplash8
1 files changed, 5 insertions, 3 deletions
diff --git a/patches.suse/SUSE-bootsplash b/patches.suse/SUSE-bootsplash
index e6cc0dbfe2..98a651b8cd 100644
--- a/patches.suse/SUSE-bootsplash
+++ b/patches.suse/SUSE-bootsplash
@@ -22,7 +22,7 @@ Signed-off-by: Egbert Eich <eich@suse.de>
drivers/video/Makefile | 1
drivers/video/bootsplash/Kconfig | 17
drivers/video/bootsplash/Makefile | 5
- drivers/video/bootsplash/bootsplash.c | 2414 ++++++++++++++++++++++++++++++++++
+ drivers/video/bootsplash/bootsplash.c | 2416 ++++++++++++++++++++++++++++++++++
drivers/video/bootsplash/decode-jpg.c | 998 ++++++++++++++
drivers/video/bootsplash/decode-jpg.h | 36
drivers/video/bootsplash/render.c | 491 ++++++
@@ -32,7 +32,7 @@ Signed-off-by: Egbert Eich <eich@suse.de>
include/linux/bootsplash.h | 76 +
include/linux/console_struct.h | 3
include/linux/fb.h | 4
- 17 files changed, 4234 insertions(+)
+ 17 files changed, 4236 insertions(+)
create mode 100644 drivers/video/bootsplash/Kconfig
create mode 100644 drivers/video/bootsplash/Makefile
create mode 100644 drivers/video/bootsplash/bootsplash.c
@@ -182,7 +182,7 @@ Signed-off-by: Egbert Eich <eich@suse.de>
+obj-$(CONFIG_BOOTSPLASH) += render.o
--- /dev/null
+++ b/drivers/video/bootsplash/bootsplash.c
-@@ -0,0 +1,2414 @@
+@@ -0,0 +1,2416 @@
+/*
+ * linux/drivers/video/bootsplash/bootsplash.c -
+ * splash screen handling functions.
@@ -1420,12 +1420,14 @@ Signed-off-by: Egbert Eich <eich@suse.de>
+
+ SPLASH_DEBUG("vc_num: %i", vc->vc_num);
+
++#if 0 /* Nouveau fb sets a different ops, so we can't use the condition */
+ if (info->fbops->fb_imageblit != cfb_imageblit) {
+ printk(KERN_ERR "bootsplash: "
+ "found, but framebuffer can't "
+ "handle it!\n");
+ return -1;
+ }
++#endif
+
+ if (!vc->vc_splash_data || !vc->vc_splash_data->splash_state) {
+ splash_off(vc, info);