aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
Commit message (Collapse)AuthorAge
* Merge linux-2.6 into linux-acpi-2.6 testLen Brown2005-09-03
|\
| * Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-serial Linus Torvalds2005-09-02
| |\
| | * [SERIAL] mwave is no longer brokenRussell King2005-09-01
| | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * [SERIAL] Convert mwave to use serial8250_(un)?register_portAlan Cox2005-08-31
| | | | | | | | | | | | | | | Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * [ARM] 2866/1: add i.MX set_mctrl / get_mctrl functionsSascha Hauer2005-08-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Sascha Hauer This patch adds support for setting and getting RTS / CTS via set_mtctrl / get_mctrl functions. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | Auto-update from upstreamTony Luck2005-08-31
| |\|
| | * Merge refs/heads/drm-latest from ↵Linus Torvalds2005-08-30
| | |\ | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
| | | * drm: fix a bad VERSION check.Dave Airlie2005-08-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I found why my G5 was crashing when using the linux-2.6 version of the DRM + git-drm.patch from 2.6.13-rc6-mm1, but not with the CVS DRM. The reason was that dev->agp->cant_use_aperture wasn't getting set, and the reason for that was that <linux/version.h> no longer gets included and the #if LINUX_VERSION_CODE < 0x020408 in drm_agpsupport.c was going the wrong way. With this patch (and a few others) a 32-bit server works correctly, as does DRI. From: Paul Mackerras <paulus@samba.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| | | * drm: fixes for powerpcDave Airlie2005-08-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove a bogus check on whether an area is memory (we need a better interface) also change pgprot flags for powerpc don't check on x86-64 either From: Paul Mackerras <paulus@samba.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| | | * drm: add new texture upload code from r300 projectDave Airlie2005-08-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Paul Mackerras did some new upload code for r300, I forgot to add it to the kernel with r300 merge. Signed-off-by: Dave Airlie <airlied@linux.ie>
| | | * drm: update pci ids for savage and viaDave Airlie2005-08-16
| | | | | | | | | | | | | | | | | | | | | | | | Fixup savage and via pci ids From: Dave Airlie <airlied@linux.ie>
| | | * drm: add initial r300 3D support.Dave Airlie2005-08-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds initial r300 3D support to the radeon DRM. From: Nicolai Haehnle, Vladimir Dergachev, and others. Signed-off-by: David Airlie <airlied@linux.ie>
| | | * drm: add savage driverDave Airlie2005-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add driver for savage chipsets. From: Felix Kuehling Signed-off-by: Dave Airlie <airlied@linux.ie>
| | | * drm: remove version.h and any version checks..Dave Airlie2005-08-07
| | | | | | | | | | | | | | | | | | | | | | | | This patch removes all the drm kernel conditionals from the kernel DRM tree. Signed-off-by: Dave Airlie <airlied@linux.ie>
| | | * drm: fix warning in drm_pci.cDave Airlie2005-08-05
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Dave Airlie <airlied@linux.ie>
| | | * drm: remove the gamma driverDave Airlie2005-08-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The gamma driver has been broken for quite a while, it doesn't build, we don't have a userspace, mine is in Ireland etc... Signed-off-by: Dave Airlie <airlied@linux.ie>
| | | * drm: switch drm_handle_t to unsigned intDave Airlie2005-08-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This converts the drm_handle_t to unsigned int. This is currently safe to do as we don't pass these across the kernel/user boundary, but userspace does use these, but no-one builds userspace against the kernel headers at present so it is okay to switch over the kernel copy of drm.h at this point. (The CVS tree will switch over soon in sync with some Mesa changes) From: Egbert Eich <eich@suse.de> Signed-off-by: Dave Airlie <airlied@linux.ie>
| | | * drm: updated DRM map patch for 32/64 bit systemsDave Airlie2005-08-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I basically combined Paul's patches with additions that I had made for PCI scatter gather. I also tried more carefully to avoid problems with the same token assigned multiple times while trying to use the base address in the token if possible to gain as much backward compatibility as possible for broken DRI clients. From: Paul Mackerras <paulus@samba.org> and Egbert Eich <eich@suse.de> Signed-off-by: Dave Airlie <airlied@linux.ie>
| | | * drm: copy the right data back to userspace for getreserved contexts ioctlDave Airlie2005-08-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the information copied back to userspace by the get reserved contexts ioctl. From: Egbert Eich <eich@suse.de> Signed-off-by: Dave Airlie <airlied@linux.ie>
| | | * drm: fix ioctl direction in r128 getparamDave Airlie2005-08-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the IOWR correctly for r128 getparam. From: Egbert Eich <eich@suse.de> Signed-off-by: Dave Airlie <airlied@linux.ie>
| | | * Merge ../linux-2.6/Dave Airlie2005-07-30
| | | |\
| | | * | drm: cleanup buffer/map codeDave Airlie2005-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a patch from DRM CVS that cleans up some code that was in CVS that I never moved to the kernel, this patch produces the result of the cleanups and puts it into the kernel drm. From: Eric Anholt <anholt@freebsd.org>, Jon Smirl, Dave Airlie Signed-off-by: Dave Airlie <airlied@linux.ie>
| | | * | drm: add mga driver callbacksDave Airlie2005-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some missing driver callback for the PCI support Signed-off-by: Dave Airlie <airlied@linux.ie>
| | | * | Add support for PCI MGA cards to MGA DRM.Dave Airlie2005-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds serveral new ioctls and a new query to get_param query to support PCI MGA cards. Two ioctls were added to implement interrupt based waiting. With this change, the client-side driver no longer needs to map the primary DMA region or the MMIO region. Previously, end-of-frame waiting was done by busy waiting in the client-side driver until one of the MMIO registers (the current DMA pointer) matched a pointer to the end of primary DMA space. By using interrupts, the busy waiting and the extra mappings are removed. A third ioctl was added to bootstrap DMA. This ioctl, which is used by the X-server, moves a *LOT* of code from the X-server into the kernel. This allows the kernel to do whatever needs to be done to setup DMA buffers. The entire process and the locations of the buffers are hidden from user-mode. Additionally, a get_param query was added to differentiate between G4x0 cards and G550 cards. A gap was left in the numbering sequence so that, if needed, G450 cards could be distinguished from G400 cards. According to Ville Syrjälä, the G4x0 cards and the G550 cards handle anisotropic filtering differently. This seems the most compatible way to let the client-side driver know which card it's own. Doing this very small change now eliminates the need to bump the DRM minor version twice. http://marc.theaimsgroup.com/?l=dri-devel&m=106625815319773&w=2 (airlied - this may not work at this point, I think the follow on buffer cleanup patches will be needed) From: Ian Romanick <idr@us.ibm.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| | | * | drm: make drm_alloc_agp take a dev arg.Dave Airlie2005-07-10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| | | * | drm: add new mga ids and typesDave Airlie2005-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | From: Ian Romanick <idr@us.ibm.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| | | * | drm: add test for AGP devices and driver override for it.Dave Airlie2005-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added device_is_agp callback to drm_driver. This function is called by the platform-specific drm_device_is_agp function. Added implementation of this function the the Linux-specific portion of the MGA driver to detect PCI G450 cards. Added code to the Linux-specific portion of the generic DRM layer to not initialize AGP infrastructure if the card is not AGP (this matches what already existed in BSD). Fix up i810/i830 and i915 drivers to always return AGP as they don't always report the capability. Fix the MGA to not report AGP for a card that has an AGP chip behind a PCI bridge. From: Ian Romanick, Dave Airlie, Alan Hourihane Signed-off-by: Dave Airlie <airlied@linux.ie>
| | | * | drm: destatic exported function.Dave Airlie2005-07-10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| | | * | drm: export symbols for use by driversDave Airlie2005-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This just exports symbols for use in drivers. From: Ian Romanick <idr@us.ibm.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| | | * | drm: fix minor function header issueDave Airlie2005-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | From: Ian Romanick <idr@us.ibm.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| | | * | drm: update some function so a driver can call themDave Airlie2005-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch splits some ioctl functions so that they can be called in-kernel by a DRM driver. The driver will use them later. From: Ian Romanick <idr@us.ibm.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| | | * | drm: update support for drm pci buffersDave Airlie2005-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DRM needs to change the drm_pci interface for FreeBSD compatiblity, this patch introduces the drm_dma_handle_t and uses it in the Linux code. From: Tonnerre Lombard, Eric Anholt, and Sergey Vlasov Signed-off-by: David Airlie <airlied@linux.ie>
| | | * | Refactor common, boilerplate ioctl code from drm_addbufs_* functions intoDave Airlie2005-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drm_addbufs. This makes the code more like the BSD code, and makes the drm_addbufs_* functions callable in-kernel. From: Ian Romanick <idr@us.ibm.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| | | * | drm: add framebuffer mapsDave Airlie2005-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch makes drmAddBufs/drmMapBufs can handle buffers in video memory The attached patch adds a new buffer type DRM_FB_BUFFER. It works like AGP memory but uses video memory. From: Austin Yuan <austinyuan@viatech.com.cn> Signed-off-by: Dave Airlie <airlied@linux.ie>
| | | * | drm: add _DRM_CONSISTENT map typeDave Airlie2005-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a new DRM map type _DRM_CONSISTENT for consistent PCI memory. It uses drm_pci_alloc/free for allocating/freeing the memory. From: Felix Kuhling <fxkuehl@gmx.de> Signed-off-by: David Airlie <airlied@linux.ie>
| * | | | Auto-update from upstreamTony Luck2005-08-30
| |\| | |
| | * | | Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6 Linus Torvalds2005-08-30
| | |\ \ \
| | | * | | [PATCH] Make MODULE_DEVICE_TABLE work for vio devicesStephen Rothwell2005-08-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make MODULE_DEVICE_TABLE work for vio devices. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| | * | | | [RANDOM]: Introduce secure_dccp_sequence_numberArnaldo Carvalho de Melo2005-08-29
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code contributed by Stephen Hemminger. Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | Pull unaligned-snsc_event into release branchTony Luck2005-08-29
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [IA64-SGI] fix unaligned memory access in snsc_event.cGreg Howard2005-08-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's been pointed out that environmental events from the system controllers on Altix machines cause the kernel to complain about unaligned memory accesses. This turns out to be because "be32_to_cpup()" didn't do everything I thought/hoped it did. I've added calls to pull the offending integers out of the buffers using get_unaligned() before feeding them to be32_to_cpup(). Signed-off-by: Greg Howard <ghoward@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
* | | | | [ACPI] check acpi_disabled in IPMIYann Droneaud2005-08-31
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Yann Droneaud <ydroneaud@mandriva.com> Signed-off-by: Len Brown <len.brown@intel.com>
* | | | | Auto-update from upstreamLen Brown2005-08-29
|\| | | |
| * | | | [PATCH] Remove race between con_open and con_closePaul Mackerras2005-08-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ Same race and same patch also by Steven Rostedt <rostedt@goodmis.org> ] I have a laptop (G3 powerbook) which will pretty reliably hit a race between con_open and con_close late in the boot process and oops in vt_ioctl due to tty->driver_data being NULL. What happens is this: process A opens /dev/tty6; it comes into con_open() (drivers/char/vt.c) and assign a non-NULL value to tty->driver_data. Then process A closes that and concurrently process B opens /dev/tty6. Process A gets through con_close() and clears tty->driver_data, since tty->count == 1. However, before process A can decrement tty->count, we switch to process B (e.g. at the down(&tty_sem) call at drivers/char/tty_io.c line 1626). So process B gets to run and comes into con_open with tty->count == 2, as tty->count is incremented (in init_dev) before con_open is called. Because tty->count != 1, we don't set tty->driver_data. Then when the process tries to do anything with that fd, it oopses. The simple and effective fix for this is to test tty->driver_data rather than tty->count in con_open. The testing and setting of tty->driver_data is serialized with respect to the clearing of tty->driver_data in con_close by the console_sem. We can't get a situation where con_open sees tty->driver_data != NULL and then con_close on a different fd clears tty->driver_data, because tty->count is incremented before con_open is called. Thus this patch eliminates the race, and in fact with this patch my laptop doesn't oops. Signed-off-by: Paul Mackerras <paulus@samba.org> [ Same patch Signed-off-by: Steven Rostedt <rostedt@goodmis.org> in http://marc.theaimsgroup.com/?l=linux-kernel&m=112450820432121&w=2 ] Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | | | Merge HEAD from ../from-linus Len Brown2005-08-25
|\| | | |
| * | | | [PATCH] Kconfig fix (sparc32 drivers/char dependencies)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since sparc32 Kconfig includes drivers/char/Kconfig (instead of duplicating its parts) we need several new dependencies there to exclude the stuff broken on sparc32 and not excluded by existing dependencies. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | | [PATCH] Kconfig fix (m32r genrtc)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | genrtc is not for m32r; marked as such. Probably ought to put that into arch/* - list of "don't build it on <platform>" is getting too long. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | | [PATCH] Kconfig fix (epca on 64bit)Al Viro2005-08-23
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | epca is broken on 64bit; marked as such Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | | [ACPI] delete CONFIG_ACPI_BUSLen Brown2005-08-24
| | | | | | | | | | | | | | | | | | | | | | | | it is a synonym for CONFIG_ACPI Signed-off-by: Len Brown <len.brown@intel.com>
* | | | [ACPI] delete CONFIG_ACPI_INTERPRETERLen Brown2005-08-24
| | | | | | | | | | | | | | | | | | | | | | | | it is a synonym for CONFIG_ACPI Signed-off-by: Len Brown <len.brown@intel.com>