linux/drivers/gpu/drm
Daniel Vetter 967ad7f148 Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next
The conflict in intel_drv.h tripped me up a bit since a patch in dinq
moves all the functions around, but another one in drm-next removes a
single function. So I'ev figured backing this into a backmerge would
be good.

i915_dma.c is just adjacent lines changed, nothing nefarious there.

Conflicts:
	drivers/gpu/drm/i915/i915_dma.c
	drivers/gpu/drm/i915/intel_drv.h

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-10-10 12:44:43 +02:00
..
ast drm: kill ->gem_init_object() and friends 2013-10-09 14:38:02 +10:00
cirrus drm: kill ->gem_init_object() and friends 2013-10-09 14:38:02 +10:00
exynos drm: Make irq_enabled bool 2013-10-09 15:55:32 +10:00
gma500 drm: Remove pci_vendor and pci_device from struct drm_device 2013-10-09 15:55:33 +10:00
i2c drm/i2c: tda998x: fix audio muting 2013-09-24 09:41:18 -07:00
i810 drm: Kill drm perf counter leftovers 2013-10-09 15:55:33 +10:00
i915 Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next 2013-10-10 12:44:43 +02:00
mga drm: Kill drm perf counter leftovers 2013-10-09 15:55:33 +10:00
mgag200 drm: kill ->gem_init_object() and friends 2013-10-09 14:38:02 +10:00
msm drm/msm: use drm_gem_dumb_destroy helper 2013-09-28 10:14:06 -04:00
nouveau Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next 2013-10-10 12:44:43 +02:00
omapdrm drm: Make irq_enabled bool 2013-10-09 15:55:32 +10:00
qxl drm: kill ->gem_init_object() and friends 2013-10-09 14:38:02 +10:00
r128
radeon drm/radeon/dp: use drm_dp_enhanced_frame_cap() 2013-10-09 18:17:10 +10:00
rcar-du
savage
shmobile
sis
tdfx
tilcdc Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2013-09-05 10:17:26 -07:00
ttm Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 2013-09-18 21:17:44 -05:00
udl drm: kill ->gem_init_object() and friends 2013-10-09 14:38:02 +10:00
via drm: Kill ctx_count from struct drm_device 2013-10-09 15:55:32 +10:00
vmwgfx
ati_pcigart.c
drm_agpsupport.c
drm_auth.c
drm_buffer.c
drm_bufs.c
drm_cache.c
drm_context.c drm: Kill ctx_count from struct drm_device 2013-10-09 15:55:32 +10:00
drm_crtc_helper.c Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next 2013-10-10 12:44:43 +02:00
drm_crtc.c drm: Reject stereo modes with an unknown layout 2013-10-01 07:45:45 +02:00
drm_debugfs.c
drm_dma.c
drm_dp_helper.c drm/dp: constify DP DPCD helpers 2013-10-01 15:28:57 +10:00
drm_drv.c Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next 2013-10-10 12:44:43 +02:00
drm_edid_load.c drm: Try loading builtin EDIDs first 2013-10-09 15:55:28 +10:00
drm_edid.c Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next 2013-10-10 12:44:43 +02:00
drm_encoder_slave.c
drm_fb_cma_helper.c
drm_fb_helper.c drm: Remove unused variables in drm_fb_helper_hotplug_event() 2013-10-01 15:28:59 +10:00
drm_flip_work.c
drm_fops.c drm: Kill drm perf counter leftovers 2013-10-09 15:55:33 +10:00
drm_gem_cma_helper.c Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2013-09-05 10:17:26 -07:00
drm_gem.c drm: kill ->gem_init_object() and friends 2013-10-09 14:38:02 +10:00
drm_global.c drm: Remove unused variable in drm_global_item_ref() 2013-10-01 15:28:58 +10:00
drm_hashtab.c
drm_info.c drm: Collect per-crtc vblank stuff to a struct 2013-10-09 15:55:31 +10:00
drm_ioc32.c
drm_ioctl.c drm: Add a STEREO_3D capability to the SET_CLIENT_CAP ioctl 2013-10-01 07:45:27 +02:00
drm_irq.c drm: Make irq_enabled bool 2013-10-09 15:55:32 +10:00
drm_lock.c drm: Kill drm perf counter leftovers 2013-10-09 15:55:33 +10:00
drm_memory.c
drm_mm.c
drm_modes.c drm: Implement timings adjustments for frame packing 2013-10-01 07:45:36 +02:00
drm_pci.c drm: Remove pci_vendor and pci_device from struct drm_device 2013-10-09 15:55:33 +10:00
drm_platform.c drm: introduce drm_dev_free() to fix error paths 2013-10-09 15:55:09 +10:00
drm_prime.c drm: Remove unused variable in drm_prime_sg_to_page_addr_arrays() 2013-10-01 15:28:58 +10:00
drm_rect.c
drm_scatter.c
drm_stub.c drm: Kill drm perf counter leftovers 2013-10-09 15:55:33 +10:00
drm_sysfs.c
drm_trace_points.c
drm_trace.h
drm_usb.c drm: introduce drm_dev_free() to fix error paths 2013-10-09 15:55:09 +10:00
drm_vm.c
drm_vma_manager.c
Kconfig
Makefile
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