Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-25 04:11:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
398b7a1b88
linux/drivers/gpu/drm
History
Daniel Vetter 398b7a1b88 Linux 3.6-rc7 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
 iQEcBAABAgAGBQJQX7MuAAoJEHm+PkMAQRiG0h0IAJURkrMCAQUxA+Ik66ReH89s
 LQcVd0U9uL4UUOi7f5WR64Vf9Cfu6VVGX9ZKSvjpNskvlQaUQPMIt4pMe6g4X4dI
 u0bApEy4XZz3nGabUAghIU8jJ8cDmhCG6kPpSiS7pi7KHc0yIa4WFtJRrIpGaIWT
 xuK38YOiOHcSDRlLyWZzainMncQp/ixJdxnqVMTonkVLk0q0b84XzOr4/qlLE5lU
 i+TsK3PRKdQXgvZ4CebL+srPBwWX1dmgP3VkeBloQbSSenSeELICbFWavn2ml+sF
 GXi4dO93oNquL/Oy5SwI666T4uNcrRPaS+5X+xSZgBW/y2aQVJVJuNZg6ZP/uWk=
 =0v2l
 -----END PGP SIGNATURE-----

Merge tag 'v3.6-rc7' into drm-intel-next-queued

Manual backmerge of -rc7 to resolve a silent conflict leading to
compile failure in drivers/gpu/drm/i915/intel_hdmi.c.

This is due to the bugfix in -rc7:

commit b98b601672
Author: Wang Xingchao <xingchao.wang@intel.com>
Date:   Thu Sep 13 07:43:22 2012 +0800

    drm/i915: HDMI - Clear Audio Enable bit for Hot Plug

Since this code moved around a lot in -next git put that snippet at
the wrong spot. I've tried to fix this by making the conflict explicit
by merging a version for next with:

commit 3cce574f01
Author: Wang Xingchao <xingchao.wang@intel.com>
Date:   Thu Sep 13 11:19:00 2012 +0800

    drm/i915: HDMI - Clear Audio Enable bit for Hot Plug unconditionally

But that failed to solve the entire problem. To avoid pushing out
further -nightly branch to our QA where this is broken, do the
backmerge and manually add the stuff git adds to -next from the patch
in -fixes.

