Merge tag 'drm-intel-fixes-2017-06-15' of git://anongit.freedesktop.org/git/drm-intel...
authorDave Airlie <airlied@redhat.com>
Fri, 16 Jun 2017 00:01:52 +0000 (10:01 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 16 Jun 2017 00:01:52 +0000 (10:01 +1000)
drm/i915 fixes for v4.12-rc6

* tag 'drm-intel-fixes-2017-06-15' of git://anongit.freedesktop.org/git/drm-intel:
  drm/i915: Fix GVT-g PVINFO version compatibility check
  drm/i915: Fix SKL+ watermarks for 90/270 rotation
  drm/i915: Fix scaling check for 90/270 degree plane rotation


Trivial merge