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)
- 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


Trivial merge