summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [TIPC] Added entry for TIPC in MAINTAINERSPer Liden2006-01-121-0/+13
| | | | Signed-off-by: Per Liden <per.liden@nospam.ericsson.com>
* [TIPC] More updates of file headersPer Liden2006-01-1240-39/+39
| | | | | | | | | Updated copyright notice to include the year the file was actually created. Information about file creation dates was extracted from the files in the old CVS repository at tipc.sourceforge.net. Signed-off-by: Per Liden <per.liden@nospam.ericsson.com>
* [TIPC] Update of file headersPer Liden2006-01-1250-99/+49
| | | | | | | The copyright statements from different parts of Ericsson have been merged into one. Signed-off-by: Per Liden <per.liden@nospam.ericsson.com>
* [TIPC] Cleaned up info/warn/err macrosPer Liden2006-01-124-7/+7
| | | | Signed-off-by: Per Liden <per.liden@nospam.ericsson.com>
* [TIPC] License header updatePer Liden2006-01-1250-876/+1076
| | | | | | | | The license header in each file now more clearly state that this code is licensed under a dual BSD/GPL. Before this was only evident if you looked at the MODULE_LICENSE line in core.c. Signed-off-by: Per Liden <per.liden@nospam.ericsson.com>
* [TIPC] Moved configuration interface into tipc_config.hPer Liden2006-01-125-412/+456
| | | | | | | Restored the old tipc_config.h to get a cleaner division between the interfaces used by normal TIPC users and TIPC administration utilities. Signed-off-by: Per Liden <per.liden@nospam.ericsson.com>
* [TIPC} Fixed bug in disc_timeout()Jon Maloy2006-01-122-27/+5
| | | | Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
* [TIPC] Use dynamically allocated family id with NETLINK_GENERICPer Liden2006-01-122-3/+2
| | | | Signed-off-by: Per Liden <per.liden@nospam.ericsson.com>
* [TIPC] Initial mergePer Liden2006-01-1254-0/+19464
| | | | | | | | TIPC (Transparent Inter Process Communication) is a protocol designed for intra cluster communication. For more information see http://tipc.sourceforge.net Signed-off-by: Per Liden <per.liden@nospam.ericsson.com>
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6Linus Torvalds2006-01-123-2/+62
|\
| * [PATCH] pcmcia: runtime powermanagement interfaceDominik Brodowski2006-01-122-2/+60
| | | | | | | | | | | | | | | | With the "power/state" sysfs interface being deprecated, make another one available which is compatible to what was discussed on the linux PM mailinglist. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| * [PATCH] pcmcia: add new IDs for serial_cs.cDominik Brodowski2006-01-121-0/+2
| | | | | | | | | | | | | | Add IDs for Sierra Aircard 55 CDMA 1xrtt Modem -- a CIS update is required for this card. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
* | Merge branch 'drm-forlinus' of ↵Linus Torvalds2006-01-1273-1812/+2794
|\ \ | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
| * | drm: fix issues with systems with no MTRRDave Airlie2006-01-121-0/+14
| | | | | | | | | | | | | | | | | | | | | On systems with no MTRR we should still define the interface. Original bug from apkm. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: cleanup properly on drm module unloadDave Airlie2006-01-111-6/+6
| | | | | | | | | | | | | | | | | | Cleanup multiple cards properly Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: fixup drm bufs being just under the EOMDave Airlie2006-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | | If the mapping was just under the end of memory it would fail. Lets DRM start on my PCI card. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: fix radeon warnings on 64-bitDave Airlie2006-01-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From: Andrew Morton <akpm@osdl.org> drivers/char/drm/radeon_state.c: In function `radeon_cp_dispatch_texture': drivers/char/drm/radeon_state.c:1653: warning: int format, different type arg (arg 3) drivers/char/drm/radeon_state.c:1661: warning: int format, different type arg (arg 3) drivers/char/drm/radeon_state.c:1689: warning: int format, different type arg (arg 3) sizeof() doesn't return an int. Cc: Dave Airlie <airlied@linux.ie> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: fix warning on alphaDave Airlie2006-01-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From: Andrew Morton <akpm@osdl.org> On alpha: drivers/char/drm/via_dmablit.h:44: error: field `direction' has incomplete type Cc: Dave Airlie <airlied@linux.ie> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: remove is_pci flag completely...Dave Airlie2006-01-031-1/+0
| | | | | | | | | | | | | | | | | | this snuck back in, in the last merge. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: merge in Linus mainlineDave Airlie2006-01-032195-62718/+59347
| |\ \
| * | | drm: major update from CVS for radeon and coreDave Airlie2006-01-0212-381/+366
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch pull in a lot of changes from CVS to the main core DRM, and updates the radeon driver to 1.21.0 that supports r300 texrect and radeon card type ioctl. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: update drm pci ids listDave Airlie2006-01-021-1/+11
| | | | | | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: drm_ioctl.c sync with fixes from CVSDave Airlie2006-01-021-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | Apply the fixes from CVS that were outstanding for this file Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: update lock flags from userspaceDave Airlie2006-01-021-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: update to i915 1.3.0Dave Airlie2006-01-026-39/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for vblank ioctls to i915 driver From: Dave Airlie <airlied@linux.ie> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: update drm_memory_debug.hDave Airlie2006-01-021-135/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update from DRM CVS for drm memory debug From: Jon Smirl <jonsmirl@gmail.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: proper fix for drm_contextDave Airlie2006-01-021-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bad patch in last version Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: fix issue with contexts running out of RAMDave Airlie2006-01-021-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: update PCIGART support from CVSDave Airlie2006-01-028-38/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to work on FreeBSD the gart needed to use a local mapping This patch moves the mainline to the new code and aligns some comment changes From: Eric Anholt <anholt@freebsd.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: remove old reclaim_buffers from ix0 driversDave Airlie2006-01-022-2/+0
| | | | | | | | | | | | | | | | | | | | From: Dave Airlie <airlied@linux.ie> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: bring savage inline with latest CVSDave Airlie2006-01-022-17/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | apply some whitespace cleanup and add wrappers for MTRR for OS calls From: Eric Anholt <anholt@freebsd.org> + Dave Airlie <airlied@linux.ie> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: fix a LOR issue on FreeBSD for savage driverDave Airlie2006-01-022-176/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct a LOR issue on FreeBSD by allocating temporary space and doing a single DRM_COPY_FROM_USER rather than DRM_VERIFYAREA_READ followed by tons of DRM_COPY_FROM_USER_UNCHECKED. I don't like the look of the temporary space allocation, but I like the simplification in the rest of the file. Tested with glxgears, tuxracer, and q3 on a savage4. From: Eric Anholt <anholt@freebsd.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: bring sis + tdfx up to latest CVSDave Airlie2006-01-025-15/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup SIS + TDFX drivers with latest changes from CVS. From: Eric Anholt <anholt@freebsd.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: via driver update to CVS versionDave Airlie2006-01-026-6/+951
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates the DRM via driver to the latest CVS version, which contains support for DMA blitting. It also contains some whitespace and other minor fixes From: Thomas Hellstrom <unichrome@shipmail.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: move ioctl flags to a bit field of flagsDave Airlie2006-01-0211-177/+182
| | | | | | | | | | | | | | | | | | | | | | | | From: Dave Airlie Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: update VIA driver to 2.7.2Dave Airlie2005-11-1212-98/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add PCI DMA blitengine to VIA DRM Add portability code for porting VIA to FreeBSD. Sync via_drm.h with 3d driver From: Thomas Hellstrom <unichrome@shipmail.org>, Eric Anholt <anholt@freebsd.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: drop mtrr from i915Dave Airlie2005-11-111-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alan Hourihane wants to set MTRR in the DDX only as otherwise we get problems with the shared memory chipset. From: Alan Hourihane <alanh@fairlite.demon.co.uk> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: update mga driver for new bootstrap codeDave Airlie2005-11-113-62/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The MGA driver needs to use the full AGP interface. From: Ian Romanick <idr@us.ibm.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: remove exports that modules shouldn't use.Dave Airlie2005-11-111-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | Modules should go via the new drm_agp_ functions. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: add in-kernel entry points for rest of AGP ioctlsDave Airlie2005-11-114-52/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow DRM modules to call AGP internally in the kernel. From: Ian Romanick <idr@us.ibm.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: simplify sysfs code for drmDave Airlie2005-11-116-52/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This simplifies the sysfs code for the drm and add a dri_library_name attribute which can be used by a userspace app to figure out which library to load. From: Jon Smirl <jonsmirl@gmail.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: fixup drm_proc.c struct tableDave Airlie2005-11-111-9/+7
| | | | | | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: remove old backwards compatibilty stuffDave Airlie2005-11-111-14/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: remove drm_flushDave Airlie2005-11-114-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | drm_flush is no longer needed remove. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: cleanup via_ds.c includesDave Airlie2005-11-111-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | Remove the linux includes from via_ds.c Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: remove remnamt of old DRM code from tdfxDave Airlie2005-11-111-4/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: remove drm_init.c it is no longer neededDave Airlie2005-11-104-55/+18
| | | | | | | | | | | | | | | | | | | | | | | | Move drm_cpu_valid into drm_fops.c Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: rename driver hooks more understandablyDave Airlie2005-11-1030-484/+330
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the driver hooks in the DRM to something a little more understandable: preinit -> load postinit -> (removed) presetup -> firstopen postsetup -> (removed) open_helper -> open prerelease -> preclose free_filp_priv -> postclose pretakedown -> lastclose postcleanup -> unload release -> reclaim_buffers_locked version -> (removed) postinit and version were replaced with generic code in the Linux DRM (drivers now set their version numbers and description in the driver structure, like on BSD). postsetup wasn't used at all. Fixes the savage hooks for initializing and tearing down mappings at the right times. Testing involved at least starting X, running glxgears, killing glxgears, exiting X, and repeating. Tested on: FreeBSD (g200, g400, r200, r128) Linux (r200, savage4) From: Eric Anholt <anholt@freebsd.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
* | | | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2006-01-1237-135/+6114
|\ \ \ \
| * | | | [ARM] Convert some arm semaphores to mutexesArjan van de Ven2006-01-129-58/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The arm clock semaphores are strict mutexes, convert them to the new mutex implementation Signed-off-by: Arjan van de Ven <arjan@infradead.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-19 23:53:18 +0100