From: Dave Airlie <airlied@redhat.com>
Date: Wed, 9 Mar 2016 04:19:14 +0000 (+1000)
Subject: Merge branch 'drm-fixes-4.5' of git://people.freedesktop.org/~agd5f/linux into drm... 
X-Git-Tag: v4.5~19^2~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=913830147ace0a31ac0128726b29153d570c9985;p=linux-2.6-block.git

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

radeon and amdgpu fixes for 4.5. Three regression fixes and
some fixups for the error handling in the vblank regression fixes
from earlier.

* 'drm-fixes-4.5' of git://people.freedesktop.org/~agd5f/linux:
  Revert "drm/radeon/pm: adjust display configuration after powerstate"
  drm/amdgpu/dp: add back special handling for NUTMEG
  drm/radeon/dp: add back special handling for NUTMEG
  drm/radeon: Fix error handling in radeon_flip_work_func.
  drm/amdgpu: Fix error handling in amdgpu_flip_work_func.
---

913830147ace0a31ac0128726b29153d570c9985