commit 762043aa77ad6de79236f3a9e6281f84e4fe9788
author Dave Airlie <airlied@redhat.com> Fri Jul 24 11:51:18 2015 +1000
committer Dave Airlie <airlied@redhat.com> Fri Jul 24 11:51:18 2015 +1000
tree 32644eb4feaf507900f56afebafa50edf95dca7d
parent f135b978c2dab3d439eacb8353d3c0aac6af072a
parent acc6a1a69b79fad70c4794a925dbfffa9fd6b21b

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