linux-stable

mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-12 13:55:32 +00:00

History

Linus Torvalds 9f3938346a Merge branch 'kmap_atomic' of git://github.com/congwang/linux Pull kmap_atomic cleanup from Cong Wang. It's been in -next for a long time, and it gets rid of the (no longer used) second argument to k[un]map_atomic(). Fix up a few trivial conflicts in various drivers, and do an "evil merge" to catch some new uses that have come in since Cong's tree. * 'kmap_atomic' of git://github.com/congwang/linux: (59 commits) feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal highmem: kill all __kmap_atomic() [swarren@nvidia.com: highmem: Fix ARM build break due to __kmap_atomic rename] drbd: remove the second argument of k[un]map_atomic() zcache: remove the second argument of k[un]map_atomic() gma500: remove the second argument of k[un]map_atomic() dm: remove the second argument of k[un]map_atomic() tomoyo: remove the second argument of k[un]map_atomic() sunrpc: remove the second argument of k[un]map_atomic() rds: remove the second argument of k[un]map_atomic() net: remove the second argument of k[un]map_atomic() mm: remove the second argument of k[un]map_atomic() lib: remove the second argument of k[un]map_atomic() power: remove the second argument of k[un]map_atomic() kdb: remove the second argument of k[un]map_atomic() udf: remove the second argument of k[un]map_atomic() ubifs: remove the second argument of k[un]map_atomic() squashfs: remove the second argument of k[un]map_atomic() reiserfs: remove the second argument of k[un]map_atomic() ocfs2: remove the second argument of k[un]map_atomic() ntfs: remove the second argument of k[un]map_atomic() ...		2012-03-21 09:40:26 -07:00
..
exynos	drm exynos: use drm_fb_helper_set_par directly	2012-03-15 11:39:00 +09:00
gma500	Merge branch 'kmap_atomic' of git://github.com/congwang/linux	2012-03-21 09:40:26 -07:00
i2c
i810	Revert "drm/i810: cleanup reclaim_buffers"	2012-01-30 09:31:25 +00:00
i915	drm/i915: support 32 bit BGR formats in sprite planes	2012-03-07 10:52:13 -08:00
mga
nouveau	drm/nv50/pm: signedness bug in nv50_pm_clocks_pre()	2012-02-01 15:27:43 +10:00
r128
radeon	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-03-20 21:12:50 -07:00
savage
sis	gpu, drm, sis: Don't return uninitialized variable from sis_driver_load()	2012-01-23 11:00:47 +00:00
tdfx
ttm	drm: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:17 +08:00
via	drm/sis\|via: don't return stack garbage from free_mem ioctl	2012-01-09 12:11:39 +00:00
vmwgfx	Merge branch 'kmap_atomic' of git://github.com/congwang/linux	2012-03-21 09:40:26 -07:00
ati_pcigart.c
drm_agpsupport.c
drm_auth.c	drm: Fix authentication kernel crash	2012-01-25 09:27:45 +00:00
drm_buffer.c
drm_bufs.c
drm_cache.c	drm: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:17 +08:00
drm_context.c	drm: make DRM_UNLOCKED ioctls with their own mutex	2012-01-05 14:43:02 +00:00
drm_crtc.c	drm: add support for private planes	2012-01-05 10:00:16 +00:00
drm_crtc_helper.c	drm: Add drm_format_num_planes() utility function	2011-12-20 20:34:32 +00:00
drm_debugfs.c
drm_dma.c
drm_dp_i2c_helper.c
drm_drv.c	drm: make DRM_UNLOCKED ioctls with their own mutex	2012-01-05 14:43:02 +00:00
drm_edid.c
drm_edid_modes.h
drm_encoder_slave.c
drm_fb_helper.c
drm_fops.c	drm: Fix authentication kernel crash	2012-01-25 09:27:45 +00:00
drm_gem.c	drm: Pass the real error code back during GEM bo initialisation	2012-01-30 09:31:42 +00:00
drm_global.c
drm_hashtab.c
drm_info.c
drm_ioc32.c	drivers/gpu/drm/drm_ioc32.c: initialize all fields	2012-02-03 09:47:32 +00:00
drm_ioctl.c	drm: make DRM_UNLOCKED ioctls with their own mutex	2012-01-05 14:43:02 +00:00
drm_irq.c
drm_lock.c	drm: add missing exports for i810 driver.	2011-12-22 19:09:01 +00:00
drm_memory.c
drm_mm.c
drm_modes.c
drm_pci.c
drm_platform.c
drm_proc.c
drm_scatter.c
drm_stub.c
drm_sysfs.c	switch device_get_devnode() and ->devnode() to umode_t *	2012-01-03 22:54:55 -05:00
drm_trace.h
drm_trace_points.c
drm_usb.c
drm_vm.c
Kconfig	Merge tag 'v3.2-rc6' of /home/airlied/devel/kernel/linux-2.6 into drm-core-next	2011-12-20 14:43:53 +00:00
Makefile	drm: kill drm_sman	2011-12-22 00:33:23 +01:00
README.drm

README.drm

************************************************************
* For the very latest on DRI development, please see:      *
*     http://dri.freedesktop.org/                          *
************************************************************

The Direct Rendering Manager (drm) is a device-independent kernel-level
device driver that provides support for the XFree86 Direct Rendering
Infrastructure (DRI).

The DRM supports the Direct Rendering Infrastructure (DRI) in four major
ways:

    1. The DRM provides synchronized access to the graphics hardware via
       the use of an optimized two-tiered lock.

    2. The DRM enforces the DRI security policy for access to the graphics
       hardware by only allowing authenticated X11 clients access to
       restricted regions of memory.

    3. The DRM provides a generic DMA engine, complete with multiple
       queues and the ability to detect the need for an OpenGL context
       switch.

    4. The DRM is extensible via the use of small device-specific modules
       that rely extensively on the API exported by the DRM module.


Documentation on the DRI is available from:
    http://dri.freedesktop.org/wiki/Documentation
    http://sourceforge.net/project/showfiles.php?group_id=387
    http://dri.sourceforge.net/doc/

For specific information about kernel-level support, see:

    The Direct Rendering Manager, Kernel Support for the Direct Rendering
    Infrastructure
    http://dri.sourceforge.net/doc/drm_low_level.html

    Hardware Locking for the Direct Rendering Infrastructure
    http://dri.sourceforge.net/doc/hardware_locking_low_level.html

    A Security Analysis of the Direct Rendering Infrastructure
    http://dri.sourceforge.net/doc/security_low_level.html