Merge branch 'drm-nouveau-fixes-3.10' of git://anongit.freedesktop.org/git/nouveau...
authorDave Airlie <airlied@redhat.com>
Wed, 5 Jun 2013 04:35:08 +0000 (14:35 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 5 Jun 2013 04:35:08 +0000 (14:35 +1000)
commit0e32fde96bb9c1fa8fa477e52c1d6ae2f4995cea
tree41fd0184ff07ec33896c742251d971d655706331
parent943079e111bde93ed972d21618d1d73e75ba0d09
parentd40ee48acde16894fb3b241d7e896d5fa84e0f10
Merge branch 'drm-nouveau-fixes-3.10' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes

Multiple nouveau regression fixes, hdmi audio, s/r and dac load detection
* 'drm-nouveau-fixes-3.10' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nv50/kms: use dac loadval from vbios, where it's available
  drm/nv50/disp: force dac power state during load detect
  drm/nv50-nv84/fifo: fix resume regression introduced by playlist race fix
  drm/nv84/disp: Fix HDMI audio regression
drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c
drivers/gpu/drm/nouveau/nv50_display.c