tree cf13281a6bf2ba7b0e67d9bb75f3b006a95c6817
parent 91c0719c695a1fcba6a9728eb013eb6e3c7f3487
parent c380f681245d7ae57f17d9ebbbe8f8f1557ee1fb
author Dave Airlie <airlied@redhat.com> 1497571312 +1000
committer Dave Airlie <airlied@redhat.com> 1497571312 +1000

Merge tag 'drm-intel-fixes-2017-06-15' of git://anongit.freedesktop.org/git/drm-intel into drm-fixes

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