summaryrefslogtreecommitdiff
path: root/drivers/char
Commit message (Collapse)AuthorAgeFilesLines
* drm: allow multiple addMaps with the same 32-bit map offsset.Thomas Hellstrom2006-09-221-6/+8
| | | | | | Reported on -mm kernels. Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: fd.o Bug #7595: Avoid u32 overflows in radeon_check_and_fixup_offset().Michel Daenzer2006-09-221-13/+12
| | | | | | | | The overflows could cause valid offsets to get rejected under some circumstances, e.g. when the framebuffer resides at the very end of the card's address space. Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: Fix hashtab implementation leaking illegal error codes to user space.Thomas Hellstrom2006-09-221-3/+3
| | | | | | reported by Dave Airlie Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: domain changes broke ppc r200Dave Airlie2006-09-221-1/+1
| | | | | | | | | Freedesktop.org bug #8246 The domain changes regressed on PPC, go back to just using 0, as X.org's domain support is crap Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: fixup setversion return codes..Dave Airlie2006-09-221-7/+10
| | | | | | | | Frederik Deweerdt <deweerdt@free.fr> noticed some badness in setversion returns, however just making it work, breaks things... this code is hairy with backwards compat... Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: fixup i915 error codesDave Airlie2006-09-221-2/+2
| | | | | | | Frederik Deweerdt <deweerdt@free.fr> pointed this out, I fixed a missing DRM error wrapper also. Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: realign sosme radeon code with drm git treeDave Airlie2006-09-222-9/+15
| | | | | | | this applies some minor cleanups for the radeon driver, to use the 3D flush and reset the AGP flags on X recycle Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: realign via driver with drm git treeDave Airlie2006-09-223-26/+54
| | | | | | This just realigns some code/whitespace between the kernel and main tree Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: remove hash tables on drm exitThomas Hellstrom2006-09-222-0/+4
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: cleanupsAdrian Bunk2006-09-223-7/+10
| | | | | | | | | This patch contains the following cleanups: - make 3 needlessly global functions static - sis_mm.c: fix compile warnings with CONFIG_FB_SIS=y Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: i810_dma.c: fix pointer arithmetic for 64-bit targetDenis Vlasenko2006-09-222-5/+5
| | | | | | | | | | | First warning result from open-coded PTR_ERR, the rest is caused by code like this: *(u32 *) ((u32) buf_priv->kernel_virtual + used) I've also fixed a missing PTR_ERR in i830_dma.c Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: avoid kernel oops in some error paths calling drm_lastcloseThomas Hellstrom2006-09-221-4/+6
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: allow detection of new VIA chipsetsChuck Short2006-09-221-0/+3
| | | | | | | | | | | | | Update pci ids. patch location: http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-dapper.git;a=c ommitdiff;h=5195a64a27550a279b2ecaf400066a3823f2d053 Signed-off-by: Chuck Short <zulcss@gmail.com> Signed-off-by: Ben Collins <bcollins@ubuntu.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: fix i965 build bugAndrew Morton2006-09-221-1/+1
| | | | | Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: remove FALSE/TRUE that snuck in with simple memory manager changes.Andrew Morton2006-09-226-19/+19
| | | | | | | | Thanks to Andrew Morton for pointing these out, I've fixed a few his patch missed. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: Add support for Intel i965G chipsets.Alan Hourihane2006-09-225-19/+58
| | | | | | | | This is a patch prepared by Guangdeng Liao based off of Tungsten Graphics's final code drop. From: Alan Hourihane <alanh@tungstengraphics.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: add better explanation for i830/i915Dave Airlie2006-09-221-3/+6
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: remove a tab that snuck inDave Airlie2006-09-221-1/+1
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: fix return value in auth functionDave Airlie2006-09-221-1/+1
| | | | | | This just fixes up the return value in the drm_auth:remove_magic Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: SiS 315 Awareness.Thomas Hellstrom2006-09-224-1/+84
| | | | | | Add support for the SiS 315 to the DRM. Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: update user token hashing and map handlesThomas Hellstrom2006-09-225-63/+51
| | | | | | | | | | | | | | | | | | | Keep hashed user tokens, with the following changes: 32-bit physical device addresses are mapped directly to user-tokens. No duplicate maps are allowed, and the addresses are assumed to be outside of the range 0x10000000 through 0x30000000. The user-token is identical to the 32-bit physical start-address of the map. 64-bit physical device addressed are mapped to user-tokens in the range 0x10000000 to 0x30000000 with page-size increments. The user_token should not be interpreted as an address. Other map types, like upcoming TTM maps are mapped to user-tokens in the range 0x10000000 to 0x30000000 with page-size increments. The user_token should not be interpreted as an address. Implement hashed map lookups. Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: move drm authentication to new generic hash table.Thomas Hellstrom2006-09-225-62/+26
| | | | | | | Fix drm_remove_magic potential memory leak / corruption. Move drm authentication token hashing to new generic hash table implementation. Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: Add the P4VM800PRO (?) PCI ID.Dave Airlie2006-09-221-0/+1
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: add drm simple memory manager support for SiS and VIA driversThomas Hellstrom2006-09-2212-1403/+344
| | | | | | | | This add support to the SiS and VIA drivers for the simple memory manager. This fixes a lot of problems with the current simple code these drivers used, including locking and SMP issues. Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: add simple DRM memory manager, and hash tableThomas Hellstrom2006-09-227-2/+1019
| | | | | | | | This adds the DRM hashtable and simple memory manager implementations from Tungsten Graphics, this is NOT the new memory manager, this is a replacement for the SIS and VIA memory managers. Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: radeon: Use RADEON_RB3D_DSTCACHE_CTLSTAT instead of ↵Michel Dänzer2006-09-222-7/+12
| | | | | | | | RADEON_RB2D_DSTCACHE_CTLSTAT. The latter seems to be a read-only mirror of the former. Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: radeon: fix up bus mastering when writeback is disabledMichel Dänzer2006-09-222-0/+8
| | | | | | | | | | When writeback isn't used, actually disable it in the hardware. Not doing this might waste bus bandwidth or even cause memory corruption or system crashes on systems that check bus transfers. No such incident has been reported though. Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: radeon: implement RADEON_PARAM_SCRATCH_OFFSET getparamMichel Dänzer2006-09-221-1/+5
| | | | | | When this succeeds, userspace can read the scratch register contents from th mapped writeback page directly. Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: radeon: add some debug output when getparam is called with unknownMichel Dänzer2006-09-221-0/+1
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: missing mutex unlockThomas Hellstrom2006-09-221-1/+3
| | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: remove the DRM pci domainDave Airlie2006-09-224-7/+9
| | | | | | | | | | This patch removes the pci_domain from the DRM device structure, and gets it via a macro that either asks the platform or does the alpha special case. jgarzik asked for this to just use the platform magic, but I've no alpha experience and I'd rather not just break it and wait for someone to give out. Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: remove local copies of pci bus/slot/funcDave2006-09-224-11/+8
| | | | | | The drm keeps a local copy of these for little use. Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: cleanup old compat code and DRM fns from Linux only codeDave Airlie2006-09-2210-29/+21
| | | | | | | This patch removes some of the old compatibility macros from the DRM, and removes use of DRM wrappers from Linux specific code. Signed-off-by: Dave Airlie <airlied@linux.ie>
* [PATCH] IPMI: fix handling of OEM flagsCorey Minyard2006-09-161-4/+4
| | | | | | | | | | | If one of the OEM flags becomes set in the flags from the hardware, the driver could hang if no OEM handler was set. Fix the code to handle this. This was tested by setting the flags by hand after they were fetched. Signed-off-by: Corey Minyard <minyard@acm.org> Ackde-by: Matt Domsch <Matt_Domsch@dell.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] hvc_console suspend fixAndrew Morton2006-09-161-0/+1
| | | | | | | | Fix http://bugzilla.kernel.org/show_bug.cgi?id=7152 Cc: Michael Tautschnig <tautschn@model.in.tum.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] IPMI: Fix oops on ipmi_msghandler removal for non ipmi systemsArnaud Patard2006-09-161-0/+1
| | | | | | | | | | | | When the ipmi_si module is loaded on a system without any ipmi device, it fails with nodev. It would be fine if all resources were freed. A call to device_unregister() is missing, resulting to a oops when you remove the ipmi_msghandler. Signed-off-by: Arnaud Patard <apatard@mandriva.com> Acked-by: Corey Minyard <minyard@acm.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] IPMI: fix occasional oops on module unloadCorey Minyard2006-09-011-0/+1
| | | | | | | | | | | | | | Olaf Kirch of SuSE tracked down a problem where module unloads of the IPMI driver would occasionally result in Oopses. He tracked that down to a variable that wasn't always initialized properly in some situations. This patch initializes that variable. Olaf sent a patch that kzalloc-ed the data, but this structure is large enough that I would perfer to not do that. Thanks Olaf! Signed-off-by: Corey Minyard <minyard@acm.org> Cc: Olaf Kirch <okir@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] SBC8360: module_param() permission fixesIan E. Morgan2006-09-011-2/+2
| | | | | | | | The last argument of module_param is permissions, not default value. Acked-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] synclink_gt: fix receive tty error handlingPaul Fulghum2006-09-011-7/+7
| | | | | | | | | | | Fix receive tty error handling in synclink_gt driver. Adrian reported compiler warning for incorrect bit test against char variable. I determined these and other device specific error bits were incorrectly defined. Signed-off-by: Paul Fulghum <paulkf@microgate.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] drm: radeon flush TCL VAP for vertex program enable/disableRoland Scheidegger2006-08-301-1/+8
| | | | | | | | The radeon requires a VAP state flush when enabling/disabling vertex programs on the r200 cards. Signed-off-by: Dave Airlie <airlied@linux.ie> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Fix tty layer DoS and comment relevant codeAlan Cox2006-08-271-10/+79
| | | | | | | | | | | | Unlike the other tty comment patch this one has code changes. Specifically it limits the queue size for a tty to 64K characters (128Kbytes) worst case even if the tty is ignoring tty->throttle. This is because certain drivers don't honour the throttle value correctly, although it is a useful safeguard anyway. Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] tty layer comment the locking assumptions and functions somewhatAlan Cox2006-08-272-62/+715
| | | | | | | | | Doesn't fix them but does show up some interesting areas that need review and fixing. Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] vcsa attribute bits -> ioctl(VT_GETHIFONTMASK)Samuel Thibault2006-08-271-0/+2
| | | | | | | | | | | | | | | | When reading /dev/vcsa while a font with more than 256 characters is loaded, one of the attribute bits records the 9th bit of the character. But depending on the console driver (vgacon or fbcon for instance), that's bit 3 or bit 0. And there is no way for userland to know that, thus no way for userland to safely grab the screen content. So here is a (tested) patch: Add a VT_GETHIFONTMASK ioctl for knowing which bit is the 9th bit for VC text (vc_hi_font_mask field of the vc_data structure). Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] char/moxa.c: fix endianess and multiple-card issuesDirk Eibach2006-08-271-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | While testing Moxa C218T/PCI on PowerPC 405EP I found that loading firmware using the linux kernel driver fails because calculation of the checksum is not endianess independent in the original code. After I fixed this I found that uploading firmware in a system with multiple cards causes a kernel oops. I had a look in the recent moxa sources and found that they do some kind of locking there. Applying this lock fixed the problem. Alan sayeth: Checksum changes are clearly correct. Other changes is an improvement but not I think enough to handle malicious firmware attacks. That said such an attacker has CAP_SYS_RAWIO anyway so that part is irrelevant except for neatness. [akpm@osdl.org: cleanups] Signed-off-by: Dirk Eibach <eibach@gdsys.de> Acked-by: Alan Cox <alan@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] tty: remove bogus call to cdev_del()Rolf Eike Beer2006-08-271-1/+0
| | | | | | | | | When cdev_add() failed there is no reason to call cdev_del(). Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [WATCHDOG] Kconfig typos fix.Matt LaPlante2006-08-151-4/+4
| | | | | | | | Three typos in drivers/char/watchdog/Kconfig... Signed-off-by: Matt LaPlante <kernel1@cyberdogtech.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
* Merge branch 'for-linus' of ↵Linus Torvalds2006-08-061-61/+78
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input: (24 commits) Input: ati_remote - use msec instead of jiffies Input: ati_remote - add missing input_sync() Input: ati_remote - relax permissions sysfs module parameters Input: ati_remote - make filter time a module parameter Input: atkbd - restore repeat rate when resuming Input: trackpoint - activate protocol when resuming Input: logips2pp - fix button mapping for MX300 Input: keyboard - change to use kzalloc Input: serio/gameport - check whether driver core calls succeeded Input: spaceball - make 4000FLX Lefty work Input: keyboard - simplify emulate_raw() implementation Input: keyboard - remove static variable and clean up initialization Input: hiddev - use standard list implementation Input: add missing handler->start() call Input: HID - fix potential out-of-bound array access Input: fix list iteration in input_release_device() Input: iforce - add Trust Force Feedback Race Master support Input: iforce - check array bounds before accessing elements Input: libps2 - warn instead of oopsing when passed bad arguments Input: fm801-gp - fix use after free ...
| * Input: keyboard - change to use kzallocDmitry Torokhov2006-08-041-2/+2
| | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ↵Dmitry Torokhov2006-08-0419-135/+232
| |\ | | | | | | | | | into for-linus
| * | Input: keyboard - simplify emulate_raw() implementationDmitry Torokhov2006-07-191-17/+34
| | | | | | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
View Lorry Controller Status