summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-05-21 08:50:09 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-05-21 08:50:09 -0700
commit007b703b3ed74e9af9c0576e7698ccda0170d370 (patch)
tree64b5c06e27e4fc2ee8fa7d613c336d7f2b2bd8c2 /arch
parentc7788792a5e7b0d5d7f96d0766b4cb6112d47d75 (diff)
parenta3f6902672c9fa3868722ef6ab8a7dd9141def6a (diff)
downloadlinux-007b703b3ed74e9af9c0576e7698ccda0170d370.tar.bz2
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
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions