From: Dave Airlie <airlied@redhat.com>
Date: Fri, 24 Jul 2015 01:51:18 +0000 (+1000)
Subject: Merge branch 'drm-fixes-4.2' of git://people.freedesktop.org/~agd5f/linux into drm... 
X-Git-Tag: firefly_0821_release~176^2~1377^2~3
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=762043aa77ad6de79236f3a9e6281f84e4fe9788;p=firefly-linux-kernel-4.4.55.git

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

Some amdgpu fixes.

* 'drm-fixes-4.2' of git://people.freedesktop.org/~agd5f/linux:
  drm/amdgpu/cz/dpm: properly report UVD and VCE clock levels
  drm/amdgpu/cz: implement voltage validation properly
  drm/amdgpu: add VCE harvesting instance query
  drm/amdgpu: implement VCE 3.0 harvesting support (v4)
  drm/amdgpu/dce10: Re-set VBLANK interrupt state when enabling a CRTC
  drm/amdgpu/dce11: Re-set VBLANK interrupt state when enabling a CRTC
---

762043aa77ad6de79236f3a9e6281f84e4fe9788