From: Dave Airlie <airlied@redhat.com>
Date: Sun, 22 Apr 2018 22:54:06 +0000 (+1000)
Subject: Merge branch 'drm-next-4.17' of git://people.freedesktop.org/~agd5f/linux into drm-next
X-Git-Tag: v4.17-rc2~1^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=221bda4b5f1abfd74159d7bf3703affa62468030;p=linux.git

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

221bda4b5f1abfd74159d7bf3703affa62468030