Merge branch 'drm-next-4.17' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Sun, 22 Apr 2018 22:54:06 +0000 (08:54 +1000)
committerDave Airlie <airlied@redhat.com>
Sun, 22 Apr 2018 22:54:06 +0000 (08:54 +1000)
commit221bda4b5f1abfd74159d7bf3703affa62468030
treec4c60da87ebe95c1fec2b5d57b13e864a14005ab
parent2e1d6eab503d179dbca51f54c65c4e0b70775fbf
parentcc9e992dfb5bb48f59f3fbc1268d3f38d2c86ef3
Merge branch 'drm-next-4.17' of git://people.freedesktop.org/~agd5f/linux into drm-next

- Fix a dark screen issue in DC
- Fix clk/voltage dependency tracking for wattman
- Update SMU interface for vega12

* 'drm-next-4.17' of git://people.freedesktop.org/~agd5f/linux:
  drm/amd/powerplay: header file interface to SMU update
  drm/amd/pp: Fix bug voltage can't be OD separately on VI
  drm/amd/display: Don't program bypass on linear regamma LUT