r2297 - in trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian: . patches patches/series
Andres Salomon
dilinger-guest@costa.debian.org
Fri, 14 Jan 2005 06:59:57 +0100
Author: dilinger-guest
Date: 2005-01-14 06:59:56 +0100 (Fri, 14 Jan 2005)
New Revision: 2297
Modified:
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/modular-vesafb-2.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-4
Log:
* More modular-vesafb updates/cleanups (Andres Salomon).
Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog 2005-01-13 23:56:52 UTC (rev 2296)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog 2005-01-14 05:59:56 UTC (rev 2297)
@@ -44,6 +44,8 @@
* Apply patch to fix compat cmsg_len checks (Christoph Hellwig).
+ * More modular-vesafb updates/cleanups (Andres Salomon).
+
-- Sven Luther <luther@debian.org> Mon, 10 Jan 2005 18:06:29 +0100
kernel-source-2.6.10 (2.6.10-3) unstable; urgency=low
Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/modular-vesafb-2.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/modular-vesafb-2.dpatch 2005-01-13 23:56:52 UTC (rev 2296)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/modular-vesafb-2.dpatch 2005-01-14 05:59:56 UTC (rev 2297)
@@ -10,32 +10,11 @@
@DPATCH@
-base-0
- tag of dilinger@voxel.net--2004-public/linux-drivers-video--mainline--0--base-0
-patch-1
- pull in debian's modular-vesafb.dpatch from k-s-2.6.9 -3.
-patch-2
- add missing vesafb_remove registration in device_driver struct
-patch-3
- vesafb_init() should be called regardless of whether CONFIG_MODULE == y
-patch-4
- drop 'inverse'; it's not used.
-patch-5
- there's no need to include moduleparam.h; already icnluded by module.h
-patch-6
- add struct vesafb_info, and move mtrr handle to it (vs. global)
-patch-7
- add missing framebuffer_release() call
-patch-8
- turn mtrr into initdata; that's 4 bytes saved, baby!
-patch-9
- proper module arg handling; don't require a single "options=" string
-patch-10
- ah, module_param_named() certainly is handy..
+* modified files
---- orig/drivers/video/Kconfig
-+++ mod/drivers/video/Kconfig
-@@ -311,7 +311,7 @@
+--- orig/Kconfig
++++ mod/Kconfig
+@@ -329,7 +329,7 @@
cards. Say Y if you have one of those.
config FB_VESA
@@ -46,8 +25,8 @@
This is the frame buffer device driver for generic VESA 2.0
---- orig/drivers/video/vesafb.c
-+++ mod/drivers/video/vesafb.c
+--- orig/vesafb.c
++++ mod/vesafb.c
@@ -28,6 +28,12 @@
#define dac_reg (0x3c8)
#define dac_val (0x3c9)
@@ -61,14 +40,15 @@
/* --------------------------------------------------------------------- */
static struct fb_var_screeninfo vesafb_defined __initdata = {
-@@ -47,15 +53,30 @@
+@@ -47,17 +53,34 @@
.accel = FB_ACCEL_NONE,
};
-static int inverse = 0;
-static int mtrr = 1;
+static int mtrr __initdata = 1;
- static int vram __initdata = 0; /* Set amount of memory to be used */
+ static int vram_remap __initdata = 0; /* Set amount of memory to be used */
+ static int vram_total __initdata = 0; /* Set total amount of memory */
static int pmi_setpal = 0; /* pmi for palette changes ??? */
+static int redraw __initdata = 0;
static int ypan = 0; /* 0..nothing, 1..ypan, 2..ywrap */
@@ -76,6 +56,7 @@
static unsigned short *pmi_base = NULL;
static void (*pmi_start)(void);
static void (*pmi_pal)(void);
+ static int depth;
+module_param(redraw, bool, 0);
+module_param(ypan, bool, 0);
@@ -88,13 +69,15 @@
+MODULE_PARM_DESC(mtrr, "Enable MTRR support (default)");
+module_param_named(nomtrr, mtrr, invbool, 0);
+MODULE_PARM_DESC(nomtrr, "Disable MTRR support");
-+module_param(vram, int, 0);
-+MODULE_PARM_DESC(vram, "System RAM to allocate to framebuffer");
++module_param(vram_remap, int, 0);
++MODULE_PARM_DESC(vram_remap, "Set total amount of memory to be used");
++module_param(vram_total, int, 0);
++MODULE_PARM_DESC(vram_total, "Total amount of memory");
+
/* --------------------------------------------------------------------- */
static int vesafb_pan_display(struct fb_var_screeninfo *var,
-@@ -183,6 +204,7 @@
+@@ -185,6 +208,7 @@
.fb_cursor = soft_cursor,
};
@@ -102,7 +85,7 @@
int __init vesafb_setup(char *options)
{
char *this_opt;
-@@ -193,9 +215,7 @@
+@@ -195,9 +219,7 @@
while ((this_opt = strsep(&options, ",")) != NULL) {
if (!*this_opt) continue;
@@ -113,7 +96,7 @@
ypan=0;
else if (! strcmp(this_opt, "ypan"))
ypan=1;
-@@ -214,11 +234,13 @@
+@@ -218,11 +240,13 @@
}
return 0;
}
@@ -125,9 +108,9 @@
struct fb_info *info;
+ struct vesafb_info *vfb_info;
int i, err;
-
- if (screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB)
-@@ -264,13 +286,14 @@
+ unsigned int size_vmode;
+ unsigned int size_remap;
+@@ -280,13 +304,14 @@
spaces our resource handlers simply don't know about */
}
@@ -145,7 +128,7 @@
info->screen_base = ioremap(vesafb_fix.smem_start, vesafb_fix.smem_len);
if (!info->screen_base) {
-@@ -368,7 +391,7 @@
+@@ -395,7 +420,7 @@
temp_size &= (temp_size - 1);
/* Try and find a power of two to add */
@@ -154,7 +137,7 @@
temp_size >>= 1;
}
}
-@@ -390,6 +413,7 @@
+@@ -417,6 +442,7 @@
}
printk(KERN_INFO "fb%d: %s frame buffer device\n",
info->node, info->fix.id);
@@ -162,7 +145,7 @@
return 0;
err:
framebuffer_release(info);
-@@ -397,10 +421,24 @@
+@@ -424,10 +450,24 @@
return err;
}
@@ -187,7 +170,7 @@
};
static struct platform_device vesafb_device = {
-@@ -410,11 +448,18 @@
+@@ -437,11 +477,18 @@
int __init vesafb_init(void)
{
int ret;
@@ -206,22 +189,22 @@
ret = driver_register(&vesafb_driver);
if (!ret) {
-@@ -426,6 +471,15 @@
+@@ -451,7 +498,15 @@
+ }
+ return ret;
}
- module_init(vesafb_init);
-
-+#ifdef MODULE
++
+static void __exit vesafb_exit(void)
+{
+ platform_device_unregister(&vesafb_device);
+ driver_unregister(&vesafb_driver);
+}
-+module_exit(vesafb_exit);
-+#endif
+
+ module_init(vesafb_init);
++module_exit(vesafb_exit);
+
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
- * ---------------------------------------------------------------------------
Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-4
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-4 2005-01-13 23:56:52 UTC (rev 2296)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-4 2005-01-14 05:59:56 UTC (rev 2297)
@@ -11,7 +11,7 @@
+ fix-alpha-ext3-oops.dpatch
+ alsa-emu10k1-ioctl-fix.dpatch
- modular-vesafb.dpatch
-+ modular-vesafb-3.dpatch
++ modular-vesafb-2.dpatch
+ alpha-io-typo.dpatch
+ 033-rlimit_memlock_check.dpatch
+ 034-stack_resize_exploit.dpatch