/[linux-patches]/genpatches-2.6/trunk/2.6.20-pre/4205_vesafb-tng-1.0-rc2.patch
Gentoo

Diff of /genpatches-2.6/trunk/2.6.20-pre/4205_vesafb-tng-1.0-rc2.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 833 Revision 834
1Index: linux-2.6.20/Documentation/fb/vesafb.txt 1Index: linux-git/Documentation/fb/vesafb.txt
2=================================================================== 2===================================================================
3--- linux-2.6.20.orig/Documentation/fb/vesafb.txt 3--- linux-git.orig/Documentation/fb/vesafb.txt
4+++ linux-2.6.20/Documentation/fb/vesafb.txt 4+++ linux-git/Documentation/fb/vesafb.txt
5@@ -2,16 +2,18 @@ 5@@ -2,16 +2,18 @@
6 What is vesafb? 6 What is vesafb?
7 =============== 7 ===============
8 8
9-This is a generic driver for a graphic framebuffer on intel boxes. 9-This is a generic driver for a graphic framebuffer on intel boxes.
349+Nico Schmoigl <schmoigl@rumms.uni-mannheim.de> 349+Nico Schmoigl <schmoigl@rumms.uni-mannheim.de>
350+ 350+
351+Extended documentation for vm86, VBE 3.0 and vesafb-tng by 351+Extended documentation for vm86, VBE 3.0 and vesafb-tng by
352+Michal Januszewski <spock@gentoo.org> 352+Michal Januszewski <spock@gentoo.org>
353+ 353+
354Index: linux-2.6.20/arch/i386/boot/video.S 354Index: linux-git/arch/i386/boot/video.S
355=================================================================== 355===================================================================
356--- linux-2.6.20.orig/arch/i386/boot/video.S 356--- linux-git.orig/arch/i386/boot/video.S
357+++ linux-2.6.20/arch/i386/boot/video.S 357+++ linux-git/arch/i386/boot/video.S
358@@ -163,10 +163,12 @@ basret: ret 358@@ -163,10 +163,12 @@ basret: ret
359 # parameters in the default 80x25 mode -- these are set directly, 359 # parameters in the default 80x25 mode -- these are set directly,
360 # because some very obscure BIOSes supply insane values. 360 # because some very obscure BIOSes supply insane values.
361 mode_params: 361 mode_params:
362+#ifdef CONFIG_FB_VESA_STD 362+#ifdef CONFIG_FB_VESA_STD
413 _setbad: jmp setbad # Ugly... 413 _setbad: jmp setbad # Ugly...
414+#endif 414+#endif
415 415
416 # Recalculate vertical display end registers -- this fixes various 416 # Recalculate vertical display end registers -- this fixes various
417 # inconsistencies of extended modes on many adapters. Called when 417 # inconsistencies of extended modes on many adapters. Called when
418Index: linux-2.6.20/drivers/char/sysrq.c 418Index: linux-git/drivers/char/sysrq.c
419=================================================================== 419===================================================================
420--- linux-2.6.20.orig/drivers/char/sysrq.c 420--- linux-git.orig/drivers/char/sysrq.c
421+++ linux-2.6.20/drivers/char/sysrq.c 421+++ linux-git/drivers/char/sysrq.c
422@@ -240,7 +240,7 @@ static void send_sig_all(int sig) 422@@ -240,7 +240,7 @@ static void send_sig_all(int sig)
423 struct task_struct *p; 423 struct task_struct *p;
424 424
425 for_each_process(p) { 425 for_each_process(p) {
426- if (p->mm && !is_init(p)) 426- if (p->mm && !is_init(p))
427+ if (p->mm && !is_init(p) && !(p->flags & PF_BORROWED_MM)) 427+ if (p->mm && !is_init(p) && !(p->flags & PF_BORROWED_MM))
428 /* Not swapper, init nor kernel thread */ 428 /* Not swapper, init nor kernel thread */
429 force_sig(sig, p); 429 force_sig(sig, p);
430 } 430 }
431Index: linux-2.6.20/drivers/video/Kconfig 431Index: linux-git/drivers/video/Kconfig
432=================================================================== 432===================================================================
433--- linux-2.6.20.orig/drivers/video/Kconfig 433--- linux-git.orig/drivers/video/Kconfig
434+++ linux-2.6.20/drivers/video/Kconfig 434+++ linux-git/drivers/video/Kconfig
435@@ -547,8 +547,22 @@ config FB_TGA 435@@ -547,8 +547,22 @@ config FB_TGA
436 cards. Say Y if you have one of those. 436 cards. Say Y if you have one of those.
437 437
438 config FB_VESA 438 config FB_VESA
439- bool "VESA VGA graphics support" 439- bool "VESA VGA graphics support"
500+ depends on FB_VESA 500+ depends on FB_VESA
501+ default y 501+ default y
502 502
503 config FB_IMAC 503 config FB_IMAC
504 bool "Intel-based Macintosh Framebuffer Support" 504 bool "Intel-based Macintosh Framebuffer Support"
505Index: linux-2.6.20/drivers/video/Makefile 505Index: linux-git/drivers/video/Makefile
506=================================================================== 506===================================================================
507--- linux-2.6.20.orig/drivers/video/Makefile 507--- linux-git.orig/drivers/video/Makefile
508+++ linux-2.6.20/drivers/video/Makefile 508+++ linux-git/drivers/video/Makefile
509@@ -103,7 +103,11 @@ obj-$(CONFIG_FB_PNX4008_DUM_RGB) += pnx 509@@ -103,7 +103,11 @@ obj-$(CONFIG_FB_PNX4008_DUM_RGB) += pnx
510 obj-$(CONFIG_FB_IBM_GXT4500) += gxt4500.o 510 obj-$(CONFIG_FB_IBM_GXT4500) += gxt4500.o
511 511
512 # Platform or fallback drivers go here 512 # Platform or fallback drivers go here
513-obj-$(CONFIG_FB_VESA) += vesafb.o 513-obj-$(CONFIG_FB_VESA) += vesafb.o
517+ obj-$(CONFIG_FB_VESA) += vesafb-thread.o vesafb-tng.o 517+ obj-$(CONFIG_FB_VESA) += vesafb-thread.o vesafb-tng.o
518+endif 518+endif
519 obj-$(CONFIG_FB_IMAC) += imacfb.o 519 obj-$(CONFIG_FB_IMAC) += imacfb.o
520 obj-$(CONFIG_FB_VGA16) += vga16fb.o vgastate.o 520 obj-$(CONFIG_FB_VGA16) += vga16fb.o vgastate.o
521 obj-$(CONFIG_FB_OF) += offb.o 521 obj-$(CONFIG_FB_OF) += offb.o
522Index: linux-2.6.20/drivers/video/fbmem.c 522Index: linux-git/drivers/video/fbmem.c
523=================================================================== 523===================================================================
524--- linux-2.6.20.orig/drivers/video/fbmem.c 524--- linux-git.orig/drivers/video/fbmem.c
525+++ linux-2.6.20/drivers/video/fbmem.c 525+++ linux-git/drivers/video/fbmem.c
526@@ -1408,6 +1408,7 @@ fbmem_init(void) 526@@ -1408,6 +1408,7 @@ fbmem_init(void)
527 printk(KERN_WARNING "Unable to create fb class; errno = %ld\n", PTR_ERR(fb_class)); 527 printk(KERN_WARNING "Unable to create fb class; errno = %ld\n", PTR_ERR(fb_class));
528 fb_class = NULL; 528 fb_class = NULL;
529 } 529 }
530+ 530+
531 return 0; 531 return 0;
532 } 532 }
533 533
534Index: linux-2.6.20/drivers/video/modedb.c 534Index: linux-git/drivers/video/modedb.c
535=================================================================== 535===================================================================
536--- linux-2.6.20.orig/drivers/video/modedb.c 536--- linux-git.orig/drivers/video/modedb.c
537+++ linux-2.6.20/drivers/video/modedb.c 537+++ linux-git/drivers/video/modedb.c
538@@ -674,6 +674,7 @@ void fb_var_to_videomode(struct fb_video 538@@ -674,6 +674,7 @@ void fb_var_to_videomode(struct fb_video
539 { 539 {
540 u32 pixclock, hfreq, htotal, vtotal; 540 u32 pixclock, hfreq, htotal, vtotal;
541 541
542+ mode->refresh = 0; 542+ mode->refresh = 0;
546@@ -1025,3 +1026,4 @@ EXPORT_SYMBOL(fb_find_best_mode); 546@@ -1025,3 +1026,4 @@ EXPORT_SYMBOL(fb_find_best_mode);
547 EXPORT_SYMBOL(fb_find_nearest_mode); 547 EXPORT_SYMBOL(fb_find_nearest_mode);
548 EXPORT_SYMBOL(fb_videomode_to_modelist); 548 EXPORT_SYMBOL(fb_videomode_to_modelist);
549 EXPORT_SYMBOL(fb_find_mode); 549 EXPORT_SYMBOL(fb_find_mode);
550+EXPORT_SYMBOL(fb_destroy_modelist); 550+EXPORT_SYMBOL(fb_destroy_modelist);
551Index: linux-2.6.20/drivers/video/vesafb-thread.c 551Index: linux-git/drivers/video/vesafb-thread.c
552=================================================================== 552===================================================================
553--- /dev/null 553--- /dev/null
554+++ linux-2.6.20/drivers/video/vesafb-thread.c 554+++ linux-git/drivers/video/vesafb-thread.c
555@@ -0,0 +1,751 @@ 555@@ -0,0 +1,751 @@
556+/* 556+/*
557+ * Framebuffer driver for VBE 2.0+ compliant graphic boards. 557+ * Framebuffer driver for VBE 2.0+ compliant graphic boards.
558+ * Kernel thread and vm86 routines. 558+ * Kernel thread and vm86 routines.
559+ * 559+ *
1302+EXPORT_SYMBOL_GPL(vesafb_wait_for_thread); 1302+EXPORT_SYMBOL_GPL(vesafb_wait_for_thread);
1303+ 1303+
1304+MODULE_LICENSE("GPL"); 1304+MODULE_LICENSE("GPL");
1305+MODULE_AUTHOR("Michal Januszewski"); 1305+MODULE_AUTHOR("Michal Januszewski");
1306+ 1306+
1307Index: linux-2.6.20/drivers/video/vesafb-tng.c 1307Index: linux-git/drivers/video/vesafb-tng.c
1308=================================================================== 1308===================================================================
1309--- /dev/null 1309--- /dev/null
1310+++ linux-2.6.20/drivers/video/vesafb-tng.c 1310+++ linux-git/drivers/video/vesafb-tng.c
1311@@ -0,0 +1,1586 @@ 1311@@ -0,0 +1,1586 @@
1312+/* 1312+/*
1313+ * Framebuffer driver for VBE 2.0+ compliant graphic boards 1313+ * Framebuffer driver for VBE 2.0+ compliant graphic boards
1314+ * 1314+ *
1315+ * (c) 2004-2006 Michal Januszewski <spock@gentoo.org> 1315+ * (c) 2004-2006 Michal Januszewski <spock@gentoo.org>
2893+ 2893+
2894+MODULE_LICENSE("GPL"); 2894+MODULE_LICENSE("GPL");
2895+MODULE_AUTHOR("Michal Januszewski"); 2895+MODULE_AUTHOR("Michal Januszewski");
2896+MODULE_DESCRIPTION("Framebuffer driver for VBE2.0+ compliant graphics boards"); 2896+MODULE_DESCRIPTION("Framebuffer driver for VBE2.0+ compliant graphics boards");
2897+ 2897+
2898Index: linux-2.6.20/include/linux/sched.h 2898Index: linux-git/include/linux/sched.h
2899=================================================================== 2899===================================================================
2900--- linux-2.6.20.orig/include/linux/sched.h 2900--- linux-git.orig/include/linux/sched.h
2901+++ linux-2.6.20/include/linux/sched.h 2901+++ linux-git/include/linux/sched.h
2902@@ -1390,6 +1390,8 @@ extern void mmput(struct mm_struct *); 2902@@ -1390,6 +1390,8 @@ extern void mmput(struct mm_struct *);
2903 extern struct mm_struct *get_task_mm(struct task_struct *task); 2903 extern struct mm_struct *get_task_mm(struct task_struct *task);
2904 /* Remove the current tasks stale references to the old mm_struct */ 2904 /* Remove the current tasks stale references to the old mm_struct */
2905 extern void mm_release(struct task_struct *, struct mm_struct *); 2905 extern void mm_release(struct task_struct *, struct mm_struct *);
2906+/* Create a new mm for a kernel thread */ 2906+/* Create a new mm for a kernel thread */
2907+extern int set_new_mm(void); 2907+extern int set_new_mm(void);
2908 2908
2909 extern int copy_thread(int, unsigned long, unsigned long, unsigned long, struct task_struct *, struct pt_regs *); 2909 extern int copy_thread(int, unsigned long, unsigned long, unsigned long, struct task_struct *, struct pt_regs *);
2910 extern void flush_thread(void); 2910 extern void flush_thread(void);
2911Index: linux-2.6.20/include/video/vesa.h 2911Index: linux-git/include/video/vesa.h
2912=================================================================== 2912===================================================================
2913--- /dev/null 2913--- /dev/null
2914+++ linux-2.6.20/include/video/vesa.h 2914+++ linux-git/include/video/vesa.h
2915@@ -0,0 +1,150 @@ 2915@@ -0,0 +1,150 @@
2916+#if 0 2916+#if 0
2917+#define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , \ 2917+#define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , \
2918+ ## args) 2918+ ## args)
2919+#else 2919+#else
3061+ u32 mem_total; 3061+ u32 mem_total;
3062+ int mode_idx; 3062+ int mode_idx;
3063+ struct vesafb_crtc_ib crtc; 3063+ struct vesafb_crtc_ib crtc;
3064+}; 3064+};
3065+ 3065+
3066Index: linux-2.6.20/kernel/fork.c 3066Index: linux-git/kernel/fork.c
3067=================================================================== 3067===================================================================
3068--- linux-2.6.20.orig/kernel/fork.c 3068--- linux-git.orig/kernel/fork.c
3069+++ linux-2.6.20/kernel/fork.c 3069+++ linux-git/kernel/fork.c
3070@@ -100,6 +100,7 @@ struct kmem_cache *fs_cachep; 3070@@ -100,6 +100,7 @@ struct kmem_cache *fs_cachep;
3071 3071
3072 /* SLAB cache for vm_area_struct structures */ 3072 /* SLAB cache for vm_area_struct structures */
3073 struct kmem_cache *vm_area_cachep; 3073 struct kmem_cache *vm_area_cachep;
3074+EXPORT_SYMBOL_GPL(vm_area_cachep); 3074+EXPORT_SYMBOL_GPL(vm_area_cachep);
3114+ 3114+
3115+/** 3115+/**
3116 * get_task_mm - acquire a reference to the task's mm 3116 * get_task_mm - acquire a reference to the task's mm
3117 * 3117 *
3118 * Returns %NULL if the task has no mm. Checks PF_BORROWED_MM (meaning 3118 * Returns %NULL if the task has no mm. Checks PF_BORROWED_MM (meaning
3119Index: linux-2.6.20/mm/memory.c 3119Index: linux-git/mm/memory.c
3120=================================================================== 3120===================================================================
3121--- linux-2.6.20.orig/mm/memory.c 3121--- linux-git.orig/mm/memory.c
3122+++ linux-2.6.20/mm/memory.c 3122+++ linux-git/mm/memory.c
3123@@ -1193,6 +1193,7 @@ int zeromap_page_range(struct vm_area_st 3123@@ -1193,6 +1193,7 @@ int zeromap_page_range(struct vm_area_st
3124 } while (pgd++, addr = next, addr != end); 3124 } while (pgd++, addr = next, addr != end);
3125 return err; 3125 return err;
3126 } 3126 }
3127+EXPORT_SYMBOL_GPL(zeromap_page_range); 3127+EXPORT_SYMBOL_GPL(zeromap_page_range);
3128 3128
3129 pte_t * fastcall get_locked_pte(struct mm_struct *mm, unsigned long addr, spinlock_t **ptl) 3129 pte_t * fastcall get_locked_pte(struct mm_struct *mm, unsigned long addr, spinlock_t **ptl)
3130 { 3130 {
3131Index: linux-2.6.20/mm/mmap.c 3131Index: linux-git/mm/mmap.c
3132=================================================================== 3132===================================================================
3133--- linux-2.6.20.orig/mm/mmap.c 3133--- linux-git.orig/mm/mmap.c
3134+++ linux-2.6.20/mm/mmap.c 3134+++ linux-git/mm/mmap.c
3135@@ -2024,6 +2024,7 @@ int insert_vm_struct(struct mm_struct * 3135@@ -2031,6 +2031,7 @@ int insert_vm_struct(struct mm_struct *
3136 vma_link(mm, vma, prev, rb_link, rb_parent); 3136 vma_link(mm, vma, prev, rb_link, rb_parent);
3137 return 0; 3137 return 0;
3138 } 3138 }
3139+EXPORT_SYMBOL_GPL(insert_vm_struct); 3139+EXPORT_SYMBOL_GPL(insert_vm_struct);
3140 3140

Legend:
Removed from v.833  
changed lines
  Added in v.834

  ViewVC Help
Powered by ViewVC 1.1.20