Linus Torvalds 007b703b3e Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux ... Pull DRM fixes from Dave Airlie: "This is just a set of nouveau and radeon fixes, the nouveau ones fix some suspend/resume regressions since use of copy engines and some fixes for Z compression on some newer chipsets." * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: drm/radeon/dce2: use 10khz units for audio dto calculation drm/radeon: Fix VRAM size calculation for VRAM >= 4GB drm/radeon: Remove superfluous variable drm/nouveau: ensure channels are stopped before saving fences for suspend drm/nv50/fifo: prevent races between clients updating playlists drm/nvc0/fifo: prevent CHAN_TABLE_ERROR:CHANNEL_PENDING on fifo fini drm/nvc0/fifo: prevent races between clients updating playlists drm/nve0/fifo: prevent races between clients updating playlists drm/nve0/ltcg: poke the partition count into yet another register drm/nvc0/ltcg: fix handling of disabled partitions drm/nvc0/ce: disable ce1 on a number of chipsets drm/nouveau/bios: fix thinko in ZM_MASK_ADD opcode drm/nouveau: fix build with nv50->nvc0		2013-05-21 08:50:09 -07:00
..
core	drm/nouveau/core: allow non-maskable events	2013-04-26 15:38:16 +10:00
engine	drm/nv50/fifo: prevent races between clients updating playlists	2013-05-20 13:24:09 +10:00
include	drm/nvf0/disp: expose display class 2.2	2013-05-02 16:23:13 +10:00
subdev	Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux	2013-05-21 08:50:09 -07:00
os.h	drm/nouveau/mc: handle irq-related setup ourselves	2013-04-26 15:37:52 +10:00