GIT 36f021b579d195cdc5fa6f3e2bab198b4bf70643 git+ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git commit 215d06780d13fd7de629b02b61b7b7bf88ce5039 Author: Geert Uytterhoeven Date: Tue May 8 11:37:26 2007 +0200 Fix sunrpc warning noise Commit c5a4dd8b7c15927a8fbff83171b57cad675a79b9 introduced the following compiler warnings: net/sunrpc/sched.c:766: warning: format '%u' expects type 'unsigned int', but argument 3 has type 'size_t' net/sunrpc/sched.c:785: warning: format '%u' expects type 'unsigned int', but argument 2 has type 'size_t' - Use %zu to format size_t - Kill 2 useless casts Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 74add80cbd7fe246c893b93ee75ac59acdd01dd4 Author: Roland McGrath Date: Tue May 8 11:19:38 2007 -0700 Remove unused variable in get_unmapped_area Signed-off-by: Roland McGrath Signed-off-by: Linus Torvalds commit be3478ddb8a3902b588c840b42e166a0e64a87b3 Author: Andrew Morton Date: Tue May 8 00:40:22 2007 -0700 sm501fb printk warning fixes drivers/video/sm501fb.c: In function 'sm501fb_cursor': drivers/video/sm501fb.c:992: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'long unsigned int' drivers/video/sm501fb.c:992: warning: format '%08x' expects type 'unsigned int', but argument 4 has type 'long unsigned int' Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 147394c8ece44be85d692cc92cc0d047e4d8fb69 Author: Andrei Konovalov Date: Tue May 8 00:40:18 2007 -0700 xilinxfb: xilinx framebuffer device driver Add support for the video controller IP block included into Xilinx ML300 and ML403 reference designs. Signed-off-by: Andrei Konovalov Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 435d56fcd45cdf32bfb4db5d4e1efe17f3da95b2 Author: Krzysztof Helt Date: Tue May 8 00:40:16 2007 -0700 pm2fb: fix of jumps in pm2fb_probe This patch fixes incorrect targets of jumps when an error occurs in the pm2fb_probe. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 19c1a8b3122e7b2007cfd2836da2318816f324cc Author: Krzysztof Helt Date: Tue May 8 00:40:14 2007 -0700 skeletonfb: improvements This patch adds a macro to register PCI ids table and corrects type of xxxfb_fix variable to avoid modpost warnings. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4560daaf07ab68bef5e70355d1565b2e0a1a3bcf Author: Krzysztof Helt Date: Tue May 8 00:40:12 2007 -0700 pm2fb: removal of pm2fb_par fields This patch removes two redundant fields in the pm2fb_par structure. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c7bf38699aed591b6624add40acfa71fe6d902c Author: Krzysztof Helt Date: Tue May 8 00:40:10 2007 -0700 skeletonfb: more corrections More corrections to skeletonfb.c file: - fixed types of more arguments - removed returned values in void functions - removed not existing fb_poll function - fixed closing comment typo - corrected misleading constant name ADDR Signed-off-by: Krzysztof Helt Acked-By: James Simmons Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e645ffd83f987c8650e9dd0f22a0c57296ed458 Author: Antonino A. Daplas Date: Tue May 8 00:40:08 2007 -0700 vga16fb: actually support widths in multiples of 8 vga16fb does not just support 8-pixel wide rectangles, but rectangles with widths in multiples of 8. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ae854777592856ad8ce4d4cdb6114804e2e28f6 Author: Antonino A. Daplas Date: Tue May 8 00:40:06 2007 -0700 vgacon: disallow console operations when in KD_GRAPHICS mode Reported by James Pearson as: boot to run level 3 if not root, then make sure /dev/console is writeable login and type: setterm -blank 0 start X type into an xterm: while true; do echo "" > /dev/console; usleep 100000; done while the above loop is running switch to the text console and back again (Ctrl-Alt-F1 then Ctrl-Alt-F7) ... and the screen will be shifting (and wrapping) to the left. This problem stems from continuously writing text to the system console (which is in KD_TEXT mode) while the foreground console is in KD_GRAPHICS mode. Somewhere along the way, console printing got confused and omitted the KD_GRAPHICS/KD_TEXT test. Thus, vgacon attempted to scroll the screen of X, which causes X to shift. Fix by disallowing vgacon to touch the hardware when the vc is in KD_GRAPHICS mode. A definitive fix entails a full audit of the console code. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32dd38030b3b4ca0aa18a5402059de27bf69ed6b Author: Jan Engelhardt Date: Tue May 8 00:40:04 2007 -0700 Use menuconfig objects II: video/logo Change Kconfig objects from "menu, config" into "menuconfig" so that the user can disable the whole feature without having to enter the menu first. Signed-off-by: Jan Engelhardt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 87a7cc685a847800482db1fd74504b9b4b42264e Author: Krzysztof Helt Date: Tue May 8 00:40:02 2007 -0700 pm2fb: accelerated fillrect and copyarea This is a port of accelerated functions from 2.4 kernel. Only fillrect and copyarea are accelerated. Fillrect is not accelerated in 24-bit mode. [adaplas] Add appropriate flags Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34ed25f50b347c7e1ff78f9308e025ddd57c2f20 Author: Ondrej Zajicek Date: Tue May 8 00:40:00 2007 -0700 s3fb: updates Move s3fb_get_tilemax to svgalib.c as svga_get_tilemax, because it reports limitation of other code from svgalib (svga_settile, svga_tilecopy, ...) Limit font width to 8 pixels in 4 bpp mode. Signed-off-by: Ondrej Zajicek Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a31f0f7679aeaf79c613feaa3f4170741ccb218 Author: Krzysztof Helt Date: Tue May 8 00:39:57 2007 -0700 pm2fb: memclock setting corrections This patch disables a memory clock setting if a board has been initialized by BIOS. This allows using the memory clock set by manufacturer of the board. This patch also sets default clock for 3dlabs Permedia 2V reference board's clock to 75MHz (BIOS setting for EONtronic Permedia 2Vboard), because the default 83MHz can be too high. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 76c7d3ffe3acddf5619bd796e0b8fa5dc6ecdb39 Author: krzysztof.h1@wp.pl Date: Tue May 8 00:39:56 2007 -0700 pm2fb: reset transparency settings This patch resets transparency settings when depth changes. Otherwise the 16 and 24-bit modes work incorrectly after switching from 32-bit mode. Signed-off-by: Krzysztof Helt < krzysztof.h1@wp.pl> Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 167f07f1bc20ea1ab51d833deb0c18f5ab93618f Author: Antonino A. Daplas Date: Tue May 8 00:39:54 2007 -0700 fbcon: check console-fb mapping in fbcon_get_requirement - Check the console-to-fb mapping in fbcon_get_requirement(), otherwise the value returned may not be valid for the driver. - Minor cleanup Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b1e7223f28b4ed5073d2029a3597bf514ff514f2 Author: Antonino A. Daplas Date: Tue May 8 00:39:52 2007 -0700 fbdev: clean up exit patch of fb_set_var Clean up exit patch of fb_set_var(): - consolidate all return values into a single local variable - ensure that return values are valid error codes - fix fb_set_var() returning success when fb_check_caps() failed Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0959f0ca29244ae983b406fba313816a29244be7 Author: Adrian Bunk Date: Tue May 8 00:39:50 2007 -0700 drivers/video/sis/: remove more kernel 2.4 code Signed-off-by: Adrian Bunk Cc: Thomas Winischhofer Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c831c338f0ad299fcd1592c6e4f30657480f39af Author: Matthias Kaehlcke Date: Tue May 8 00:39:49 2007 -0700 use mutex instead of semaphore in virtual console driver The virtual console driver uses a semaphore as mutex. Use the mutex API instead of the (binary) semaphore. Signed-off-by: Matthias Kaehlcke Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 159dde93692ef549a0b2012c9f25feb4df638c9c Author: Ville Syrjala Date: Tue May 8 00:39:47 2007 -0700 atyfb: halve XCLK with Mobility and 32bit memory Laptops with Rage Mobility and 32bit memory interface seem to require halved XCLK to operate correctly. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b4e124c138558a0cff51398ddff9a8e44ed0b529 Author: Ville Syrjala Date: Tue May 8 00:39:45 2007 -0700 atyfb: reorganize clock init Reorganize atyfb clock init code so command line clock overrides are effective for all chips. The old code would silently ignore some of the command line clock overrides with some chips. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94f45bcd1c29e773b6bf189ef7b9a3437d016320 Author: Ville Syrjala Date: Tue May 8 00:39:44 2007 -0700 atyfb: increase SPLL delay Wait 5 ms instead of 500 us for the SPLL to lock. This matches the recommendation in mach64 programmer's guide. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2620c6e31735248ac26403558bd4279a8af619d8 Author: Antonino A. Daplas Date: Tue May 8 00:39:42 2007 -0700 nvidiafb: fix return value of nvidiafb_open() Fix return value of nvidiafb_open(). Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0449359f053829ec89c026b5fb80bbe7190a5fe8 Author: Ondrej Zajicek Date: Tue May 8 00:39:41 2007 -0700 vga: vgastate fix 1) sets 'palette access disabled' during read from AR10. This is usually documented as needed for access AR01-AR0F, but on ARK Logic card it is needed for AR10 (otherwise read returns some nonsence and save_vga_text() returns before do anything). 2) do not restore AR10, because it was not changed during 3) remove modification of misc reg: /* force graphics mode */ vga_w(state->vgabase, VGA_MIS_W, misc | 1); as comment is misleading - LSB of misc reg does not set/reset graphics mode, but set color/mono adresses of CRT and some other regs. but these regs are not used during save/restore fonts. (it worked even when (misc | 1) was replaced by (misc & ~1) ). Signed-off-by: Ondrej Zajicek Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 56c7554938e5945b770365e326f0c3d031ca231f Author: Antonino A. Daplas Date: Tue May 8 00:39:39 2007 -0700 s3fb: implement fb_get_caps Implement fb_get_caps(). This will allow the driver to tell upper layer that it can only support 256 8x16 bitmaps when in tileblitting mode (var->bits_per_pixel == 0); Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 38a3dc51852d8350b156ea909c5aa8767d71b005 Author: Antonino A. Daplas Date: Tue May 8 00:39:37 2007 -0700 fbdev: fbcon: check if mode can handle new screen Check if the mode can properly display the screen. This will be needed by drivers where the capability is not constant with each mode. The function fb_set_var() will query fbcon the requirement, then it will query the driver (via a new hook fb_get_caps()) its capability. If the driver's capability cannot handle fbcon's requirement, then fb_set_var() will fail. For example, if a particular driver supports 2 modes where: mode1 = can only display 8x16 bitmaps mode2 = can display any bitmap then if current mode = mode2 and current font = 12x22 fbset /* mode1 cannot handle 12x22 */ fbset will fail Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e15de77e74d429f14641ebe7a29ccd8aa6656f3c Author: Dave Jones Date: Tue May 8 00:39:35 2007 -0700 nvidiafb: prevent triggering of softlockup If the chip locks up, we get into a long polling loop, where the softlockup detector kicks in. See https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=151878 for an example. [adaplas] Chip lockup can occur at 3 points (flush, sync, and wait). Consolidate and allow the driver to go to safe mode cleanly. Signed-off-by: Dave Jones Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d4a96b53125c3d31266c05f2a8432d956dd26141 Author: Krzysztof Helt Date: Tue May 8 00:39:33 2007 -0700 pm2fb: pixclock setting restriction This patch adds restrictions to calculations of m, n and p factors which sets the pixclock for the Permedia 2V. I found during tests that synchronization is unstable if m (divisor) is bigger than half of the n (numerator). The patch disallows such settings combination. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5d809d774fc8aa76899bde3235afb046728feed Author: Krzysztof Helt Date: Tue May 8 00:39:32 2007 -0700 pm2fb: Permedia 2V memory clock setting Permedia 2V uses its own registers to set a memory clock. The patch adds these registers and uses them in the set_memclock() function. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f1c15f938d810b5eb38c85a28e5e9d2af07d135a Author: Krzysztof Helt Date: Tue May 8 00:39:30 2007 -0700 pm2fb: 3dlabs Permedia 2V reference board added This patch adds support for 3dlabs Permedia reference board. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d37363409bacd1142c6e49edfb3e1f8b153d47dc Author: Alan Cox Date: Tue May 8 00:39:28 2007 -0700 nvidiafb/rivafb: switch to pci_get refcounting Switch to pci_get refcounting APIs [adaplas] Fix a long-standing bug where the return value of pci_find_slot()/pci_get_bus_and_slot() is ignored. Signed-off-by: Alan Cox Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dbe7e429fedb3fbc93b496cc1c3eb4fc28333ac0 Author: Alan Hourihane Date: Tue May 8 00:39:25 2007 -0700 vmlfb: framebuffer driver for Intel Vermilion Range Add the Intel Vermilion Range framebuffer support. Signed-off-by: Alan Hourihane Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 249bdbbf0dbab5554a4bfe55639e324d4758da96 Author: Ondrej Zajicek Date: Tue May 8 00:39:24 2007 -0700 s3fb: driver fixes This fixes broken fbcon on Virge VX in 24 bpp mode, and contains several other small updates. Signed-off-by: Ondrej Zajicek Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4941cb7a18fd84d4d8cd097d2beada3c79c8f781 Author: Antonino A. Daplas Date: Tue May 8 00:39:22 2007 -0700 fbdev: save the activate field before calling fb_check_var() Some drivers may reset the var->activate field on fb_check_var(). This can lead to undefined behavior. For example, doing fbset -a