summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'drm-patches' of ↵Linus Torvalds2007-05-0720-196/+349
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/i915: Add 965GM pci id update drm: just use io_remap_pfn_range on all archs.. drm: fix DRM_CONSISTENT mapping drm: fix up mmap locking in preparation for ttm changes drm: fix driver deadlock with AIGLX and reclaim_buffers_locked drm: fix warning in drm_fops.c drm: allow for more generic drm ioctls drm: fix alpha domain handling via: fix CX700 pci id drm: make drm_io_prot static. drm: remove via_mm.h drm: add missing NULL assignment drm/radeon: Fix u32 overflows when determining AGP base address in card space. drm: port over use_vmalloc code from git hashtab drm: fix crash with fops lock and fixup sarea/page size locking drm: bring bufs code from git tree. drm: move protection stuff into separate function drm: Use ARRAY_SIZE macro when appropriate drm: update README.drm (bugzilla #7933) drm: remove unused exports
| * drm/i915: Add 965GM pci id updateWang Zhenyu2007-04-252-1/+3
| | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: just use io_remap_pfn_range on all archs..Dave Airlie2007-03-241-6/+1
| | | | | | | | | | | | Move the sparc64 ifdef around to clean this up. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: fix DRM_CONSISTENT mappingHugh Dickins2007-03-241-5/+9
| | | | | | | | | | | | This patch got lost in the DRM git tree for ages, bring it back to life. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: fix up mmap locking in preparation for ttm changesThomas Hellstrom2007-03-241-9/+26
| | | | | | | | | | | | | | This change is needed to protect againt disappearing maps which aren't common. The map lists are protected using sturct_mutex but drm_mmap never locked it. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: fix driver deadlock with AIGLX and reclaim_buffers_lockedThomas Hellstrom2007-03-237-81/+174
| | | | | | | | | | | | | | | | | | | | | | | | Bugzilla Bug #9457 Add refcounting of user waiters to the DRM hardware lock, so that we can use DRM_LOCK_CONT flag more conservatively. Also add a kernel waiter refcount that if nonzero transfers the lock for the kernel context when it is released. This is useful when waiting for idle and can be used for very simple fence object driver implementations for the new memory manager Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: fix warning in drm_fops.cAndrew Morton2007-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | drivers/char/drm/drm_fops.c: In function 'drm_setup': drivers/char/drm/drm_fops.c:60: warning: comparison of distinct pointer types lacks a cast Unfortunately PAGE_SIZE has different types on different architectures. Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: allow for more generic drm ioctlsThomas Hellstrom2007-03-182-4/+9
| | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: fix alpha domain handlingJay Estabrook2007-03-111-1/+1
| | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * via: fix CX700 pci idThomas Hellstrom2007-03-111-1/+1
| | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: make drm_io_prot static.Adrian Bunk2007-03-111-1/+1
| | | | | | | | | | | | | | This patch makes the needlessly global drm_io_prot() static. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: remove via_mm.hRobert P. J. Day2007-03-111-40/+0
| | | | | | | | | | | | | | Delete apparently unused header file drivers/char/drm/via_mm.h. Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: add missing NULL assignmentDave Airlie2007-03-111-0/+1
| | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm/radeon: Fix u32 overflows when determining AGP base address in card space.Michel Dänzer2007-03-111-4/+4
| | | | | | | | | | | | | | | | | | The overflows could lead to the AGP aperture overlapping the framebuffer are in the card's address space when the latter is located at the very end of th 32 bit address space, which would result in a freeze on X server startup, probably because the card read commands from the framebuffer instead of from AGP. See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=392915 . Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: port over use_vmalloc code from git hashtabDave Airlie2007-03-112-2/+15
| | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: fix crash with fops lock and fixup sarea/page size lockingDave Airlie2007-03-111-2/+4
| | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: bring bufs code from git tree.Dave Airlie2007-03-112-10/+67
| | | | | | | | | | | | | | This checks the AGP mappings are in a valid place and also fixes the size check in the vm.. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: move protection stuff into separate functionDave Airlie2007-03-111-18/+26
| | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: Use ARRAY_SIZE macro when appropriateAhmed S. Darwish2007-03-111-1/+1
| | | | | | | | | | | | | | | | Use ARRAY_SIZE macro already defined in kernel.h Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: update README.drm (bugzilla #7933)Randy Dunlap2007-03-111-9/+7
| | | | | | | | | | | | | | | | Update URLs in drivers/char/drm/README.drm, to take care of kernel bugzilla Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: remove unused exportsAdrian Bunk2007-03-111-2/+0
| | | | | | | | | | | | | | | | This patch removes two unused exports. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2007-05-0716-23/+804
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [NET]: rfkill: add support for input key to control wireless radio [NET] net/core: Fix error handling [TG3]: Update version and reldate. [TG3]: Eliminate spurious interrupts. [TG3]: Add ASPM workaround. [Bluetooth] Correct SCO buffer for another Broadcom based dongle [Bluetooth] Add support for Targus ACB10US USB dongle [Bluetooth] Disconnect L2CAP connection after last RFCOMM DLC [Bluetooth] Check that device is in rfcomm_dev_list before deleting [Bluetooth] Use in-kernel sockets API [Bluetooth] Attach host adapters to the Bluetooth bus [Bluetooth] Fix L2CAP and HCI setsockopt() information leaks
| * | [NET]: rfkill: add support for input key to control wireless radioIvo van Doorn2007-05-077-0/+703
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RF kill patch that provides infrastructure for implementing switches controlling radio states on various network and other cards. [dtor@insightbb.com: address review comments] [akpm@linux-foundation.org: cleanups, build fixes] Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [NET] net/core: Fix error handlingJosef 'Jeff' Sipek2007-05-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Upon failure to register "ptype" procfs entry, "softnet_stat" was not removed, and an incorrect attempt was made to remove the "ptype" entry. Signed-off-by: Josef 'Jeff' Sipek <jsipek@cs.sunysb.edu> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6David S. Miller2007-05-076-17/+53
| |\ \
| | * | [Bluetooth] Correct SCO buffer for another Broadcom based dongleMarcel Holtmann2007-05-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SCO buffer size values for Bluetooth chips from Broadcom are wrong and the USB Bluetooth driver has to set a quirk to correct these SCO buffer size values. Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
| | * | [Bluetooth] Add support for Targus ACB10US USB dongleMarcel Holtmann2007-05-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the vendor and product id of the Targus ACB10US dongle and sets a flag to send HCI_Reset as the first command. Signed-off-by: Marcel Holtmann <marcel@holtmann.org
| | * | [Bluetooth] Disconnect L2CAP connection after last RFCOMM DLCMarcel Holtmann2007-05-051-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RFCOMM specification says that the device closing the last DLC on a particular session is responsible for closing the multiplexer by closing the corresponding L2CAP channel. Signed-off-by: Ville Tervo <ville.tervo@nokia.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
| | * | [Bluetooth] Check that device is in rfcomm_dev_list before deletingMarcel Holtmann2007-05-051-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If RFCOMM_RELEASE_ONHUP flag is on and rfcomm_release_dev is called before connection is closed, rfcomm_dev is deleted twice from the rfcomm_dev_list and refcount is messed up. This patch adds a check before deleting device that the device actually is listed. Signed-off-by: Ville Tervo <ville.tervo@nokia.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
| | * | [Bluetooth] Use in-kernel sockets APIMarcel Holtmann2007-05-051-13/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The kernel provides a new convenient way to access the sockets API for in-kernel users. It is a good idea to actually use it. Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
| | * | [Bluetooth] Attach host adapters to the Bluetooth busMarcel Holtmann2007-05-051-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Bluetooth host adapters are attached to the Bluetooth class and the low-level connections are children of these class devices. Having class devices as parent of bus devices breaks a lot of reasonable assumptions about sysfs. The host adapters should be attached to the Bluetooth bus to simplify the dependency resolving. For compatibility an additional symlink from the Bluetooth class will be used. Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
| | * | [Bluetooth] Fix L2CAP and HCI setsockopt() information leaksMarcel Holtmann2007-05-052-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The L2CAP and HCI setsockopt() implementations have a small information leak that makes it possible to leak kernel stack memory to userspace. If the optlen parameter is 0, no data will be copied by copy_from_user(), but the uninitialized stack buffer will be read and stored later. A call to getsockopt() can now retrieve the leaked information. To fix this problem the stack buffer given to copy_from_user() must be initialized with the current settings. Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
| * | | [TG3]: Update version and reldate.Michael Chan2007-05-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update version to 3.76. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [TG3]: Eliminate spurious interrupts.Michael Chan2007-05-071-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spurious interrupts are often encountered especially on systems using the 8259 PIC mode. This is because the I/O write to deassert the interrupt is posted and won't get to the chip immediately. As a result, the IRQ may remain asserted after the IRQ handler exits, causing spurious interrupts. Flush the interrupt mailbox in non-MSI handlers to de-assert the IRQ immediately. This seems to be the most straight forward approach after discussion with Jeff Garzik and David Miller. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [TG3]: Add ASPM workaround.Matt Carlson2007-05-072-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds workaround to fix performance problems caused by slow PCIE L1->L0 transitions on ICH8 platforms. Changed all magic numbers to constants as suggested by Jeff Garzik. Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2007-05-0717-81/+1365
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SERIAL] sunsu: Fix section mismatch warnings. [SPARC64]: pgtable_cache_init() should be __init. [SPARC64]: Fix section mismatch warnings in arch/sparc64/kernel/prom.c [SPARC64]: Fix section mismatch warnings in arch/sparc64/kernel/pci.c [SPARC64]: Fix section mismatch warnings in arch/sparc64/kernel/console.c [MM]: sparse_init() should be __init. [SPARC64]: Update defconfig. [VIDEO]: Add Sun XVR-2500 framebuffer driver. [VIDEO]: Add Sun XVR-500 framebuffer driver. [SPARC64]: SUN4U PCI-E controller support. [SPARC]: Fix comment typo in smp4m_blackbox_current(). [SCSI] SUNESP: sun_esp.c needs linux/delay.h Fix up conflict in arch/sparc64/mm/init.c manually due to removal of pgtable_cache_init() through the -mm patches (even though that patch was also by David ;) Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| * | | | [SERIAL] sunsu: Fix section mismatch warnings.David S. Miller2007-05-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mark sunsu_console_setup() as __init and rename 'sunsu_cons' to 'sunsu_console' so that it matches modpost.c's whitelist. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [SPARC64]: pgtable_cache_init() should be __init.David S. Miller2007-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [SPARC64]: Fix section mismatch warnings in arch/sparc64/kernel/prom.cDavid S. Miller2007-05-071-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The IRQ translation init routines should all be __init. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [SPARC64]: Fix section mismatch warnings in arch/sparc64/kernel/pci.cDavid S. Miller2007-05-071-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apb_calc_first_last(), apb_fake_ranges(), pci_of_scan_bus(), of_scan_pci_bridge(), pci_of_scan_bus(), and pci_scan_one_pbm() should all be __devinit. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [SPARC64]: Fix section mismatch warnings in arch/sparc64/kernel/console.cDavid S. Miller2007-05-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | probe_other_fhcs() and central_probe() should be __init Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [MM]: sparse_init() should be __init.David S. Miller2007-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [SPARC64]: Update defconfig.David S. Miller2007-05-071-25/+46
| | | | | | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [VIDEO]: Add Sun XVR-2500 framebuffer driver.David S. Miller2007-05-073-0/+291
| | | | | | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [VIDEO]: Add Sun XVR-500 framebuffer driver.David S. Miller2007-05-073-0/+457
| | | | | | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [SPARC64]: SUN4U PCI-E controller support.David S. Miller2007-05-077-22/+535
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some minor refactoring in the generic code was necessary for this: 1) This controller requires 8-byte access to the interrupt map and clear register. They are 64-bits on all the other SBUS and PCI controllers anyways, so this was easy to cure. 2) The IMAP register has a different layout and some bits that we need to preserve, so use a read/modify/write when making changes to the IMAP register in generic code. 3) Flushing the entire IOMMU TLB is best done with a single write to a register on this PCI controller, add a iommu->iommu_flushinv for this. Still lacks MSI support, that will come later. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [SPARC]: Fix comment typo in smp4m_blackbox_current().David S. Miller2007-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [SCSI] SUNESP: sun_esp.c needs linux/delay.hDavid S. Miller2007-05-071-0/+1
| |/ / / | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | | | Merge branch 'for-linus' of ↵Linus Torvalds2007-05-0740-239/+508
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: IPoIB: Convert to NAPI IB: Return "maybe missed event" hint from ib_req_notify_cq() IB: Add CQ comp_vector support IB/ipath: Fix a race condition when generating ACKs IB/ipath: Fix two more spin lock problems IB/fmr_pool: Add prefix to all printks IB/srp: Set proc_name IB/srp: Add orig_dgid sysfs attribute to scsi_host IPoIB/cm: Don't crash if remote side uses one QP for both directions RDMA/cxgb3: Support for new abort logic RDMA/cxgb3: Initialize cpu_idx field in cpl_close_listserv_req message RDMA/cxgb3: Fail qp creation if the requested max_inline is too large RDMA/cxgb3: Fix TERM codes IPoIB/cm: Fix error handling in ipoib_cm_dev_open() IB/ipath: Don't corrupt pending mmap list when unmapped objects are freed IB/mthca: Work around kernel QP starvation IB/ipath: Don't put QP in timeout queue if waiting to send IB/ipath: Don't call spin_lock_irq() from interrupt context
| * | | | IPoIB: Convert to NAPIRoland Dreier2007-05-074-20/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert the IP-over-InfiniBand network device driver over to using NAPI to handle completions for the main CQ. This covers all receives as well as datagram mode sends; send completions for connected mode connections are still handled from interrupt context. Signed-off-by: Roland Dreier <rolandd@cisco.com>