Note that this doesn't show up in git's merge diff (and hence is also
not handled by git rerere), which adds to the reasons why I'd like to
fix this with a verbose backmerge. The git merge diff only shows a
bunch of trivial conflicts of the "code changed in lines next to each
another" kind.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-09-24 18:17:12 +02:00
..
ast Linux 3.6-rc7 2012-09-24 18:17:12 +02:00
cirrus Linux 3.6-rc7 2012-09-24 18:17:12 +02:00
exynos Linux 3.6-rc7 2012-09-24 18:17:12 +02:00
gma500 Linux 3.6-rc7 2012-09-24 18:17:12 +02:00
i2c drm/i2c/ch7006: Convert to dev_pm_ops 2012-08-24 09:56:08 +10:00
i810 drm: use drm_compat_ioctl for 32-bit apps 2012-09-06 06:55:02 +10:00
i915 Linux 3.6-rc7 2012-09-24 18:17:12 +02:00
mga drm: kill reclaim_buffers callback 2012-07-19 22:50:28 -04:00
mgag200 Linux 3.6-rc7 2012-09-24 18:17:12 +02:00
nouveau Linux 3.6-rc7 2012-09-24 18:17:12 +02:00
r128 drm: kill reclaim_buffers callback 2012-07-19 22:50:28 -04:00
radeon Linux 3.6-rc7 2012-09-24 18:17:12 +02:00
savage drm: use drm_compat_ioctl for 32-bit apps 2012-09-06 06:55:02 +10:00
shmobile drm: Renesas SH Mobile DRM driver 2012-09-18 12:28:22 +02:00
sis drm: use drm_compat_ioctl for 32-bit apps 2012-09-06 06:55:02 +10:00
tdfx drm: use drm_compat_ioctl for 32-bit apps 2012-09-06 06:55:02 +10:00
ttm drm: Handle io prot correctly for MIPS. 2012-08-24 09:41:05 +10:00
udl Linux 3.6-rc7 2012-09-24 18:17:12 +02:00
via drm: use drm_compat_ioctl for 32-bit apps 2012-09-06 06:55:02 +10:00
vmwgfx Linux 3.6-rc7 2012-09-24 18:17:12 +02:00
ati_pcigart.c
drm_agpsupport.c
drm_auth.c
drm_buffer.c
drm_bufs.c drm: kill dma queue support 2012-07-19 22:50:55 -04:00
drm_cache.c drm/i915: Replace the array of pages with a scatterlist 2012-09-20 14:22:57 +02:00
drm_context.c drm: Unify and fix idr error handling 2012-04-24 09:50:20 +01:00
drm_crtc_helper.c drm: Don't initialize local ret variable when not needed 2012-05-22 10:32:58 +01:00
drm_crtc.c Linux 3.6-rc7 2012-09-24 18:17:12 +02:00
drm_debugfs.c drm: kill dma queue support 2012-07-19 22:50:55 -04:00
drm_dma.c drm: kill dma queue support 2012-07-19 22:50:55 -04:00
drm_dp_i2c_helper.c
drm_drv.c drm: make buffer management work without DRM_MASTER 2012-09-13 11:19:44 +10:00
drm_edid_load.c drm/edid: limit printk when facing bad edid 2012-09-17 11:16:40 +10:00
drm_edid_modes.h drm: consistently name interlaced modes 2012-09-13 11:21:03 +10:00
drm_edid.c Linux 3.6-rc7 2012-09-24 18:17:12 +02:00
drm_encoder_slave.c
drm_fb_cma_helper.c DRM: Add DRM KMS/FB CMA helper 2012-09-18 12:28:21 +02:00
drm_fb_helper.c drm/fb helper: don't call drm_helper_connector_dpms directly 2012-09-08 00:51:15 +02:00
drm_fops.c drm: track dev_mapping in more robust and flexible way 2012-07-25 14:09:30 +10:00
drm_gem_cma_helper.c DRM: Add DRM GEM CMA helper 2012-09-18 12:28:21 +02:00
drm_gem.c drm: Add colouring to the range allocator 2012-07-16 05:59:37 +10:00
drm_global.c
drm_hashtab.c
drm_info.c drm: kill dma queue support 2012-07-19 22:50:55 -04:00
drm_ioc32.c
drm_ioctl.c drm/prime: expose capability flags for userspace. 2012-05-18 11:12:16 +01:00
drm_irq.c drm: Add missing static storage class specifier in drm_irq.c file 2012-08-24 10:00:56 +10:00
drm_lock.c drm: ditch strange DRIVER_DMA_QUEUE only error bail-out 2012-07-19 22:50:47 -04:00
drm_memory.c
drm_mm.c drm: Add colouring to the range allocator 2012-07-16 05:59:37 +10:00
drm_modes.c drm: Remove two unused fields from struct drm_display_mode 2012-08-22 09:27:27 +10:00
drm_pci.c drm/pci: add support for getting the supported link bw. 2012-07-19 22:29:25 -04:00
drm_platform.c
drm_prime.c drm/prime: add exported buffers to current fprivs imported buffer list (v2) 2012-05-23 10:46:03 +01:00
drm_proc.c drm: Add missing static storage class specifiers in drm_proc.c file 2012-08-22 09:30:00 +10:00
drm_scatter.c
drm_stub.c drm: Don't initialize local ret variable when not needed 2012-05-22 10:32:58 +01:00
drm_sysfs.c drm: fail gracefully when proc isn't setup. 2012-07-16 05:57:03 +10:00
drm_trace_points.c
drm_trace.h
drm_usb.c drm/usb: fix module license on drm/usb layer. 2012-04-19 09:33:32 +01:00
drm_vm.c drm: Remove unnecessary test for ARM. 2012-09-13 11:28:39 +10:00
Kconfig drm: Renesas SH Mobile DRM driver 2012-09-18 12:28:22 +02:00
Makefile drm: Renesas SH Mobile DRM driver 2012-09-18 12:28:22 +02: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