From: Dave Airlie Date: Mon, 20 May 2013 03:31:36 +0000 (+1000) Subject: Merge branch 'drm-nouveau-fixes-3.10' of git://anongit.freedesktop.org/git/nouveau... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b7cb1c50c828adaee95e8ada0e55918686245992;p=linux-beck.git Merge branch 'drm-nouveau-fixes-3.10' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next Fixes some s/r problem with copy engines and ZCULL issues and playlist issues * 'drm-nouveau-fixes-3.10' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: 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 --- b7cb1c50c828adaee95e8ada0e55918686245992