Merge branch 'drm-fixes-4.12' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Thu, 1 Jun 2017 02:07:18 +0000 (12:07 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 1 Jun 2017 02:07:18 +0000 (12:07 +1000)
commit8ef6fcc8eebbea8c90735ef362b96bf1cafcd45f
tree0dabb137dff929cb82de6fdd81f0d5f5cfd1063a
parent58b58f6ef582426710724a2b01ac230a0d542b5f
parent45cc6586b7a73e84a8806881122b6ec306cdc9e7
Merge branch 'drm-fixes-4.12' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

* 'drm-fixes-4.12' of git://people.freedesktop.org/~agd5f/linux:
  drm/amdgpu: Program ring for vce instance 1 at its register space