From: Dave Airlie <airlied@gmail.com>
Date: Wed, 2 Jul 2014 21:55:32 +0000 (+1000)
Subject: Merge branch 'drm-fixes-3.16' of git://people.freedesktop.org/~agd5f/linux
X-Git-Tag: firefly_0821_release~176^2~3673
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e55a379827ed02c4982250fc815fed47def53a45;p=firefly-linux-kernel-4.4.55.git

Merge branch 'drm-fixes-3.16' of git://people.freedesktop.org/~agd5f/linux

misc fixes, output fixes for 4k monitor, dpm lockup fixes

* 'drm-fixes-3.16' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: page table BOs are kernel allocations
  drm/radeon/cik: fix typo in EOP packet
  drm/radeon: Track the status of a page flip more explicitly
  drm/radeon/dpm: fix vddci setup typo on cayman
  drm/radeon/dpm: fix typo in vddci setup for eg/btc
  drm/radeon: use RADEON_MAX_CRTCS, RADEON_MAX_AFMT_BLOCKS (v2)
  drm/radeon: Use only one line for whole DPCD debug output
  drm/radeon: add a module parameter to control deep color support
  drm/radeon: enable bapm by default on desktop TN/RL boards
  drm/radeon: enable bapm by default on KV/KB
  drm/radeon: only apply bapm changes for AC power on ARUBA
  drm/radeon: adjust default dispclk on DCE6 (v2)
---

e55a379827ed02c4982250fc815fed47def53a45